Default to rebase on submodule updates to prevent losing local changes.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5f00527bb075591fb9b9ed88c8e5ef783ee068cc..b5b66ea9d518cbd87df103d05b3d6ccda1540e07 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -681,6 +681,7 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
 ## Win                                                                    ##
 ############################################################################
 win32_destdir=$(top_builddir)/vlc-$(VERSION)
+win32_xpi_destdir=$(win32_destdir)/vlc-plugin
 win32_debugdir=$(top_builddir)/symbols-$(VERSION)
 npvlc=vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)
 axvlc=vlc-$(VERSION)/activex/axvlc$(LIBEXT)
@@ -696,12 +697,20 @@ package-win-common:
        else \
          echo "OK."; mkdir -p "$(win32_destdir)"; \
        fi
+# Same for debug symbols dir
+       @if test -e "$(win32_debugdir)"; then \
+         echo "Error: please remove $(win32_debugdir), it is in the way"; \
+         false; \
+       else \
+         echo "OK."; mkdir -p "$(win32_debugdir)"; \
+       fi
 
 # Copy relevant files
-# Copy executables and libs
+# Copy executables, major libs+manifests
        cp "$(top_builddir)/bin/.libs/vlc$(EXEEXT)" "$(win32_destdir)/"
+       cp "$(top_builddir)/bin/.libs/vlc-cache-gen$(EXEEXT)" "$(win32_destdir)/"
        cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(win32_destdir)/"
-               cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_destdir)/"
+       cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_destdir)/"
        cp "$(top_builddir)/src/.libs/libvlccore$(LIBEXT)" "$(win32_destdir)/"
        cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "$(win32_destdir)/"
 
@@ -749,6 +758,26 @@ endif
                find $(win32_destdir) -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \
        fi
 
+package-win32-xpi: package-win-common-strip
+       mkdir -p "$(win32_xpi_destdir)/plugins"
+       cp $(top_builddir)/projects/mozilla/install.rdf "$(win32_xpi_destdir)"
+       cp $(win32_destdir)/mozilla/npvlc$(LIBEXT) \
+               "$(win32_xpi_destdir)/plugins"
+       cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest \
+               "$(win32_xpi_destdir)/plugins"
+       cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" \
+               "$(win32_xpi_destdir)/plugins"
+       cp "$(win32_destdir)/libvlccore$(LIBEXT)" \
+               "$(win32_xpi_destdir)/plugins"
+       cp "$(win32_destdir)/libvlc$(LIBEXT)" \
+               "$(win32_xpi_destdir)/plugins"
+       mkdir -p "$(win32_xpi_destdir)/plugins/plugins"
+       cp $(win32_destdir)/plugins/*$(LIBEXT) \
+               "$(win32_xpi_destdir)/plugins/plugins"
+       rm -rf "$(win32_xpi_destdir)/plugins/plugins/*qt*"
+       rm -rf "$(win32_xpi_destdir)/plugins/plugins/*skins*"
+       cd $(win32_xpi_destdir) && zip -r vlc-$(VERSION).xpi install.rdf plugins
+
 package-win32-base-debug: package-win-common
 # Copy relevant files
 # Script installer
@@ -764,9 +793,6 @@ package-win32-base-debug: package-win-common
            $(INSTALL) "$$i" "vlc-$(VERSION)/plugins/" ; \
          fi ; done
 
-# Contrib *.dll's
-#      cp $(CONTRIB_DIR)/lib/*.dll "vlc-$(VERSION)/" || true
-
 #Enable DEP and ASLR for all the binaries
 if USE_PEFLAGS
        find $(win32_destdir) -type f -name '*.dll' -print -o -name '*.exe' -print | while read i; do \
@@ -900,13 +926,8 @@ endif
 
 # Strip DLLs
 package-win-common-strip: package-win32-base-debug
-       @if test -e "$(win32_debugdir)"; then \
-         echo "Error: please remove $(win32_debugdir), it is in the way"; \
-         false; \
-       else \
-         echo "OK."; mkdir -p "$(win32_debugdir)"; \
-       fi
        for i in "" $(win32_destdir)/*$(LIBEXT) \
+                   $(win32_destdir)/*$(EXEEXT) \
                    $(win32_destdir)/activex/*$(LIBEXT) \
                    $(win32_destdir)/mozilla/*$(LIBEXT) \
                    $(win32_destdir)/plugins/*$(LIBEXT) \
@@ -956,36 +977,29 @@ package-win32-base-debug-7zip: package-win32-base-debug
 # Create package
        7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-$(VERSION)-win32-debug.7z vlc-$(VERSION)
 
-package-win32-exe: package-win32-base package-win32-base-exe
-# Clean up
+package-win32-cleanup:
        rm -Rf $(win32_destdir)
+       rm -Rf $(win32_debugdir)
 
-package-win32-zip: package-win32-base-zip
-# Clean up
-       rm -Rf $(win32_destdir)
+package-win32-exe: package-win32-base package-win32-base-exe package-win32-cleanup
 
-package-win32-debug-zip: package-win32-base-debug-zip
-# Clean up
-       rm -Rf $(win32_destdir)
+package-win32-zip: package-win32-base-zip package-win32-cleanup
 
-package-win32-7zip: package-win32-base-7zip
-# Clean up
-       rm -Rf $(win32_destdir)
+package-win32-debug-zip: package-win32-base-debug-zip package-win32-cleanup
 
-package-win32-debug-7zip: package-win32-base-debug-7zip
-# Clean up
-       rm -Rf $(win32_destdir)
+package-win32-7zip: package-win32-base-7zip package-win32-cleanup
+
+package-win32-debug-7zip: package-win32-base-debug-7zip package-win32-cleanup
 
 package-win32-no-clean: package-win32-base-zip package-win32-base-7zip package-win32-base-exe 
 
-package-win32: package-win32-no-clean
-# Clean up
-       rm -Rf $(win32_destdir)
+package-win32: package-win32-no-clean package-win32-cleanup
 
-package-win32-debug: package-win32-base-debug-zip package-win32-base-debug-7zip
-# Clean up
-       rm -Rf $(win32_destdir)
+package-win32-debug: package-win32-base-debug-zip package-win32-base-debug-7zip package-win32-cleanup
 
+#######
+# WinCE
+#######
 package-wince-base: package-win-common-strip
 
 package-wince-base-zip: package-wince-base
@@ -993,9 +1007,7 @@ package-wince-base-zip: package-wince-base
        rm -f -- vlc-$(VERSION)-wince.zip
        zip -r -9 vlc-$(VERSION)-wince.zip vlc-$(VERSION)
 
-package-wince: package-wince-base-zip
-# Clean up
-       rm -Rf $(win32_destdir)
+package-wince: package-wince-base-zip package-win32-cleanup
 
 
 #####################################################################
@@ -1168,6 +1180,16 @@ if BUILD_MOZILLA
        rm -rf "$(top_builddir)/vlc-plugin-$(VERSION)"
 endif
 
+package-macosx-xpi:
+if BUILD_MOZILLA
+       mkdir -p "$(top_builddir)/macosx-xpi/plugins"
+       cp $(top_builddir)/projects/mozilla/install.rdf \
+               "$(top_builddir)/macosx-xpi/"
+       cp -R "$(top_builddir)/projects/mozilla/VLC Plugin.plugin" \
+               "$(top_builddir)/macosx-xpi/plugins"
+       cd "$(top_builddir)/macosx-xpi" && zip -r vlc-$(VERSION).xpi install.rdf plugins
+endif
+
 package-translations:
        @if test -e "$(srcdir)/vlc-translations-$(VERSION)"; then \
          echo "Error: please remove $(srcdir)/vlc-translations-$(VERSION), it is in the way"; \