[Player-dev] CR: Fix for bug 8690

[Player-dev] CR: Fix for bug 8690

Sushant Garg sgarg at real.com
Fri Sep 19 05:04:21 PDT 2008


Skipped content of type multipart/alternative-------------- next part --------------
Index: player/installer/archive/make_tempdir
===================================================================
RCS file: /cvsroot/player/installer/archive/make_tempdir,v
retrieving revision 1.77.2.21
diff -u -r1.77.2.21 make_tempdir
--- player/installer/archive/make_tempdir	18 Sep 2008 22:09:15 -0000	1.77.2.21
+++ player/installer/archive/make_tempdir	19 Sep 2008 11:12:46 -0000
@@ -152,11 +152,11 @@
 # mozilla plugin
 if project.IsDefined('HELIX_FEATURE_MOZILLA_PLUGIN'):
     inst.CopyModuleDlls(
-        ("filesystem/memory", "memfsys", "memfsys"),
-        ("player/app/plugin", "nphelix", "mozilla/nphelix"))
+        ("filesystem/memory", "memfsys", "memfsys"))
+        #("player/app/plugin", "nphelix", "mozilla/nphelix"))
         #("player/app/plugin", "nphelix", "nphelix"), ## Netbook only support Lite Player.
-    inst.CopyModuleFiles(
-        ("player/app/plugin/nphelix.xpt", "mozilla/nphelix.xpt"))
+#    inst.CopyModuleFiles(
+#        ("player/app/plugin/nphelix.xpt", "mozilla/nphelix.xpt"))
 
 
 # dtdrplin and hxdtdriver
@@ -758,12 +758,12 @@
 inst.CopyModuleDlls(
 	("player_dist/plugin","hxpluginui","hxpluginui"),
 	("player_dist/plugin","realplayerkit","realplayerkit"),
-        ("player_dist/plugin","nprave","nprave"),
 	("player_dist/plugin","rppluginapplication","rppluginapplication"),
-	("player_dist/plugin","asfff","asfff"),
+   ("player_dist/plugin","asfff","asfff"),
 	("player_dist/plugin","hxmedpltfm","hxmedpltfm"),
 	("player_dist/plugin","hxmedplyeng","hxmedplyeng"),
-	("player_dist/plugin","hxrecordengine","hxrecordengine"))
+	("player_dist/plugin","hxrecordengine","hxrecordengine"),
+	("player_dist/plugin","nprave","mozilla/nprave"))
 
 #gtkc images
 inst.MakeDirs("share/images")
Index: player/installer/common/postinst/install_moz_plugins.sh
===================================================================
RCS file: /cvsroot/player/installer/common/postinst/install_moz_plugins.sh,v
retrieving revision 1.3
diff -u -r1.3 install_moz_plugins.sh
--- player/installer/common/postinst/install_moz_plugins.sh	2 Feb 2007 00:44:52 -0000	1.3
+++ player/installer/common/postinst/install_moz_plugins.sh	19 Sep 2008 11:12:47 -0000
@@ -21,8 +21,9 @@
         echo $"Configuring Mozilla..."
         MOZFOUND=1
     fi
-    eval_cmd ln -sf "$INSTDIR/mozilla/nphelix.so" "$MOZDIR_LOCAL"
-    eval_cmd ln -sf "$INSTDIR/mozilla/nphelix.xpt" "$MOZDIR_LOCAL"
+#    eval_cmd ln -sf "$INSTDIR/mozilla/nphelix.so" "$MOZDIR_LOCAL"
+#    eval_cmd ln -sf "$INSTDIR/mozilla/nphelix.xpt" "$MOZDIR_LOCAL"
+    eval_cmd ln -sf "$INSTDIR/mozilla/nprave.so" "$MOZDIR_LOCAL"
 }
 
 
@@ -79,8 +80,9 @@
 
     # Remove local Mozilla plugin from current real user's home directory for consistency sake.
     if [ $MOZFOUND -eq 1 -a "$REAL_USR_MOZDIR" != "" ] ; then
-        eval_cmd rm -f $REAL_USR_MOZDIR/nphelix.so  > /dev/null 2>&1
-        eval_cmd rm -f $REAL_USR_MOZDIR/nphelix.xpt > /dev/null 2>&1
+#        eval_cmd rm -f $REAL_USR_MOZDIR/nphelix.so  > /dev/null 2>&1
+#        eval_cmd rm -f $REAL_USR_MOZDIR/nphelix.xpt > /dev/null 2>&1
+        eval_cmd rm -f $REAL_USR_MOZDIR/nprave.so > /dev/null 2>&1
     fi
 
 else
@@ -95,7 +97,8 @@
         echo $"Cannot find \$HOME."
         echo $"Set your \$HOME environment variable and re-run "
         echo $"postinst/inst_moz_plugins.sh to install the mozilla plugin."
-        echo $"Or manually copying nphelix.so and nphelix.xpt into " 
+#        echo $"Or manually copying nphelix.so and nphelix.xpt into " 
+        echo $"Or manually copying nprave.so into " 
         echo $"the Mozilla plugin directory to install it."
         echo $"If you think you've encountered this in error, please file a bug report at:"
         echo $"https://bugs.helixcommunity.org/enter_bug.cgi?product=player"


More information about the Player-dev mailing list
 

Site Map   |   Terms of Use   |   Privacy Policy   |   Contact Us

Copyright © 1995-2007 RealNetworks, Inc. All rights reserved. RealNetworks and Helix are trademarks of RealNetworks.
All other trademarks or registered trademarks are the property of their respective holders.