Share most of binary packaging script between WinCE and Win32

diff --git a/Makefile.am b/Makefile.am
index 8322439a1ab941c9f962aa8ffedb2c810a8585df..65fabfbba3fdd8d303a36ba42c72a49295dd5ed1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -529,7 +529,8 @@ remove_distdir_woody = \
 # XXX: this rule is probably only useful to you if you have exactly
 # the same setup as me. Contact sam@zoy.org if you need to use it.
 #
-package-win32-base-debug:
+
+package-win-common:
 # Check that tmp isn't in the way
        @if test -e "$(top_builddir)/vlc-${VERSION}"; then \
          echo "Error: please remove $(top_builddir)/vlc-${VERSION}, it is in the way"; \
@@ -539,7 +540,6 @@ package-win32-base-debug:
        fi
 
 # Copy relevant files
-       cp "$(srcdir)/vlc.win32.nsi" "$(top_builddir)/vlc-${VERSION}/"
        cp "$(top_builddir)/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/"
        cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/"
        $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)"
@@ -552,13 +552,6 @@ endif
          do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; \
          unix2dos "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; done
 
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/plugins"
-       for i in "" `$(VLC_CONFIG) --target plugin` ; do \
-         if test -n "$$i" ; then \
-           $(INSTALL) "$(top_builddir)/$$i$(LIBEXT)" \
-            "$(top_builddir)/vlc-${VERSION}/plugins/" ; \
-         fi ; done
-
        mkdir $(top_builddir)/vlc-${VERSION}/locale
        for i in $(ALL_LINGUAS); do \
          mkdir -p "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \
@@ -567,26 +560,6 @@ endif
             || true ; \
        done
 
-       mkdir -p $(top_builddir)/vlc-${VERSION}/skins/fonts
-       for i in $(srcdir)/share/skins2/fonts/*.*; do \
-         cp $$i $(top_builddir)/vlc-${VERSION}/skins/fonts/ || true ; \
-       done
-       for i in $(srcdir)/share/skins2/*.*; do \
-         cp $$i $(top_builddir)/vlc-${VERSION}/skins/ || true ; \
-       done
-
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu"
-       cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-${VERSION}/osdmenu"
-       for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume;do \
-               mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir"; \
-               for file in $(srcdir)/share/osdmenu/$${dir}/*.*;do \
-                        cp $$file "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir" || true; \
-               done; \
-       done
-       unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg;
-       sed -i 's%share/osdmenu%osdmenu%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg
-       sed -i 's%/%\\%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg 
-
        mkdir -p "$(top_builddir)/vlc-${VERSION}/http/images"
        mkdir -p "$(top_builddir)/vlc-${VERSION}/http/requests"
        mkdir -p "$(top_builddir)/vlc-${VERSION}/http/js"
@@ -619,15 +592,15 @@ endif
 
        cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
 
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
 if BUILD_MOZILLA
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
        cp $(top_builddir)/mozilla/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ;
        $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT);
        cp $(top_builddir)/mozilla/vlcintf.xpt  $(top_builddir)/vlc-${VERSION}/mozilla/ ;
 endif
 
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/activex"
 if BUILD_ACTIVEX
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/activex"
        cp $(srcdir)/activex/README.TXT  $(top_builddir)/vlc-${VERSION}/activex/ ;
        cp $(srcdir)/activex/test.html  $(top_builddir)/vlc-${VERSION}/activex/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ;
@@ -640,6 +613,38 @@ endif
                find $(top_builddir)/vlc-${VERSION} -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \
        fi
 
+package-win32-base-debug: package-win-common
+# Copy relevant files
+       cp "$(srcdir)/vlc.win32.nsi" "$(top_builddir)/vlc-${VERSION}/"
+
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/plugins"
+       for i in "" `$(VLC_CONFIG) --target plugin` ; do \
+         if test -n "$$i" ; then \
+           $(INSTALL) "$(top_builddir)/$$i$(LIBEXT)" \
+            "$(top_builddir)/vlc-${VERSION}/plugins/" ; \
+         fi ; done
+
+       mkdir -p $(top_builddir)/vlc-${VERSION}/skins/fonts
+       for i in $(srcdir)/share/skins2/fonts/*.*; do \
+         cp $$i $(top_builddir)/vlc-${VERSION}/skins/fonts/ || true ; \
+       done
+       for i in $(srcdir)/share/skins2/*.*; do \
+         cp $$i $(top_builddir)/vlc-${VERSION}/skins/ || true ; \
+       done
+
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu"
+       cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-${VERSION}/osdmenu"
+       for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume;do \
+               mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir"; \
+               for file in $(srcdir)/share/osdmenu/$${dir}/*.*;do \
+                        cp $$file "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir" || true; \
+               done; \
+       done
+       unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg;
+       sed -i 's%share/osdmenu%osdmenu%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg
+       sed -i 's%/%\\%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg 
+
+
 package-win32-base: package-win32-base-debug
        for i in "" $(top_builddir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \
          do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
@@ -685,89 +690,7 @@ package-win32: package-win32-base package-win32-base-exe package-win32-base-zip
 # Clean up
        rm -Rf $(top_builddir)/vlc-${VERSION}
 
-package-wince-base:
-# Check that tmp isn't in the way
-       @if test -e "$(top_builddir)/vlc-${VERSION}"; then \
-         echo "Error: please remove $(top_builddir)/vlc-${VERSION}, it is in the way"; \
-         false; \
-       else \
-         echo "OK."; mkdir -p "$(top_builddir)/vlc-${VERSION}"; \
-       fi
-
-# Copy relevant files
-       cp "$(top_builddir)/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/"
-       cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/"
-       $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)"
-if BUILD_SHARED
-       cp "src/libvlc$(LIBEXT)" "vlc-${VERSION}/"
-       $(STRIP) "vlc-${VERSION}/libvlc$(LIBEXT)"
-endif
-
-       for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
-         do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; \
-         unix2dos "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; done
-
-       mkdir $(top_builddir)/vlc-${VERSION}/locale
-       for i in $(ALL_LINGUAS); do \
-         mkdir -p "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \
-         cp "$(srcdir)/po/$${i}.gmo" \
-           "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES/vlc.mo" \
-            || true ; \
-       done
-
-
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/images"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/requests"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/js"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/dialogs"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/vlm"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/admin"
-       cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ;
-       unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;
-       cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ;
-       unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ;
-       cp $(srcdir)/share/http/js/*.js $(top_builddir)/vlc-${VERSION}/http/js/ ;
-       unix2dos $(top_builddir)/vlc-${VERSION}/http/js/*.js ;
-       cp $(srcdir)/share/http/dialogs/* $(top_builddir)/vlc-${VERSION}/http/dialogs/ ;
-       unix2dos $(top_builddir)/vlc-${VERSION}/http/dialogs/* ;
-       cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-${VERSION}/http/ ;
-       cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-${VERSION}/http/images/
-       cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ;
-       unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/*.xml ;
-
-       cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-${VERSION}/http/old/ ;
-       unix2dos $(top_builddir)/vlc-${VERSION}/http/old/*.html ;
-       cp $(srcdir)/share/http/old/*.ico $(top_builddir)/vlc-${VERSION}/http/old/ ;
-       cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-${VERSION}/http/old/ ;
-       cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-${VERSION}/http/old/ ;
-       cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-${VERSION}/http/old/vlm/ ;
-       unix2dos $(top_builddir)/vlc-${VERSION}/http/old/vlm/*.html ;
-       cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-${VERSION}/http/old/admin/ ;
-       unix2dos $(top_builddir)/vlc-${VERSION}/http/old/admin/*.html ;
-
-       cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
-
-if BUILD_MOZILLA
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
-       cp $(top_builddir)/mozilla/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ;
-       $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT);
-       cp $(top_builddir)/mozilla/vlcintf.xpt  $(top_builddir)/vlc-${VERSION}/mozilla/ ;
-endif
-
-if BUILD_ACTIVEX
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/activex"
-       cp $(srcdir)/activex/README.TXT  $(top_builddir)/vlc-${VERSION}/activex/ ;
-       cp $(srcdir)/activex/test.html  $(top_builddir)/vlc-${VERSION}/activex/ ;
-       unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ;
-
-       cp $(top_builddir)/activex/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ;
-       $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT);
-endif
-# Rebase all those DLLs to speed up loading (need cygwin rebase)
-       if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \
-               find $(top_builddir)/vlc-${VERSION} -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \
-       fi
+package-wince-base: package-win-common
 
 package-wince-base-zip:
 # Create package