Changeset 4eb07beac6e692cfcae86ef4a065caedc17b33ea

Timestamp:

28/05/08 03:37:09 (5 months ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

Jean-Baptiste Kempf <jb@videolan.org> 1211938629 -0700

git-parent:

[95e3bb2eaf22929dac3e2c37a26a23e9a0619333]

git-author:

Jean-Baptiste Kempf <jb@videolan.org> 1211938611 -0700

Message:

Try to fix Windows packaging.

Files:

• Makefile.am (modified) (7 diffs)
• extras/package/win32/vlc.win32.nsi.in (modified) (1 diff)

Makefile.am

@@ -656 +656 @@
-#
-
+#Win-common if for win32 and wince
-package-win-common:
-# Check that tmp isn't in the way
@@ -666 +667 @@
-
-# Copy relevant files
+# Copy executables and libs
-    cp "$(top_builddir)/src/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-$(VERSION)/"
-    cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(top_builddir)/vlc-$(VERSION)/"
@@ -671 +673 @@
-    cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-$(VERSION)/"
-
+# Copy Text files
-    for file in AUTHORS MAINTAINERS THANKS ; \
-      do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-$(VERSION)/$${file}.txt" ; done;
@@ -677 +680 @@
-    unix2dos "$(top_builddir)/vlc-$(VERSION)/"*.txt
-
-
+
+
+
+
+
-    cat $(top_srcdir)/po/LINGUAS | while read i; do \
-share/
+
-      cp "$(srcdir)/po/$${i}.gmo" \
-share/
+
-            || true ; \
-    done
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-if BUILD_MOZILLA
-    mkdir -p "$(top_builddir)/vlc-$(VERSION)/mozilla"
@@ -756 +698 @@
-endif
-
+# ActiveX plugin
-if BUILD_ACTIVEX
-    mkdir -p "$(top_builddir)/vlc-$(VERSION)/activex"
@@ -764 +707 @@
-    cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/activex/
-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-win32-base-debug: package-win-common
+# Copy relevant files
+# Script installer
+    cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(top_builddir)/vlc-$(VERSION)/"
+
+# Plugins
+    mkdir -p "$(top_builddir)/vlc-$(VERSION)/plugins"
+    find modules/ -name '*_plugin$(LIBEXT)' | while read i; do \
+      if test -n "$$i" ; then \
+        $(INSTALL) "$$i" "vlc-$(VERSION)/plugins/" ; \
+      fi ; done
+
+# Copy the lua scripts (HTTP)
+if BUILD_LUA
+    mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/images"
+    mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/requests"
+    mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/js"
+    mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/dialogs"
+    cp $(srcdir)/share/lua/http/*.html $(top_builddir)/vlc-$(VERSION)/lua/http/
+    unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/*.html
+    cp $(srcdir)/share/lua/http/.hosts $(top_builddir)/vlc-$(VERSION)/lua/http/
+    unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/.hosts
+    cp $(srcdir)/share/lua/http/*.css $(top_builddir)/vlc-$(VERSION)/lua/http/
+    unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/*.css
+    cp $(srcdir)/share/lua/http/js/*.js $(top_builddir)/vlc-$(VERSION)/lua/http/js/
+    unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/js/*.js
+    cp $(srcdir)/share/lua/http/dialogs/* $(top_builddir)/vlc-$(VERSION)/lua/http/dialogs/
+    unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/dialogs/*
+    cp $(srcdir)/share/lua/http/dialogs/.hosts $(top_builddir)/vlc-$(VERSION)/lua/http/dialogs/
+    unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/dialogs/.hosts
+    cp $(srcdir)/share/lua/http/*.ico $(top_builddir)/vlc-$(VERSION)/lua/http/
+    cp $(srcdir)/share/lua/http/images/*.png $(top_builddir)/vlc-$(VERSION)/lua/http/images/
+    cp $(srcdir)/share/lua/http/requests/*.xml $(top_builddir)/vlc-$(VERSION)/lua/http/requests/
+    unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/requests/*.xml
+    cp $(srcdir)/share/lua/http/requests/readme $(top_builddir)/vlc-$(VERSION)/lua/http/requests/readme.txt
+    unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/requests/readme.txt
+endif
+
+if BUILD_LUA
+#Lua Scripts
+    $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/lua/playlist
+    for i in $(srcdir)/share/lua/playlist/*.* ; do \
+      $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/lua/playlist/`basename $${i}` ; \
+    done
+    $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/lua/meta
+    for i in $(srcdir)/share/lua/meta/*.* ; do \
+      $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/lua/meta/`basename $${i}` ; \
+    done
+    $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/lua/intf
+    for i in $(srcdir)/share/lua/intf/*.* ; do \
+      $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/lua/intf/`basename $${i}` ; \
+    done
+    $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/lua/intf/modules
+    for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
+      $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/lua/intf/modules/`basename $${i}` ; \
+    done
+endif
+
+# Copy the http files
+if BUILD_HTTPD
+    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/.hosts $(top_builddir)/vlc-$(VERSION)/http/
+    unix2dos $(top_builddir)/vlc-$(VERSION)/http/.hosts
+    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/dialogs/.hosts $(top_builddir)/vlc-$(VERSION)/http/dialogs/
+    unix2dos $(top_builddir)/vlc-$(VERSION)/http/dialogs/.hosts
+    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/requests/readme $(top_builddir)/vlc-$(VERSION)/http/requests/readme.txt
+    unix2dos $(top_builddir)/vlc-$(VERSION)/http/requests/readme.txt
+
+    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/*.css $(top_builddir)/vlc-$(VERSION)/http/old/
+    cp $(srcdir)/share/http/old/.hosts $(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/http/old/admin/.access $(top_builddir)/vlc-$(VERSION)/http/old/admin/
+endif
+
+if BUILD_SKINS
+# Skins
+    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
+endif
+
+if BUILD_OSDMENU
+#OSD Menu
+    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 minimal;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"; \
+        done; \
+    done
+    unix2dos $(top_builddir)/vlc-$(VERSION)/osdmenu/*.cfg;
+    for file in $(top_builddir)/vlc-$(VERSION)/osdmenu/*.cfg; do \
+        sed 's%share/osdmenu%osdmenu%g' "$$file" > "$$file.tmp" || exit $$? ; \
+        sed 's%/%\\%g' "$$file.tmp" > "$$file" || exit$$? ; \
+        rm -f -- "$$file.tmp"; \
+    done
+endif
-
-package-win-common-strip:
@@ -778 +849 @@
-if BUILD_ACTIVEX
-    $(STRIP) $(top_builddir)/vlc-$(VERSION)/activex/axvlc$(LIBEXT);
-endif
-
-package-win32-base-debug: package-win-common
-# Copy relevant files
-# Script installer
-    cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(top_builddir)/vlc-$(VERSION)/"
-
-# Plugins
-    mkdir -p "$(top_builddir)/vlc-$(VERSION)/plugins"
-    find modules/ -name '*_plugin$(LIBEXT)' | while read i; do \
-      if test -n "$$i" ; then \
-        $(INSTALL) "$$i" "vlc-$(VERSION)/plugins/" ; \
-      fi ; done
-
-if BUILD_SKINS
-# Skins
-    mkdir -p $(top_builddir)/vlc-$(VERSION)/skins/fonts
-    for i in $(srcdir)/share/skins2/fonts/*.*; do \
-      cp -- "$$i" $(top_builddir)/vlc-$(VERSION)/share/skins/fonts/ || true ; \
-    done
-    for i in $(srcdir)/share/skins2/*.*; do \
-      cp -- "$$i" $(top_builddir)/vlc-$(VERSION)/share/skins/ || true ; \
-    done
-endif
-
-if BUILD_LUA
-#Lua Scripts
-    $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/playlist
-    for i in $(srcdir)/share/lua/playlist/*.* ; do \
-      $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua/playlist/`basename $${i}` ; \
-    done
-    $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/meta
-    for i in $(srcdir)/share/lua/meta/*.* ; do \
-      $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua/meta/`basename $${i}` ; \
-    done
-    $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/intf
-    for i in $(srcdir)/share/lua/intf/*.* ; do \
-      $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua/intf/`basename $${i}` ; \
-    done
-    $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules
-    for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
-      $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules/`basename $${i}` ; \
-    done
-endif
-
-if BUILD_OSDMENU
-#OSD Menu
-    mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/osdmenu"
-    cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-$(VERSION)/share/osdmenu"
-    for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume minimal;do \
-        mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/osdmenu/$$dir"; \
-        for file in $(srcdir)/share/osdmenu/$${dir}/* ;do \
-             cp -- "$$file" "$(top_builddir)/vlc-$(VERSION)/share/osdmenu/$$dir"; \
-        done; \
-    done
-    unix2dos $(top_builddir)/vlc-$(VERSION)/share/osdmenu/*.cfg;
-    for file in $(top_builddir)/vlc-$(VERSION)/share/osdmenu/*.cfg; do \
-        sed 's%share/osdmenu%osdmenu%g' "$$file" > "$$file.tmp" || exit $$? ; \
-        sed 's%/%\\%g' "$$file.tmp" > "$$file" || exit$$? ; \
-        rm -f -- "$$file.tmp"; \
-    done
-endif
-

extras/package/win32/vlc.win32.nsi.in

@@ -401 +401 @@
-  !insertmacro InstallFolder http
-  ;!insertmacro InstallFolder share
-
+
+
-
-  ; URLs