[Gnash-commit] /srv/bzr/gnash/trunk r10803: clean up xpi package building.

[rob]

------------------------------------------------------------
revno: 10803
committer: address@hidden
branch nick: trunk
timestamp: Thu 2009-04-16 16:16:49 -0600
message:
  clean up xpi package building.
modified:
  Makefile.am
  packaging/snapshot.am
  packaging/xpi.am
  packaging/xpi/install.rdf
  plugin/Makefile.am
  plugin/xpcom/Makefile.am

=== modified file 'Makefile.am'
--- a/Makefile.am       2009-04-16 00:41:53 +0000
+++ b/Makefile.am       2009-04-16 22:16:49 +0000
@@ -158,7 +158,7 @@
            echo "Using existing bzrversion.h"; \
        else \
            echo "Generating bzrversion.h"; \
-           echo "static const char *BRANCH_REVNO  = "none";\nstatic const char 
*BRANCH_NICK = "none";\n" > bzrversion.h; \
+           echo 'static const char *BRANCH_REVNO  = "$(NOW)";\nstatic const 
char *BRANCH_NICK = "none";\n' > bzrversion.h; \
          fi; \
        fi
 

=== modified file 'packaging/snapshot.am'
--- a/packaging/snapshot.am     2009-04-16 03:02:46 +0000
+++ b/packaging/snapshot.am     2009-04-16 22:16:49 +0000
@@ -25,8 +25,9 @@
 # these is the directories where the snapshot gets built. Sources are
 # in the top level, the build goes in a _build subdirectory
 SNAPSHOT_DIR = gnash-${BRANCH_REVNO}_$(BRANCH_NICK)
-SNAPSHOT_BUILD = gnash-${BRANCH_REVNO}_$(BRANCH_NICK)/_build
+SNAPSHOT_BUILD = $(SNAPSHOT_DIR)/_build
 SNAPSHOT_NAME = $(SNAPSHOT_DIR)
+
 # this is the name of the actual tarball
 SNAPSHOT_TAR = gnash-$(BRANCH_REVNO)_$(BRANCH_NICK).tar.gz
 # this is the temporary directory used for DESTDIR
@@ -46,36 +47,37 @@
 # This uses the default version for Gnash. which is 'trunk'. So we
 # rename it to the dir we want to stay clear. Then we change the default
 # version from 'trunk' to a date stamped version of trunk.
-snapshot-src: distdir
+snapshot-src: distdir  force
        snapshot_tar="$(SNAPSHOT_NAME).tar.gz"; \
-       if test -d $(SNAPSHOT_DIR); then \
-         rm -fr $(SNAPSHOT_DIR); \
+       snapshot_dir=$(SNAPSHOT_DIR); \
+       if test -d $${snapshot_dir}; then \
+         rm -fr $${snapshot_dir}; \
        fi; \
-       mv -f gnash-trunk $(SNAPSHOT_DIR); \
-       if test ! -f $(SNAPSHOT_DIR)/configure.ac.orig; then \
-         mv -f $(SNAPSHOT_DIR)/configure.ac $(SNAPSHOT_DIR)/configure.ac.orig; 
\
+       mv -f gnash-trunk $${snapshot_dir}; \
+       if test ! -f $${snapshot_dir}/configure.ac.orig; then \
+         mv -f $${snapshot_dir}/configure.ac 
$${snapshot_dir}/configure.ac.orig; \
          sed -e "s/AC_INIT(gnash, trunk)/AC_INIT(gnash, 
$(BRANCH_REVNO)-$(BRANCH_NICK))/" \
-           $(SNAPSHOT_DIR)/configure.ac.orig > $(SNAPSHOT_DIR)/configure.ac; \
-         cd $(SNAPSHOT_DIR) ; ./autogen.sh; cd .. ;\
+           $${snapshot_dir}/configure.ac.orig > $${snapshot_dir}/configure.ac; 
\
+         cd $${snapshot_dir} ; ./autogen.sh; cd .. ;\
        fi; \
-       tar zcvf $${snapshot_tar} --exclude=$(SNAPSHOT_DIR)/autom4te.cache \
-         --exclude=$(SNAPSHOT_DIR)/configure.ac.orig $(SNAPSHOT_DIR)
-#      $(RM) -fr $(SNAPSHOT_DIR)
+       tar zcvf $${snapshot_tar} --exclude=$${snapshot_dir}/autom4te.cache \
+         --exclude=$${snapshot_dir}/configure.ac.orig $${snapshot_dir}
+#      $(RM) -fr $${snapshot_dir}
 
-snapshot-configure: 
+snapshot-configure: force
        address@hidden "+%Y%m%d"`; \
        pkgname="gnash-${BRANCH_REVNO}-$(BRANCH_NICK)"; \
        snapshot_dir=$(SNAPSHOT_DIR); \
-       snapshot_build="$(SNAPSHOT_DIR)/_build"; \
-       if test ! -d $(SNAPSHOT_BUILD); then \
-         $(MKINSTALLDIRS) $(SNAPSHOT_BUILD); \
+       snapshot_build="$(SNAPSHOT_BUILD)"; \
+       if test ! -d $(snapshot_build); then \
+         $(MKINSTALLDIRS) $${snapshot_build}; \
        fi; \
        if test -d /usr/local/mozilla-firefox/plugins; then \
           plugindir=/usr/local/mozilla-firefox/plugins; \
        else \
          plugindir=/usr/lib/mozilla/plugins; \
         fi; \
-       cd $(SNAPSHOT_BUILD); ../configure \
+       cd $${snapshot_build}; ../configure \
        $(SNAPSHOT_CONFIGURE_FLAGS) \
          --disable-dependency-tracking\
          --disable-rpath \
@@ -88,13 +90,13 @@
 #        --with-extensions=all 
 #        --enable-gui=all 
 
-snapshot-build:
+snapshot-build: force
        $(MAKE) $(AM_MAKEFLAGS) -C $(SNAPSHOT_BUILD)
        $(MAKE) $(AM_MAKEFLAGS) -C $(SNAPSHOT_BUILD)/doc/C info man html
 
 # Install a package. Afterwards we link to the prebuilt man pages incase
 # DocBook and DocBook2X aren't installed on this machine.
-snapshot-install:
+snapshot-install: force
        $(MAKE) $(AM_MAKEFLAGS) -C $(SNAPSHOT_BUILD) install 
DESTDIR=$(SNAPSHOT_TMP)
 
 # We only want to bundle an installed gnash, so all the linker paths are

=== modified file 'packaging/xpi.am'
--- a/packaging/xpi.am  2009-04-16 03:57:36 +0000
+++ b/packaging/xpi.am  2009-04-16 22:16:49 +0000
@@ -51,15 +51,16 @@
 # executable so the executables don't have to find any of the gnash libraries 
at
 # runtime. This way you can have multiple versions of Gnash installed, and 
they all
 # use the appropriate libraries for each build.
-xpi-configure:
-       if test ! -d $(SNAPSHOT_BUILD); then \
-         $(MKINSTALLDIRS) $(SNAPSHOT_BUILD); \
+xpi-configure: force
+       snapshot_build="$(SNAPSHOT_BUILD)"; \
+       if test ! -d $${snapshot_build}; then \
+         $(MKINSTALLDIRS) $${snapshot_build}; \
        fi; \
-       (cd $(SNAPSHOT_BUILD); ../configure \
+       (cd $${snapshot_build}; ../configure \
          --enable-static \
          --disable-shared \
-         $(CONFIG_OPTS))
-       cp bzrversion.h $(SNAPSHOT_BUILD)
+         $(CONFIG_OPTS));
+       -cp bzrversion.h $(SNAPSHOT_BUILD)
 
 # build the xpi package bundle. snapshot-build and snapshot-install need to
 # have been run already. If you wish the automatic dependency checking, use
@@ -71,7 +72,7 @@
 # Anyway, so after installing the statically linked gnash into the bundle, we 
then
 # have to reconfigure to enable shared libraries to be built, and then rebuild
 # the plugins and the xpcom support as dynamically loadable modules.
-xpi-bundle:
+xpi-bundle:  force
        snapshot_dest="/tmp/$(SNAPSHOT_NAME)"; \
        snapshot_dir="/tmp/$(SNAPSHOT_DIR)"; \
        snapshot_xpi="/tmp/$(SNAPSHOT_NAME)-tmp"; \
@@ -80,8 +81,8 @@
          cp -fr $(srcdir)/packaging/xpi/$$i $${snapshot_xpi}; \
        done; \
        strip  $${snapshot_dest}/usr/bin/gtk-gnash; \
-       cd $(SNAPSHOT_BUILD); ../configure --enable-shared $(CONFIG_OPTS); \
-       $(MAKE) $(AM_MAKEFLAGS) -C plugin clean install-plugin 
DESTDIR=$${snapshot_dest}; \
+       cd $(SNAPSHOT_BUILD); ../configure --disable-static --enable-shared 
$(CONFIG_OPTS); \
+       $(MAKE) $(AM_MAKEFLAGS) -C plugin install-plugin 
DESTDIR=$${snapshot_dest}; \
        $(MAKE) $(AM_MAKEFLAGS) -C plugin/xpcom all install-pkglib 
DESTDIR=$${snapshot_dest}; \
        cp -fr $${snapshot_dest}/usr/lib/mozilla/plugins/libgnashplugin.so 
$${snapshot_xpi}/plugins; \
        cp -fr $${snapshot_dest}/usr/lib/mozilla/plugins/extensions/*.xpt 
$${snapshot_xpi}/plugins; \
@@ -90,7 +91,9 @@
        (cd $${snapshot_xpi}; $(ZIP) -r $${snapshot_dir}.xpi *);
 
 # remove files left from package building
-xpi-clean:
+xpi-clean:  force
        rm -fr xpi-* gnash-$(RELEASE)*.xpi
 
-.PHONY : xpi xpi-bundle xpi-configure
+.PHONY : xpi xpi-bundle xpi-configure xpi-install xpi-build snapshot-src
+
+force:
\ No newline at end of file

=== modified file 'packaging/xpi/install.rdf'
--- a/packaging/xpi/install.rdf 2009-02-17 03:18:15 +0000
+++ b/packaging/xpi/install.rdf 2009-04-16 22:16:49 +0000
@@ -65,7 +65,7 @@
        <!-- Front End Integration Hooks (used by Extension Manager)-->
         
<em:updateURL>"http://www.getgnash.org/updates/update.rdf";</em:updateURL>
         <em:homepageURL>"http://www.gnu.org/software/gnash";<em:homepageURL>
-        <em:targetPlatform>Linux_x86-gcc3</em:targetPlatform>
+        <em:targetPlatform>Linux_x86-gcc4</em:targetPlatform>
 
        </Description>  
 </RDF>

=== modified file 'plugin/Makefile.am'
--- a/plugin/Makefile.am        2009-04-16 03:02:46 +0000
+++ b/plugin/Makefile.am        2009-04-16 22:16:49 +0000
@@ -36,9 +36,10 @@
 INCLUDES = $(XPCOM_CFLAGS)
 # Adding XPCOM_LIBS here breaks loading of plugin under iceapi from lenny.
 # See bug #24469
-AM_LDFLAGS = $(XPCOM_LIBS)
+# AM_LDFLAGS = $(XPCOM_LIBS)
 SUBDIRS += xpcom
 endif
+
 if WIN32
 SUBDIRS += win32
 endif
@@ -142,7 +143,7 @@
 
 if !WIN32
 if NPAPI
-install-plugin: $(plugin_LTLIBRARIES) $(PKGLIB) install-plugins
+install-plugin: $(plugin_LTLIBRARIES) $(PKGLIB)
        @test -d "$(DESTDIR)$(plugindir)" || $(mkinstalldirs) 
"$(DESTDIR)$(plugindir)"
        @echo "Installing plugin to $(DESTDIR)$(plugindir)"
        @if test -d .libs; then \
@@ -159,14 +160,13 @@
        : # do nothing
 endif # WIN32
 
-install-plugins: install-plugin $(PKGLIB)
-       $(MAKE) -C klash install-plugins
-       $(MAKE) -C klash4 install-plugins
-       $(MAKE) -C win32 install-plugins
-
-uninstall-plugins: uninstall-plugin
-       $(MAKE) -C klash uninstall-plugins
-       $(MAKE) -C win32 uninstall-plugins
+# install-plugins: install-plugin $(PKGLIB)
+#      $(MAKE) -C klash install-plugins
+#      $(MAKE) -C klash4 install-plugins
+#      $(MAKE) -C win32 install-plugins
+# if XPCOM
+#      $(MAKE) -C xpcom install-pkglib
+# endif
 
 install-pkglib:
        $(MAKE) -C xpcom install-pkglib

=== modified file 'plugin/xpcom/Makefile.am'
--- a/plugin/xpcom/Makefile.am  2009-04-16 03:02:46 +0000
+++ b/plugin/xpcom/Makefile.am  2009-04-16 22:16:49 +0000
@@ -61,7 +61,7 @@
 
 EXT_DIR = "`dirname 
$(FIREFOX_PLUGINS)/extensions/{2b70f2b1-fc72-4734-bb81-4eb2a7713e49}`"
 
-install-plugin install-pkglib: $(pkglib_LTLIBRARIES)
+install-pkglib: iGnashComponent.h $(pkglib_LTLIBRARIES)
        @test -d "$(DESTDIR)$(EXT_DIR)" || $(mkinstalldirs) 
"$(DESTDIR)$(EXT_DIR)"
        @if test -d .libs; then \
          cp -f .libs/libgnashcomponent.so* 
$(DESTDIR)$(EXT_DIR)/libgnashcomponent.so; \