X-Git-Url: https://git.sesse.net/?p=vlc;a=blobdiff_plain;f=Makefile.am;h=e366e9a516b4f828304ccb4cb22cf9b9077d2aa5;hp=93a6e04c709517af7c8922d69766698a73da34a7;hb=HEAD;hpb=6f8279db2220c2e0ebac6e28eb17230189ddae7e diff --git a/Makefile.am b/Makefile.am index 93a6e04c70..e366e9a516 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,7 +8,7 @@ # - src (libvlc) is nedeed by modules, mozilla and bindings # - libs/* are needed by modules BASE_SUBDIRS = po compat src bin modules share doc test -EXTRA_SUBDIRS = m4 extras/package/ipkg \ +EXTRA_SUBDIRS = m4 \ libs/loader libs/srtp libs/unzip \ projects/mozilla projects/activex DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS) @@ -17,7 +17,7 @@ SUBDIRS = po compat src if LOADER SUBDIRS += libs/loader endif -if HAVE_LIBGCRYPT +if HAVE_GCRYPT SUBDIRS += libs/srtp endif if HAVE_ZLIB @@ -39,23 +39,49 @@ endif EXTRA_DIST = \ HACKING \ INSTALL.win32 \ - INSTALL.wince \ extras/package/win32/vlc.exe.manifest \ extras/package/win32/libvlc.dll.manifest \ - MAINTAINERS \ extras/package/macosx/README.MacOSX.rtf \ vlc-config.in.in \ extras/package/rpm/vlc.fedora.spec \ extras/package/rpm/vlc.altlinux.spec \ extras/package/win32/vlc.win32.nsi.in \ + extras/package/win32/spad.nsi.in \ + extras/package/win32/UAC.nsh \ + extras/package/win32/UAC.dll \ extras/package/win32/languages/declaration.nsh \ + extras/package/win32/languages/bengali.nsh \ + extras/package/win32/languages/brazilian_portuguese.nsh \ + extras/package/win32/languages/bulgarian.nsh \ + extras/package/win32/languages/catalan.nsh \ + extras/package/win32/languages/danish.nsh \ + extras/package/win32/languages/dutch.nsh \ extras/package/win32/languages/english.nsh \ - extras/package/win32/languages/french.nsh - -dist_noinst_SCRIPTS = bootstrap toolbox + extras/package/win32/languages/estonian.nsh \ + extras/package/win32/languages/finnish.nsh \ + extras/package/win32/languages/french.nsh \ + extras/package/win32/languages/german.nsh \ + extras/package/win32/languages/hungarian.nsh \ + extras/package/win32/languages/italian.nsh \ + extras/package/win32/languages/japanese.nsh \ + extras/package/win32/languages/occitan.nsh \ + extras/package/win32/languages/polish.nsh \ + extras/package/win32/languages/punjabi.nsh \ + extras/package/win32/languages/romanian.nsh \ + extras/package/win32/languages/schinese.nsh \ + extras/package/win32/languages/slovak.nsh \ + extras/package/win32/languages/slovenian.nsh \ + extras/package/win32/languages/sorani.nsh \ + extras/package/win32/languages/spanish.nsh + +dist_noinst_SCRIPTS = bootstrap nodist_noinst_SCRIPTS = compile -BUILT_SOURCES_distclean = vlc-config extras/package/win32/vlc.win32.nsi +BUILT_SOURCES_distclean = vlc-config +if HAVE_WIN32 +BUILT_SOURCES_distclean += \ + extras/package/win32/vlc.win32.nsi extras/package/win32/spad.nsi +endif if HAVE_DARWIN BUILT_SOURCES_clean = macosx-sdk else @@ -68,18 +94,22 @@ SUFFIXES = DISTCHECK_CONFIGURE_FLAGS = \ --enable-fast-install \ + --disable-a52 \ + --disable-avcodec --disable-avformat \ + --disable-postproc --disable-swscale \ --disable-dbus \ - --disable-dvd --disable-mad --disable-libmpeg2 \ - --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 \ + --disable-mad --disable-libmpeg2 \ + --disable-faad --disable-skins2 \ --disable-live555 \ - --disable-fribidi --disable-glx + --disable-fribidi --disable-glx \ + --with-kde-solid='$${datadir}/kde4/apps' ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = \ - 1.9 \ + 1.11 \ -Wall \ check-news \ - dist-bzip2 \ + dist-xz \ no-dist-gzip # std-options @@ -95,37 +125,26 @@ ChangeLog: Makefile.am EXTRA_DIST += \ extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/MediaInfo.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/MediaInfo.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/MediaInfo.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/MediaInfo.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/About.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/About.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/About.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/About.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Open.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Open.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Preferences.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/Wizard.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Wizard.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Wizard.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/Wizard.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/Bookmarks.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Bookmarks.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Bookmarks.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/Extended.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Extended.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Extended.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/Extended.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/Update.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Update.nib/info.nib \ - extras/package/macosx/Resources/English.lproj/Update.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/keyedobjects.nib \ extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in \ + extras/package/macosx/Resources/dsa_pub.pem \ extras/package/macosx/Resources/aiff.icns \ extras/package/macosx/Resources/audio.icns \ extras/package/macosx/Resources/avi.icns \ @@ -308,9 +327,6 @@ EXTRA_DIST += \ extras/misc/mpris.py \ extras/misc/mpris.glade -dist-hook: - distdir=$(distdir) srcdir=$(srcdir) $(SHELL) $(srcdir)/toolbox --dist-contrib - ############################################################################### # Building libvlc ############################################################################### @@ -329,7 +345,7 @@ CLEANFILES = $(BUILT_SOURCES_clean) DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile MAINTAINERCLEANFILES = ChangeLog -# Shortcut for developpers to rebuild the core (libvlc + vlc) +# Shortcut for developers to rebuild the core (libvlc + vlc) # Don't use it if you don't know what it is about. # Don't complain if it doesn't work. -- Courmisch libcompat: @@ -338,18 +354,14 @@ libcompat: libvlc: libcompat cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la -core: libvlc - cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) +core: libvlc vlc + cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) vlc-static$(EXEEXT) doc: cd doc && $(MAKE) $(AM_MAKEFLAGS) doc .PHONY: libvlc core doc -#To get some nice output -nice: - $(top_builddir)/compile - if HAVE_BEOS noinst_DATA = vlc-bundle vlc-bundle: vlc @@ -362,9 +374,9 @@ vlc-bundle: vlc cp "$$i$(LIBEXT)" $(top_builddir)/vlc-bundle/plugins/ ; \ fi ; \ done - if test -d $(top_builddir)/extras/contrib/vlc-lib ; then \ + if test -d $(CONTRIB_DIR)/vlc-lib ; then \ mkdir -p $(top_builddir)/vlc-bundle/lib ; \ - for i in $(top_builddir)/extras/contrib/vlc-lib/*.so ; do \ + for i in $(CONTRIB_DIR)/vlc-lib/*.so ; do \ cp $$i $(top_builddir)/vlc-bundle/lib/ ; \ done ; \ fi @@ -380,7 +392,7 @@ endif # Building aliases ############################################################################### -ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc mvlc +ALL_ALIASES = cvlc rvlc svlc qvlc nvlc mvlc bin_SCRIPTS = $(ALIASES) CLEANFILES += $(ALIASES) $(noinst_SCRIPTS) EXTRA_SCRIPTS = $(ALL_ALIASES) @@ -390,57 +402,60 @@ dist_noinst_SCRIPTS += make-alias MKALIAS = bindir="$(bindir)" transform="$(transform)" program_prefix="$(program_prefix)" program_suffix="$(program_suffix)" $(top_srcdir)/make-alias $@ cvlc: make-alias Makefile - $(MKALIAS) dummy + $(AM_V_GEN)$(MKALIAS) dummy rvlc: make-alias Makefile - $(MKALIAS) rc + $(AM_V_GEN)$(MKALIAS) rc svlc: make-alias Makefile - $(MKALIAS) skins2 - -wxvlc: make-alias Makefile - $(MKALIAS) wx + $(AM_V_GEN)$(MKALIAS) skins2 qvlc: make-alias Makefile - $(MKALIAS) qt4 + $(AM_V_GEN)$(MKALIAS) qt4 nvlc: make-alias Makefile - $(MKALIAS) ncurses + $(AM_V_GEN)$(MKALIAS) ncurses mvlc: make-alias Makefile - $(MKALIAS) maemo + $(AM_V_GEN)$(MKALIAS) maemo if BUILD_VLC noinst_SCRIPTS += vlc$(EXEEXT) endif vlc$(EXEEXT): - ln -sf bin/vlc-static$(EXEEXT) vlc$(EXEEXT) + $(AM_V_GEN)ln -sf bin/vlc-static$(EXEEXT) vlc$(EXEEXT) if HAVE_DARWIN -if BUILD_VLC +if BUILD_MACOSX_VLC_APP # Create the MacOS X app noinst_DATA = VLC.app endif endif +silentstd = $(silentstd_$(V)) +silentstd_ = $(silentstd_$(AM_DEFAULT_VERBOSITY)) +silentstd_0 = 2>&1 >/dev/null + # VLC-release.app for packaging and giving it to your friends # use package-macosx to get a nice dmg VLC-release.app: vlc - ( cd src && make install ) + ( cd src && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd) ) rm -Rf "$(top_builddir)/tmp" mkdir -p "$(top_builddir)/tmp/extras/package/macosx" rm -Rf $(top_builddir)/VLC-release.app for i in vlc.xcodeproj Resources README.MacOSX.rtf ; do \ cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ done - REVISION=`git describe --always` && \ + REVISION=`(git --git-dir=$(srcdir)/.git describe --always || echo exported)` && \ cat $(top_builddir)/extras/package/macosx/Info.plist | \ sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/ for i in AUTHORS COPYING THANKS; do \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ done + mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle + cp -R $(CONTRIB_DIR)/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle mkdir -p $(top_builddir)/tmp/modules/audio_output mkdir -p $(top_builddir)/tmp/modules/gui/macosx for i in \ @@ -481,8 +496,6 @@ VLC-release.app: vlc extended.m \ bookmarks.h \ bookmarks.m \ - update.h \ - update.m \ coredialogs.h \ coredialogs.m \ embeddedwindow.h \ @@ -493,10 +506,10 @@ VLC-release.app: vlc cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done - cd $(top_builddir)/tmp/extras/package/macosx && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ - cd ../../../../ && \ - cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \ - $(top_builddir)/VLC-release.app; \ + $(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \ + xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \ + cd ../../../../ && \ + cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC-release.app; \ rm -Rf $(top_builddir)/tmp $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS PRODUCT="VLC-release.app" ACTION="release-makefile" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh @@ -540,16 +553,12 @@ VLC-release.app: vlc for i in $(srcdir)/share/lua/http/requests/*.* ; do \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/`basename $${i}` ; \ done - $(INSTALL) -m 644 $(srcdir)/share/lua/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/readme.txt + $(INSTALL) -m 644 $(srcdir)/share/lua/http/requests/README.txt $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/README.txt $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests $(INSTALL) -m 644 $(srcdir)/share/http/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/.hosts - $(INSTALL) -m 644 $(srcdir)/share/http/old/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/.hosts for i in $(srcdir)/share/http/*.* ; do \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \ done @@ -559,22 +568,13 @@ VLC-release.app: vlc for i in $(srcdir)/share/http/js/*.* ; do \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js/`basename $${i}` ; \ done - for i in $(srcdir)/share/http/old/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/`basename $${i}` ; \ - done - for i in $(srcdir)/share/http/old/admin/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin/`basename $${i}` ; \ - done - for i in $(srcdir)/share/http/old/vlm/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm/`basename $${i}` ; \ - done for i in $(srcdir)/share/http/images/*.* ; do \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images/`basename $${i}` ; \ done for i in $(srcdir)/share/http/requests/*.* ; do \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/`basename $${i}` ; \ done - $(INSTALL) -m 644 $(srcdir)/share/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/readme.txt + $(INSTALL) -m 644 $(srcdir)/share/http/requests/README.txt $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/README.txt $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale cat $(top_srcdir)/po/LINGUAS | while read i; do \ $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \ @@ -586,8 +586,6 @@ VLC-release.app: vlc $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ done printf "APPLVLC#" >| $(top_builddir)/VLC-release.app/Contents/PkgInfo - find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name classes.nib -delete; - find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name info.nib -delete; find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name designable.nib -delete; find $(top_builddir)/VLC-release.app -type d -exec chmod ugo+rx '{}' \; find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \; @@ -595,20 +593,22 @@ VLC-release.app: vlc # This is just for development purposes. # The resulting VLC.app will only run in this tree. VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.libs/libvlc.dylib - (cd src && make install) + $(AM_V_GEN)(cd src && make install $(silentstd)) rm -Rf $(top_builddir)/tmp mkdir -p "$(top_builddir)/tmp/extras/package/macosx" rm -Rf $(top_builddir)/VLC.app for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \ cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ done - REVISION=`git describe --always` && \ + REVISION=`(git --git-dir=$(srcdir)/.git describe --always || echo exported)` && \ cat $(top_builddir)/extras/package/macosx/Info.plist | \ sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/ for i in AUTHORS COPYING THANKS; do \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ done + mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle + cp -R $(CONTRIB_DIR)/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle mkdir -p $(top_builddir)/tmp/modules/audio_output mkdir -p $(top_builddir)/tmp/modules/gui/macosx for i in \ @@ -649,8 +649,6 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib extended.m \ bookmarks.h \ bookmarks.m \ - update.h \ - update.m \ coredialogs.h \ coredialogs.m \ embeddedwindow.h \ @@ -661,15 +659,15 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done - cd $(top_builddir)/tmp/extras/package/macosx && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ - cd ../../../../ && \ - cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \ - $(top_builddir)/VLC.app + $(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \ + xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \ + cd ../../../../ && \ + cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC.app $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS touch $(top_builddir)/VLC.app/Contents/MacOS/VLC chmod +x $(top_builddir)/VLC.app/Contents/MacOS/VLC $(INSTALL) $(top_builddir)/bin/.libs/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC - ln -sf ../../../modules $(top_builddir)/VLC.app/Contents/MacOS/modules + ln -sf ../../../modules $(top_builddir)/VLC.app/Contents/MacOS/plugins install -d $(top_builddir)/VLC.app/Contents/MacOS/share for i in `ls $(srcdir)/share`; do \ ln -sf `pwd`/$(srcdir)/share/$$i $(top_builddir)/VLC.app/Contents/MacOS/share/; \ @@ -697,131 +695,64 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib ############################################################################ ## Win ## ############################################################################ +destdir=$(prefix) win32_destdir=$(top_builddir)/vlc-$(VERSION) win32_debugdir=$(top_builddir)/symbols-$(VERSION) -npvlc=vlc-$(VERSION)/mozilla/npvlc$(LIBEXT) -axvlc=vlc-$(VERSION)/activex/axvlc$(LIBEXT) win32_lua_destdir=$(win32_destdir)/lua -win32_http_destdir=$(win32_destdir)/http +win32_xpi_destdir=$(win32_destdir)/vlc-plugin -#Win-common if for win32 and wince -package-win-common: +#Win-common is for win32 and wince +package-win-common: install # Check that tmp isn't in the way @if test -e "$(win32_destdir)"; then \ - echo "Error: please remove $(win32_destdir), it is in the way"; \ - false; \ + echo "Error: please remove $(win32_destdir), it is in the way"; \ + false; \ + elif test -e "$(win32_debugdir)"; then \ + echo "Error: please remove $(win32_debugdir), it is in the way"; \ + false; \ else \ - echo "OK."; mkdir -p "$(win32_destdir)"; \ + echo "Debug dir OK."; mkdir -p "$(win32_debugdir)"; \ + echo "Dest dir OK."; mkdir -p "$(win32_destdir)"; \ fi -# Copy relevant files -# Copy executables and libs - cp "$(top_builddir)/bin/.libs/vlc$(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_builddir)/src/.libs/libvlccore$(LIBEXT)" "$(win32_destdir)/" - cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "$(win32_destdir)/" +# Executables, major libs+manifests + find $(destdir) -maxdepth 4 \( -name "*$(LIBEXT)" -o -name "*$(EXEEXT)" \) -exec cp {} "$(win32_destdir)/" \; + for file in $(top_srcdir)/extras/package/win32/vlc$(EXEEXT).manifest \ + $(top_srcdir)/extras/package/win32/libvlc$(LIBEXT).manifest; \ + do cp $$file "$(win32_destdir)/" ; done; -# Copy Text files - for file in AUTHORS MAINTAINERS THANKS ; \ +# Text files and clean them + for file in AUTHORS THANKS ; \ do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(win32_destdir)/$${file}.txt" ; done; for file in NEWS COPYING README; \ do cp "$(srcdir)/$$file" "$(win32_destdir)/$${file}.txt"; done - unix2dos "$(win32_destdir)/"*.txt || echo "WARNING: this shouldn't happen" -# Necessary icons - cp $(srcdir)/share/vlc.ico $(win32_destdir)/ +# Necessary icon + cp $(srcdir)/share/icons/vlc.ico $(win32_destdir) -# Copy the locales - mkdir -p $(win32_destdir)/locale - cat $(top_srcdir)/po/LINGUAS | while read i; do \ - mkdir -p "$(win32_destdir)/locale/$${i}/LC_MESSAGES" ; \ - cp "$(srcdir)/po/$${i}.gmo" \ - "$(win32_destdir)/locale/$${i}/LC_MESSAGES/vlc.mo" \ - || true ; \ - done - mkdir -p $(win32_destdir)/locale/qt4/ - cp $(QT4LOCALEDIR)/*.qm $(win32_destdir)/locale/qt4/ || true - -# Mozilla plugin -if BUILD_MOZILLA - mkdir -p "$(win32_destdir)/mozilla" - cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(win32_destdir)/mozilla/ - cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)/mozilla/ -endif - -# ActiveX plugin -if BUILD_ACTIVEX - mkdir -p "$(win32_destdir)/activex" - cp $(srcdir)/projects/activex/README.TXT $(win32_destdir)/activex/ - cp $(srcdir)/projects/activex/test.html $(win32_destdir)/activex/ - unix2dos $(win32_destdir)/activex/* - - cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(win32_destdir)/activex/ - cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)/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 $(win32_destdir) -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" "$(win32_destdir)/" - mkdir "$(win32_destdir)/languages" - cp $(srcdir)/extras/package/win32/languages/*.nsh "$(win32_destdir)/languages/" +# Locales + -cp -r $(destdir)/share/locale $(win32_destdir) # Plugins - mkdir -p "$(win32_destdir)/plugins" - find modules/ -name '*_plugin$(LIBEXT)' | while read i; do \ - if test -n "$$i" ; then \ - $(INSTALL) "$$i" "vlc-$(VERSION)/plugins/" ; \ - fi ; done - -# Contrib *.dll's - cp $(srcdir)/extras/contrib/lib/*.dll "vlc-$(VERSION)/" || true + cp -r $(destdir)/lib/vlc/plugins $(win32_destdir) -# Copy the lua scripts (HTTP) if BUILD_LUA - mkdir -p "$(win32_lua_destdir)/http/images" - mkdir -p "$(win32_lua_destdir)/http/requests" - mkdir -p "$(win32_lua_destdir)/http/js" - mkdir -p "$(win32_lua_destdir)/http/dialogs" - cp $(srcdir)/share/lua/http/*.html $(win32_lua_destdir)/http/ - unix2dos $(win32_lua_destdir)/http/*.html - cp $(srcdir)/share/lua/http/.hosts $(win32_lua_destdir)/http/ - unix2dos $(win32_lua_destdir)/http/.hosts - cp $(srcdir)/share/lua/http/*.css $(win32_lua_destdir)/http/ - unix2dos $(win32_lua_destdir)/http/*.css - cp $(srcdir)/share/lua/http/js/*.js $(win32_lua_destdir)/http/js/ - unix2dos $(win32_lua_destdir)/http/js/*.js - cp $(srcdir)/share/lua/http/dialogs/* $(win32_lua_destdir)/http/dialogs/ - unix2dos $(win32_lua_destdir)/http/dialogs/* - cp $(srcdir)/share/lua/http/dialogs/.hosts $(win32_lua_destdir)/http/dialogs/ - unix2dos $(win32_lua_destdir)/http/dialogs/.hosts - cp $(srcdir)/share/lua/http/*.ico $(win32_lua_destdir)/http/ - cp $(srcdir)/share/lua/http/images/*.png $(win32_lua_destdir)/http/images/ - cp $(srcdir)/share/lua/http/requests/*.xml $(win32_lua_destdir)/http/requests/ - unix2dos $(win32_lua_destdir)/http/requests/*.xml - cp $(srcdir)/share/lua/http/requests/readme $(win32_lua_destdir)/http/requests/readme.txt - unix2dos $(win32_lua_destdir)/http/requests/readme.txt -endif +# Copy the lua scripts (HTTP) + mkdir -p $(win32_lua_destdir) + cp -r $(destdir)/share/vlc/lua/http "$(win32_lua_destdir)/http" -if BUILD_LUA -#Lua Scripts +# Lua Scripts - cannot be simplified yet, because make install doesn't install READMEs $(INSTALL) -d $(win32_lua_destdir) for i in $(srcdir)/share/lua/*.* ; do \ $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/`basename $${i}` ; \ done - $(INSTALL) -d $(win32_lua_destdir)/playlist - for i in $(srcdir)/share/lua/playlist/*.* ; do \ - $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/playlist/`basename $${i}` ; \ + $(INSTALL) -d $(win32_lua_destdir)/modules + for i in $(srcdir)/share/lua/modules/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/modules/`basename $${i}` ; \ done - $(INSTALL) -d $(win32_lua_destdir)/meta - for i in $(srcdir)/share/lua/meta/*.* ; do \ - $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/`basename $${i}` ; \ + $(INSTALL) -d $(win32_lua_destdir)/extensions + for i in $(srcdir)/share/lua/extensions/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/extensions/`basename $${i}` ; \ done $(INSTALL) -d $(win32_lua_destdir)/intf for i in $(srcdir)/share/lua/intf/*.* ; do \ @@ -831,131 +762,109 @@ if BUILD_LUA for i in $(srcdir)/share/lua/intf/modules/*.* ; do \ $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/intf/modules/`basename $${i}` ; \ done + $(INSTALL) -d $(win32_lua_destdir)/meta/art + for i in $(srcdir)/share/lua/meta/art/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/art/`basename $${i}` ; \ + done + $(INSTALL) -d $(win32_lua_destdir)/meta/fetcher + for i in $(srcdir)/share/lua/meta/fetcher/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/fetcher/`basename $${i}` ; \ + done + $(INSTALL) -d $(win32_lua_destdir)/meta/reader + for i in $(srcdir)/share/lua/meta/reader/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/reader/`basename $${i}` ; \ + done + $(INSTALL) -d $(win32_lua_destdir)/playlist + for i in $(srcdir)/share/lua/playlist/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/playlist/`basename $${i}` ; \ + done + $(INSTALL) -d $(win32_lua_destdir)/sd + for i in $(srcdir)/share/lua/sd/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/sd/`basename $${i}` ; \ + done endif -# Copy the http files if BUILD_HTTPD - mkdir -p "$(win32_http_destdir)/images" - mkdir -p "$(win32_http_destdir)/requests" - mkdir -p "$(win32_http_destdir)/js" - mkdir -p "$(win32_http_destdir)/dialogs" - mkdir -p "$(win32_http_destdir)/old" - mkdir -p "$(win32_http_destdir)/old/vlm" - mkdir -p "$(win32_http_destdir)/old/admin" - cp $(srcdir)/share/http/*.html $(win32_http_destdir)/ - unix2dos $(win32_http_destdir)/*.html - cp $(srcdir)/share/http/.hosts $(win32_http_destdir)/ - unix2dos $(win32_http_destdir)/.hosts - cp $(srcdir)/share/http/*.css $(win32_http_destdir)/ - unix2dos $(win32_http_destdir)/*.css - cp $(srcdir)/share/http/js/*.js $(win32_http_destdir)/js/ - unix2dos $(win32_http_destdir)/js/*.js - cp $(srcdir)/share/http/dialogs/* $(win32_http_destdir)/dialogs/ - unix2dos $(win32_http_destdir)/dialogs/* - cp $(srcdir)/share/http/dialogs/.hosts $(win32_http_destdir)/dialogs/ - unix2dos $(win32_http_destdir)/dialogs/.hosts - cp $(srcdir)/share/http/*.ico $(win32_http_destdir)/ - cp $(srcdir)/share/http/images/*.png $(win32_http_destdir)/images/ - cp $(srcdir)/share/http/requests/*.xml $(win32_http_destdir)/requests/ - unix2dos $(win32_http_destdir)/requests/*.xml - cp $(srcdir)/share/http/requests/readme $(win32_http_destdir)/requests/readme.txt - unix2dos $(win32_http_destdir)/requests/readme.txt - - cp $(srcdir)/share/http/old/*.html $(win32_http_destdir)/old/ - unix2dos $(win32_http_destdir)/old/*.html - cp $(srcdir)/share/http/old/*.css $(win32_http_destdir)/old/ - cp $(srcdir)/share/http/old/.hosts $(win32_http_destdir)/old/ - cp $(srcdir)/share/http/old/*.png $(win32_http_destdir)/old/ - cp $(srcdir)/share/http/old/vlm/*.html $(win32_http_destdir)/old/vlm/ - unix2dos $(win32_http_destdir)/old/vlm/*.html - cp $(srcdir)/share/http/old/admin/*.html $(win32_http_destdir)/old/admin/ - unix2dos $(win32_http_destdir)/old/admin/*.html - cp $(srcdir)/share/http/old/admin/.access $(win32_http_destdir)/old/admin/ + cp -r $(destdir)/share/vlc/http $(win32_destdir) endif - if BUILD_SKINS -# Skins - mkdir -p $(win32_destdir)/skins/fonts - for i in $(srcdir)/share/skins2/fonts/*.*; do \ - cp -- "$$i" $(win32_destdir)/skins/fonts/ || true ; \ - done - for i in $(top_builddir)/share/skins2/*.*; do \ - cp -- "$$i" $(win32_destdir)/skins/ || true ; \ - done - cp -- $(srcdir)/share/skins2/skin.catalog $(win32_destdir)/skins/ || true ; - cp -- $(srcdir)/share/skins2/skin.dtd $(win32_destdir)/skins/ || true ; + cp -r $(destdir)/share/vlc/skins2 $(win32_destdir)/skins endif - if BUILD_OSDMENU -#OSD Menu - mkdir -p "$(win32_destdir)/osdmenu" - cp $(srcdir)/share/osdmenu/*.* "$(win32_destdir)/osdmenu" - for dir in default default/selected default/selection default/volume ;do \ - mkdir -p "$(win32_destdir)/osdmenu/$$dir"; \ - for file in $(srcdir)/share/osdmenu/$${dir}/*.png;do \ - cp -- "$$file" "$(win32_destdir)/osdmenu/$$dir"; \ - done; \ - done - unix2dos $(win32_destdir)/osdmenu/*.cfg; + cp -r $(destdir)/share/vlc/osdmenu "$(win32_destdir)/osdmenu" for file in $(win32_destdir)/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 - -# SDK - mkdir -p "$(win32_destdir)/sdk.tmp" - mkdir -p "$(win32_destdir)/sdk" - d=$$(pwd) && \ - cd src && \ - make install DESTDIR="$$d/vlc-$(VERSION)/sdk.tmp" - cd vlc-$(VERSION) && mv sdk.tmp/$(prefix)/* sdk/ - find vlc-$(VERSION)/sdk.tmp -type d | sort -r | xargs rmdir - rm -Rf vlc-$(VERSION)/sdk/bin - -#strip exe and main dll -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 "" vlc-$(VERSION)/*$(LIBEXT) ; \ - do if test -n "$$i" ; then \ - $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \ - $(OBJCOPY) --strip-debug "$$i" ; \ - $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \ - mv "$$i.dbg" "$(win32_debugdir)"; \ - fi; done - if BUILD_MOZILLA - $(OBJCOPY) --only-keep-debug "$(npvlc)" "$(npvlc).dbg" - $(OBJCOPY) --strip-debug "$(npvlc)" - $(OBJCOPY) --add-gnu-debuglink="$(npvlc).dbg" "$(npvlc)" - mv "$(npvlc).dbg" "$(win32_debugdir)" + cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir) endif if BUILD_ACTIVEX - $(OBJCOPY) --only-keep-debug "$(axvlc)" "$(axvlc).dbg" - $(OBJCOPY) --strip-debug "$(axvlc)" - $(OBJCOPY) --add-gnu-debuglink="$(axvlc).dbg" "$(axvlc)" - mv "$(axvlc).dbg" "$(win32_debugdir)" + cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir) endif -#strip all plugins dll -package-win32-base: package-win-common-strip - for i in "" $(win32_destdir)/plugins/*$(LIBEXT) ; \ - do if test -n "$$i" ; then \ - $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \ - $(OBJCOPY) --strip-debug "$$i" ; \ - $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \ - mv "$$i.dbg" "$(win32_debugdir)"; \ - fi ; done - -package-win32-base-exe: package-win32-base +# SDK + mkdir -p "$(win32_destdir)/sdk/lib" + cp -r $(destdir)/include "$(win32_destdir)/sdk" + cp -r $(destdir)/lib/pkgconfig "$(win32_destdir)/sdk/lib" + for file in libvlc.dll.a libvlc.la libvlccore.dll.a libvlccore.la; do \ + cp -r $(destdir)/lib/$$file "$(win32_destdir)/sdk/lib"; done +if BUILD_ACTIVEX + mkdir -p "$(win32_destdir)/sdk/activex" + cp $(srcdir)/projects/activex/README.TXT $(win32_destdir)/sdk/activex/ + cp $(srcdir)/projects/activex/test.html $(win32_destdir)/sdk/activex/ +endif + + find $(win32_destdir) -type f \( -name "*xml" -or -name "*html" -or -name '*js' -or -name '*css' -or -name '*hosts' -or -iname '*txt' -or -name '*.cfg' -or -name '*.lua' \) -exec $(U2D) {} \; + +#Enable DEP and ASLR for all the binaries +if USE_PEFLAGS + find $(win32_destdir) -type f \( -name '*$(LIBEXT)' -print -o -name '*$(EXEEXT)' -print \) -exec $(PEFLAGS) --dynamicbase=true --nxcompat=true {} \; +endif + +# Strip DLLs +package-win-base: package-win-common + find $(win32_destdir) -type f \( -name '*$(LIBEXT)' -or -name '*$(EXEEXT)' \) | while read i; \ + do if test -n "$$i" ; then \ + $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \ + $(OBJCOPY) --strip-all "$$i" ; \ + $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \ + mv "$$i.dbg" "$(win32_debugdir)"; \ + fi ; \ + done + +package-win32-webplugin-common: package-win-base + mkdir -p "$(win32_xpi_destdir)/plugins" + find $(destdir) -maxdepth 4 -name "*$(LIBEXT)" -exec cp {} "$(win32_xpi_destdir)/" \; + 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 -r $(win32_destdir)/plugins/ "$(win32_xpi_destdir)/plugins" + rm -rf "$(win32_xpi_destdir)/plugins/plugins/*qt*" + rm -rf "$(win32_xpi_destdir)/plugins/plugins/*skins*" + +package-win32-xpi: package-win32-webplugin-common + cp $(top_builddir)/projects/mozilla/install.rdf "$(win32_xpi_destdir)" + cd $(win32_xpi_destdir) && zip -r "../vlc-$(VERSION).xpi" install.rdf plugins + +package-win32-crx: package-win32-webplugin-common + cp $(top_builddir)/projects/mozilla/manifest.json "$(win32_xpi_destdir)" + crxmake --pack-extension "$(win32_xpi_destdir)" \ + --extension-output "$(win32_destdir)/vlc-$(VERSION).crx" --ignore-file install.rdf + +package-win32-base-exe: package-win-base +# Script installer + cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(win32_destdir)/" + cp "$(top_builddir)/extras/package/win32/spad.nsi" "$(win32_destdir)/" + mkdir "$(win32_destdir)/languages" + cp $(srcdir)/extras/package/win32/languages/*.nsh "$(win32_destdir)/languages/" +# Copy the UAC NSIS plugin + mkdir -p "$(win32_destdir)/NSIS" + cp "$(top_srcdir)/extras/package/win32/UAC.nsh" "$(win32_destdir)/NSIS" + cp "$(top_srcdir)/extras/package/win32/UAC.dll" "$(win32_destdir)/NSIS" + # Create package - rm -Rf $(win32_destdir)/sdk if makensis -VERSION >/dev/null 2>&1; then \ MAKENSIS="makensis"; \ elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \ @@ -967,104 +876,59 @@ package-win32-base-exe: package-win32-base else \ echo 'Error: cannot locate makensis tool'; exit 1; \ fi; \ + eval "$$MAKENSIS $(win32_destdir)/spad.nsi"; \ eval "$$MAKENSIS $(win32_destdir)/vlc.win32.nsi" -package-win32-base-zip: package-win32-base -# Create package +package-win32-base-zip: package-win-base +# Create package rm -f -- vlc-$(VERSION)-win32.zip zip -r -9 vlc-$(VERSION)-win32.zip vlc-$(VERSION) -package-win32-base-debug-zip: package-win32-base-debug +package-win32-base-debug-zip: package-win-common # Create package rm -f -- vlc-$(VERSION)-win32-debug.zip zip -r -9 vlc-$(VERSION)-win32-debug.zip vlc-$(VERSION) -package-win32-base-7zip: package-win32-base -# Create package +package-win32-base-7zip: package-win-base +# Create package 7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-$(VERSION)-win32.7z vlc-$(VERSION) -package-win32-base-debug-7zip: package-win32-base-debug +package-win32-base-debug-7zip: package-win-common # 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 - rm -Rf $(win32_destdir) +package-win32-cleanup: + rm -Rf $(win32_destdir) $(win32_debugdir) -package-win32-zip: package-win32-base-zip -# Clean up - rm -Rf $(win32_destdir) +package-win32-exe: package-win-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-7zip: package-win32-base-debug-7zip -# Clean up - rm -Rf $(win32_destdir) +package-win32-debug-zip: package-win32-base-debug-zip package-win32-cleanup -package-win32-no-clean: package-win32-base-zip package-win32-base-7zip package-win32-base-exe +package-win32-7zip: package-win32-base-7zip package-win32-cleanup -package-win32: package-win32-no-clean -# Clean up - rm -Rf $(win32_destdir) +package-win32-debug-7zip: package-win32-base-debug-7zip package-win32-cleanup -package-win32-debug: package-win32-base-debug-zip package-win32-base-debug-7zip -# Clean up - rm -Rf $(win32_destdir) +package-win32-no-clean: package-win32-base-zip package-win32-base-7zip package-win32-base-exe package-win32-xpi -package-wince-base: package-win-common package-win-common-strip +package-win32: package-win32-no-clean package-win32-cleanup -package-wince-base-zip: -# Create package - zip -r vlc-$(VERSION)-wince.zip vlc-$(VERSION) +package-win32-debug: package-win32-base-debug-zip package-win32-base-debug-7zip package-win32-cleanup -package-wince: package-wince-base package-wince-base-zip -# Clean up - rm -Rf $(win32_destdir) +####### +# WinCE +####### +package-wince-base: package-win-base -##################################################################### -## BeOS ## -##################################################################### -package-beos: -# Check that tmp isn't in the way - @if test -e $(srcdir)/tmp; then \ - echo "Error: please remove $(srcdir)/tmp, it is in the way"; \ - false ; \ - else \ - echo "OK." ; mkdir $(srcdir)/tmp ; \ - fi +package-wince-base-zip: package-wince-base +# Create package + rm -f -- vlc-$(VERSION)-wince.zip + zip -r -9 vlc-$(VERSION)-wince.zip vlc-$(VERSION) -# Copy relevant files - mkdir -p $(srcdir)/tmp/vlc - cd $(srcdir) && cp -R vlc-bundle/* AUTHORS COPYING ChangeLog README \ - THANKS NEWS tmp/vlc/ - -# Create debug package - xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc - find $(srcdir)/tmp/vlc -exec mimeset -f {} \; - mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-$(VERSION) - (cd $(srcdir)/tmp && zip -9 -r vlc-$(VERSION)-BeOS-debug.zip vlc-$(VERSION) ) - mv $(srcdir)/tmp/vlc-$(VERSION)-BeOS-debug.zip $(srcdir)/ - mv $(srcdir)/tmp/vlc-$(VERSION) $(srcdir)/tmp/vlc - -# Create normal package - $(STRIP) --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/vlc - find $(srcdir)/tmp/vlc -name 'lib*.so' -exec $(STRIP) \ - --strip-debug --strip-unneeded "{}" \; - xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc - find $(srcdir)/tmp/vlc -exec mimeset -f {} \; - mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-$(VERSION) - (cd $(srcdir)/tmp && zip -9 -r vlc-$(VERSION)-BeOS.zip vlc-$(VERSION) ) - mv $(srcdir)/tmp/vlc-$(VERSION)-BeOS.zip $(srcdir)/ +package-wince: package-wince-base-zip package-win32-cleanup -# Clean up - rm -Rf $(srcdir)/tmp ######################################################################### ## MacOS X ## @@ -1084,12 +948,13 @@ package-macosx: VLC-release.app ChangeLog else \ cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/vlc-$(VERSION)/VLC.app"; \ fi - cd "$(srcdir)" && mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies/ && \ + mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies/ && \ mkdir -p $(top_builddir)/vlc-$(VERSION)/.background/ && \ - cp AUTHORS COPYING ChangeLog README THANKS NEWS $(top_builddir)/vlc-$(VERSION)/Goodies/ && \ - cp -R extras/package/macosx/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app && \ - cp extras/package/macosx/README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf && \ - cp extras/package/macosx/Resources/about_bg.png $(top_builddir)/vlc-$(VERSION)/.background/background.png + cp $(srcdir)/AUTHORS $(srcdir)/COPYING $(srcdir)/README $(srcdir)/THANKS $(srcdir)/NEWS $(top_builddir)/vlc-$(VERSION)/Goodies/ && \ + cp -R $(srcdir)/extras/package/macosx/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app && \ + cp $(srcdir)/extras/package/macosx/README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf && \ + cp $(srcdir)/extras/package/macosx/Resources/about_bg.png $(top_builddir)/vlc-$(VERSION)/.background/background.png + cp -L $(top_builddir)/ChangeLog $(top_builddir)/vlc-$(VERSION)/Goodies/ # Place a link to the application folder ln -s /Applications $(top_builddir)/vlc-$(VERSION)/Applications @@ -1127,7 +992,7 @@ package-macosx: VLC-release.app ChangeLog # Note: We can't directly create a read only dmg as we do the bless stuff echo "Make the disk image read-only" mv "$(top_builddir)/vlc-$(VERSION).dmg" "$(top_builddir)/vlc-$(VERSION)-rw.dmg" - hdiutil convert "$(top_builddir)/vlc-$(VERSION)-rw.dmg" -format UDZO -o "$(top_builddir)/vlc-$(VERSION).dmg" + hdiutil convert "$(top_builddir)/vlc-$(VERSION)-rw.dmg" -format UDBZ -o "$(top_builddir)/vlc-$(VERSION).dmg" rm "$(top_builddir)/vlc-$(VERSION)-rw.dmg" # We are done @@ -1149,7 +1014,7 @@ package-macosx-zip: VLC-release.app $(top_builddir)/vlc-$(VERSION)/Goodies cp $(srcdir)/extras/package/macosx/README.MacOSX.rtf \ $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf - zip -r $(top_builddir)/vlc-$(VERSION).zip $(top_builddir)/vlc-$(VERSION) + zip -r -y -9 $(top_builddir)/vlc-$(VERSION).zip $(top_builddir)/vlc-$(VERSION) rm -Rf $(top_builddir)/vlc-$(VERSION) package-macosx-framework-zip: @@ -1161,7 +1026,7 @@ package-macosx-framework-zip: for i in AUTHORS COPYING ChangeLog README THANKS NEWS; do \ cp $(srcdir)/$$i $(top_builddir)/vlckit-$(VERSION)/Goodies; \ done - zip -r $(top_builddir)/vlckit-$(VERSION).zip $(top_builddir)/vlckit-$(VERSION) + zip -r -y -9 $(top_builddir)/vlckit-$(VERSION).zip $(top_builddir)/vlckit-$(VERSION) rm -Rf $(top_builddir)/vlc-$(VERSION) package-macosx-plugin: @@ -1169,6 +1034,7 @@ if BUILD_MOZILLA # Create Installer rm -rf "$(top_builddir)/macosx-plugin-instdata/"; true mkdir -p "$(top_builddir)/macosx-plugin-instdata" + rm -f "$(top_builddir)/projects/mozilla/VLC Plugin.plugin/Contents/MacOS/modules/libmacosx_plugin.dylib" cp -R "$(top_builddir)/projects/mozilla/VLC Plugin.plugin" "$(top_builddir)/macosx-plugin-instdata" rm -rf "$(top_builddir)/VLC Internet Plug-In.pkg" export PACKAGEMAKER= @@ -1180,8 +1046,8 @@ if BUILD_MOZILLA fi; \ $${PACKAGEMAKER} -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \ -f "$(top_builddir)/macosx-plugin-instdata" \ - -i "$(srcdir)/extras/package/macosx/plugin/InstallerInfo.plist" \ - -d "$(srcdir)/extras/package/macosx/plugin/InstallerDescription.plist"; true + -i "$(top_builddir)/extras/package/macosx/plugin/InstallerInfo.plist" \ + -d "$(top_srcdir)/extras/package/macosx/plugin/InstallerDescription.plist"; true rm -rf "$(top_builddir)/macosx-plugin-instdata/" # Create disk image @@ -1190,12 +1056,22 @@ if BUILD_MOZILLA mkdir -p "$(top_builddir)/vlc-plugin-$(VERSION)/" mv "$(top_builddir)/VLC Internet Plug-In.pkg" "$(top_builddir)/vlc-plugin-$(VERSION)/" hdiutil create -srcfolder "$(top_builddir)/vlc-plugin-$(VERSION)" \ - "$(top_builddir)/vlc-plugin-$(VERSION).dmg" -format UDZO \ + "$(top_builddir)/vlc-plugin-$(VERSION).dmg" -format UDBZ \ -scrub -imagekey zlib-level=9 echo "Disk image creation completed:" 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"; \