[xiph-commits] r3486 - in browser_plugin/trunk: Installer scripts src

[j at svn.annodex.net]

Author: j
Date: 2008-02-19 01:19:24 -0800 (Tue, 19 Feb 2008)
New Revision: 3486

Added:
   browser_plugin/trunk/scripts/copy-plugin-static.sh
   browser_plugin/trunk/scripts/copy-plugin.sh
Removed:
   browser_plugin/trunk/scripts/copy-plugin-dynamic.sh
   browser_plugin/trunk/scripts/copy-plugin.sh
Modified:
   browser_plugin/trunk/Installer/MakeLinuxPluginXPI.sh
   browser_plugin/trunk/src/Makefile.am
Log:
* libnpoggplugin.so is a shared lib
* libnpoggplugin_static.so links libs staticly
* update scripts and installer script to the new names
* how can one prevent libnpoggplugin_static.so from beeing installed?



Modified: browser_plugin/trunk/Installer/MakeLinuxPluginXPI.sh
===================================================================
--- browser_plugin/trunk/Installer/MakeLinuxPluginXPI.sh	2008-02-19 08:22:18 UTC (rev 3485)
+++ browser_plugin/trunk/Installer/MakeLinuxPluginXPI.sh	2008-02-19 09:19:24 UTC (rev 3486)
@@ -1,7 +1,8 @@
 #!/bin/sh
 
 XPTFILE=../src/nsILibOggPlugin.xpt
-PLUGIN=../src/.libs/libnpoggplugin.so
+PLUGIN=../src/.libs/libnpoggplugin_static.so
+PLUGIN_NAME=libnpoggplugin.so
 
 XPINAME=Oggplay-Linux.xpi
 
@@ -14,7 +15,8 @@
   exit 1
 fi
 
-cp $XPTFILE $PLUGIN .
+cp $XPTFILE .
+cp $PLUGIN $PLUGIN_NAME
 rm $XPINAME 2>/dev/null
-zip -9r $XPINAME install.js ${XPTFILE##.*/} ${PLUGIN##.*/}
-rm ${XPTFILE##.*/} ${PLUGIN##.*/}
+zip -9r $XPINAME install.js ${XPTFILE##.*/} ${PLUGIN_NAME}
+rm ${XPTFILE##.*/} ${PLUGIN_NAME}

Deleted: browser_plugin/trunk/scripts/copy-plugin-dynamic.sh
===================================================================
--- browser_plugin/trunk/scripts/copy-plugin-dynamic.sh	2008-02-19 08:22:18 UTC (rev 3485)
+++ browser_plugin/trunk/scripts/copy-plugin-dynamic.sh	2008-02-19 09:19:24 UTC (rev 3486)
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Copy the plugin across into the Mozilla plugins directory
-mkdir -p $HOME/.mozilla/plugins
-cp src/.libs/libnpoggplugin_dynamic.so $HOME/.mozilla/plugins
-cp src/nsILibOggPlugin.xpt $HOME/.mozilla/plugins

Copied: browser_plugin/trunk/scripts/copy-plugin-static.sh (from rev 3485, browser_plugin/trunk/scripts/copy-plugin.sh)
===================================================================
--- browser_plugin/trunk/scripts/copy-plugin-static.sh	                        (rev 0)
+++ browser_plugin/trunk/scripts/copy-plugin-static.sh	2008-02-19 09:19:24 UTC (rev 3486)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Copy the plugin across into the Mozilla plugins directory
+mkdir -p $HOME/.mozilla/plugins
+cp src/.libs/libnpoggplugin_static.so $HOME/.mozilla/plugins/libnpoggplugin.so
+cp src/nsILibOggPlugin.xpt $HOME/.mozilla/plugins

Deleted: browser_plugin/trunk/scripts/copy-plugin.sh
===================================================================
--- browser_plugin/trunk/scripts/copy-plugin.sh	2008-02-19 08:22:18 UTC (rev 3485)
+++ browser_plugin/trunk/scripts/copy-plugin.sh	2008-02-19 09:19:24 UTC (rev 3486)
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Copy the plugin across into the Mozilla plugins directory
-mkdir -p $HOME/.mozilla/plugins
-cp src/.libs/libnpoggplugin.so $HOME/.mozilla/plugins
-cp src/nsILibOggPlugin.xpt $HOME/.mozilla/plugins

Copied: browser_plugin/trunk/scripts/copy-plugin.sh (from rev 3485, browser_plugin/trunk/scripts/copy-plugin-dynamic.sh)
===================================================================
--- browser_plugin/trunk/scripts/copy-plugin.sh	                        (rev 0)
+++ browser_plugin/trunk/scripts/copy-plugin.sh	2008-02-19 09:19:24 UTC (rev 3486)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Copy the plugin across into the Mozilla plugins directory
+mkdir -p $HOME/.mozilla/plugins
+cp src/.libs/libnpoggplugin.so $HOME/.mozilla/plugins
+cp src/nsILibOggPlugin.xpt $HOME/.mozilla/plugins

Modified: browser_plugin/trunk/src/Makefile.am
===================================================================
--- browser_plugin/trunk/src/Makefile.am	2008-02-19 08:22:18 UTC (rev 3485)
+++ browser_plugin/trunk/src/Makefile.am	2008-02-19 09:19:24 UTC (rev 3486)
@@ -1,7 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST= \
-	audio/sydney_audio.h	\
 	audio/sydney_audio_mac.c	\
 	support/np_mac.cpp		\
 	plugin_gui_mac.c 		\
@@ -22,7 +21,6 @@
 
 LIBOGGPLAY_STATICLIBS = @LIBDIR@/liboggplay.a @LIBDIR@/liboggz.a @LIBDIR@/libtheora.a @LIBDIR@/libfishsound.a @LIBDIR@/libvorbis.a @LIBDIR@/libvorbisenc.a @LIBDIR@/libspeex.a @LIBDIR@/libFLAC.a @LIBDIR@/libogg.a @LIBDIR@/libImlib2.a
 
-plugin_libs=libnpoggplugin.la  libnpoggplugin_dynamic.la
 
 noinst_HEADERS = \
 	nsILibOggPlugin.h			\
@@ -39,7 +37,7 @@
 	plugin_cmml.h
 
 # Libraries to build
-lib_LTLIBRARIES = $(plugin_libs)
+lib_LTLIBRARIES = libnpoggplugin.la libnpoggplugin_static.la
 
 libnpoggplugin_la_SOURCES =      \
 	plugin.cpp						\
@@ -52,10 +50,10 @@
 	support/npn_gate.cpp			\
 	audio/sydney_audio_alsa.c		\
 	plugin_cmml.c
-libnpoggplugin_la_LIBADD = -lX11 -lXt $(LIBOGGPLAY_STATICLIBS) $(PTHREAD_LIBS) ${ALSA_LIBS}
+libnpoggplugin_la_LIBADD = -lX11 -lXt $(LIBOGGPLAY_LIBS) $(ALSA_LIBS) $(IMLIB2_LIBS) $(PTHREAD_LIBS)
 
-libnpoggplugin_dynamic_la_SOURCES = $(libnpoggplugin_la_SOURCES)
-libnpoggplugin_dynamic_la_LIBADD = -lX11 -lXt $(LIBOGGPLAY_LIBS) $(ALSA_LIBS) $(IMLIB2_LIBS) $(PTHREAD_LIBS)
+libnpoggplugin_static_la_SOURCES = $(libnpoggplugin_la_SOURCES)
+libnpoggplugin_static_la_LIBADD = -lX11 -lXt $(LIBOGGPLAY_STATICLIBS) $(PTHREAD_LIBS) ${ALSA_LIBS}
 
 EXTRA_libnpoggplugin_la_SOURCES = nsILibOggPlugin.idl
 nodist_libnpoggplugin_la_SOURCES = nsILibOggPlugin.h