# which have makefiles with distribution information.
# - src (libvlc) is nedeed by modules, mozilla and bindings
# - libs/* are needed by modules
-BASE_SUBDIRS = po src modules share doc test
-EXTRA_SUBDIRS = m4 extras/package/ipkg \
- libs/loader libs/srtp \
+BASE_SUBDIRS = po compat src bin modules share doc test
+EXTRA_SUBDIRS = m4 \
+ libs/loader libs/srtp libs/unzip \
projects/mozilla projects/activex
DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
-SUBDIRS = po src
+SUBDIRS = po compat src
if LOADER
SUBDIRS += libs/loader
endif
-if HAVE_LIBGCRYPT
+if HAVE_GCRYPT
SUBDIRS += libs/srtp
endif
+if HAVE_ZLIB
+if !HAVE_MINIZIP
+SUBDIRS += libs/unzip
+endif
+endif
+if BUILD_VLC
+SUBDIRS += bin
+endif
SUBDIRS += modules share doc test
if BUILD_MOZILLA
SUBDIRS += projects/mozilla
EXTRA_DIST = \
HACKING \
INSTALL.win32 \
- INSTALL.wince \
extras/package/win32/vlc.exe.manifest \
- MAINTAINERS \
+ extras/package/win32/libvlc.dll.manifest \
extras/package/macosx/README.MacOSX.rtf \
vlc-config.in.in \
extras/package/rpm/vlc.fedora.spec \
- extras/package/rpm/vlc.mandriva.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
-
-BUILT_SOURCES_distclean = vlc-config compile extras/package/win32/vlc.win32.nsi
+ 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
+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
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
ChangeLog: Makefile.am
rm -f -- "$@"
cd doc && $(MAKE) $(AM_MAKEFLAGS) changelogs
- ln -sf doc/ChangeLog-2008 "$@"
+ ln -sf doc/ChangeLog-2009 "$@"
###############################################################################
# MacOS X project
###############################################################################
EXTRA_DIST += \
- extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib \
- extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib \
+ 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/Interaction.nib/classes.nib \
- extras/package/macosx/Resources/English.lproj/Interaction.nib/info.nib \
- extras/package/macosx/Resources/English.lproj/Interaction.nib/keyedobjects.nib \
- extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib \
- extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/info.nib \
- extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.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/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/a52.icns \
- extras/package/macosx/Resources/aac.icns \
- extras/package/macosx/Resources/asf.icns \
- extras/package/macosx/Resources/asx.icns \
+ 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 \
- extras/package/macosx/Resources/bin.icns \
- extras/package/macosx/Resources/cue.icns \
- extras/package/macosx/Resources/dat.icns \
- extras/package/macosx/Resources/divx.icns \
- extras/package/macosx/Resources/dv.icns \
+ extras/package/macosx/Resources/flv.icns \
extras/package/macosx/Resources/generic.icns \
- extras/package/macosx/Resources/m3u.icns \
+ extras/package/macosx/Resources/m4a.icns \
+ extras/package/macosx/Resources/m4v.icns \
+ extras/package/macosx/Resources/mkv.icns \
extras/package/macosx/Resources/mov.icns \
+ extras/package/macosx/Resources/movie.icns \
extras/package/macosx/Resources/mp3.icns \
- extras/package/macosx/Resources/mp4.icns \
extras/package/macosx/Resources/mpeg.icns \
- extras/package/macosx/Resources/mpeg1.icns \
- extras/package/macosx/Resources/mpeg2.icns \
- extras/package/macosx/Resources/mpeg4.icns \
- extras/package/macosx/Resources/mpg.icns \
extras/package/macosx/Resources/ogg.icns \
- extras/package/macosx/Resources/ogm.icns \
- extras/package/macosx/Resources/pls.icns \
- extras/package/macosx/Resources/srt.icns \
- extras/package/macosx/Resources/sub.icns \
- extras/package/macosx/Resources/vlc.icns \
+ extras/package/macosx/Resources/playlist.icns \
+ extras/package/macosx/Resources/rm.icns \
+ extras/package/macosx/Resources/subtitle.icns \
extras/package/macosx/Resources/vob.icns \
+ extras/package/macosx/Resources/wav.icns \
+ extras/package/macosx/Resources/vlc.icns \
extras/package/macosx/Resources/wma.icns \
extras/package/macosx/Resources/wmv.icns \
extras/package/macosx/Resources/pause.png \
extras/package/macosx/Resources/skip_previous_graphite.png \
extras/package/macosx/Resources/stop_graphite.png \
extras/package/macosx/Resources/volumeslider_graphite.png \
+ extras/package/macosx/Resources/backward_big_down.png \
+ extras/package/macosx/Resources/backward_big.png \
+ extras/package/macosx/Resources/eq_sm.pdf \
+ extras/package/macosx/Resources/forward_big_down.png \
+ extras/package/macosx/Resources/forward_big.png \
+ extras/package/macosx/Resources/fs_sm.pdf \
+ extras/package/macosx/Resources/list_sm.pdf \
+ extras/package/macosx/Resources/next_sm.pdf \
+ extras/package/macosx/Resources/pause_big_down.png \
+ extras/package/macosx/Resources/pause_big.png \
+ extras/package/macosx/Resources/play_big_down.png \
+ extras/package/macosx/Resources/play_big.png \
+ extras/package/macosx/Resources/prev_sm.pdf \
+ extras/package/macosx/Resources/sidebarAdd.png \
+ extras/package/macosx/Resources/sidebarRepeat.png \
+ extras/package/macosx/Resources/sidebarRepeatOn.png \
+ extras/package/macosx/Resources/sidebarRepeatOneOn.png \
+ extras/package/macosx/Resources/sidebarResizeWidget.png \
+ extras/package/macosx/Resources/sidebarShuffle.png \
+ extras/package/macosx/Resources/sidebarShuffleOn.png \
+ extras/package/macosx/Resources/sidebarStatusAreaBackground.png \
+ extras/package/macosx/Resources/stop_sm.pdf \
extras/package/macosx/Resources/noart.png \
extras/package/macosx/Resources/spref_cone_Audio_64.png \
extras/package/macosx/Resources/spref_cone_Hotkeys_64.png \
extras/package/macosx/plugin/InstallerInfo.plist.in \
extras/package/macosx/plugin/InstallerDescription.plist \
extras/package/macosx/plugin/pbdevelopment.plist \
- extras/package/macosx/plugin/English.lproj/InfoPlist.strings.in \
extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h \
extras/package/macosx/eyetvplugin/Info.plist \
extras/package/macosx/eyetvplugin/eyetvplugin.c \
extras/misc/mpris.py \
extras/misc/mpris.glade
-dist-hook:
- distdir=$(distdir) srcdir=$(srcdir) $(SHELL) $(srcdir)/toolbox --dist-contrib
-
###############################################################################
# Building libvlc
###############################################################################
touch $@
CLEANFILES = $(BUILT_SOURCES_clean)
-DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile ChangeLog
+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
-libvlc:
- cd src && $(MAKE) $(AM_MAKEFLAGS) libvlccore.la
+libcompat:
+ cd compat && $(MAKE) $(AM_MAKEFLAGS)
-core:
- cd src && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
+libvlc: libcompat
+ cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
-.PHONY: libvlc core
+core: libvlc vlc
+ cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) vlc-static$(EXEEXT)
-#To get some nice output
-nice:
- $(top_builddir)/compile
+doc:
+ cd doc && $(MAKE) $(AM_MAKEFLAGS) doc
+
+.PHONY: libvlc core doc
if HAVE_BEOS
noinst_DATA = vlc-bundle
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
# Building aliases
###############################################################################
-ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc
+ALL_ALIASES = cvlc rvlc svlc qvlc nvlc mvlc
bin_SCRIPTS = $(ALIASES)
CLEANFILES += $(ALIASES) $(noinst_SCRIPTS)
EXTRA_SCRIPTS = $(ALL_ALIASES)
MKALIAS = bindir="$(bindir)" transform="$(transform)" program_prefix="$(program_prefix)" program_suffix="$(program_suffix)" $(top_srcdir)/make-alias $@
-cvlc: make-alias
- $(MKALIAS) dummy
+cvlc: make-alias Makefile
+ $(AM_V_GEN)$(MKALIAS) dummy
-rvlc: make-alias
- $(MKALIAS) rc
+rvlc: make-alias Makefile
+ $(AM_V_GEN)$(MKALIAS) rc
-svlc: make-alias
- $(MKALIAS) skins2
+svlc: make-alias Makefile
+ $(AM_V_GEN)$(MKALIAS) skins2
-wxvlc: make-alias
- $(MKALIAS) wx
+qvlc: make-alias Makefile
+ $(AM_V_GEN)$(MKALIAS) qt4
-qvlc: make-alias
- $(MKALIAS) qt4
+nvlc: make-alias Makefile
+ $(AM_V_GEN)$(MKALIAS) ncurses
-nvlc: make-alias
- $(MKALIAS) ncurses
+mvlc: make-alias Makefile
+ $(AM_V_GEN)$(MKALIAS) maemo
if BUILD_VLC
noinst_SCRIPTS += vlc$(EXEEXT)
endif
-vlc$(EXEEXT): Makefile.am
- rm -f -- vlc vlc.tmp
- echo '#! /bin/sh' > vlc.tmp
- echo 'exec "$$(dirname "$$0")/src/vlc$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp
- chmod +x vlc.tmp
- mv -f -- vlc.tmp vlc
+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
- for i in Resources Info.plist; do \
- cp -R $(top_builddir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
- done
+ 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 \
simple_prefs.h \
simple_prefs.m \
vout.h \
- voutqt.m \
voutgl.m \
wizard.h \
wizard.m \
extended.m \
bookmarks.h \
bookmarks.m \
- update.h \
- update.m \
- interaction.h \
- interaction.m \
+ coredialogs.h \
+ coredialogs.m \
embeddedwindow.h \
embeddedwindow.m \
fspanel.h \
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
+ $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua
+ for i in $(srcdir)/share/lua/*.* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/`basename $${i}` ; \
+ done ; \
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist
for i in $(srcdir)/share/lua/playlist/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist/`basename $${i}` ; \
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
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 \
- mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
- cp $(srcdir)/po/$${i}.gmo $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+ $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
+ $(INSTALL) $(srcdir)/po/$${i}.gmo $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
mkdir -p $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \
ln -sf ../English.lproj/InfoPlist.strings \
$(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \
$(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 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 '{}' \;
# This is just for development purposes.
-# The resulting VLC.app will only in this tree.
-VLC.app: vlc
- (cd src && make install)
+# 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
+ $(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
- for i in Resources Info.plist; do \
- cp -R $(top_builddir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
- done
+ 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 \
simple_prefs.h \
simple_prefs.m \
vout.h \
- voutqt.m \
voutgl.m \
wizard.h \
wizard.m \
extended.m \
bookmarks.h \
bookmarks.m \
- update.h \
- update.m \
- interaction.h \
- interaction.m \
+ coredialogs.h \
+ coredialogs.m \
embeddedwindow.h \
embeddedwindow.m \
fspanel.h \
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
- rm -Rf $(top_builddir)/tmp
+ $(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)/src/.libs/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC
- $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules
- find modules/ -name '*_plugin$(LIBEXT)' | while read i; do \
- if test -n "$$i" ; \
- then ln -sfn "`pwd`/$$i" \
- "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \
- fi ; done && \
- ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/
+ $(INSTALL) $(top_builddir)/bin/.libs/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC
+ 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/; \
+ done
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/locale
cat $(top_srcdir)/po/LINGUAS | while read i; do \
mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
# the same setup as the maintaner(s).
#
+############################################################################
+## Win ##
+############################################################################
+destdir=$(prefix)
win32_destdir=$(top_builddir)/vlc-$(VERSION)
+win32_debugdir=$(top_builddir)/symbols-$(VERSION)
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)/src/.libs/vlc$(EXEEXT)" "$(win32_destdir)/"
- cp "$(top_srcdir)/extras/package/win32/vlc.exe.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
-
-# Necessary icons
- cp $(srcdir)/share/vlc48x48.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/
-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/
-endif
+# Necessary icon
+ cp $(srcdir)/share/icons/vlc.ico $(win32_destdir)
-# 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
+ 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
- $(INSTALL) -d $(win32_lua_destdir)/playlist
- for i in $(srcdir)/share/lua/playlist/*.* ; do \
- $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/playlist/`basename $${i}` ; \
+# 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)/meta
- for i in $(srcdir)/share/lua/meta/*.* ; do \
- $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/`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)/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 \
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 $(srcdir)/share/skins2/*.*; do \
- cp -- "$$i" $(win32_destdir)/skins/ || true ; \
- done
+ 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 dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume minimal;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
- $(STRIP) "vlc-$(VERSION)/vlc$(EXEEXT)"
- $(STRIP) "vlc-$(VERSION)/libvlccore$(LIBEXT)"
- $(STRIP) "vlc-$(VERSION)/libvlc$(LIBEXT)"
if BUILD_MOZILLA
- $(STRIP) "vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)"
+ cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)
endif
if BUILD_ACTIVEX
- $(STRIP) "vlc-$(VERSION)/activex/axvlc$(LIBEXT)"
+ 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 $(STRIP) "$$i" ; fi ; done
+# 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"
-package-win32-base-exe: package-win32-base
# 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 \
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-7zip: package-win32-base
-# Create package
+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-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-exe: package-win32-base package-win32-base-exe
-# Clean up
- rm -Rf $(win32_destdir)
+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-zip: package-win32-base-zip
-# Clean up
- rm -Rf $(win32_destdir)
+package-win32-cleanup:
+ rm -Rf $(win32_destdir) $(win32_debugdir)
-package-win32-7zip: package-win32-base-7zip
-# Clean up
- rm -Rf $(win32_destdir)
+package-win32-exe: package-win-base package-win32-base-exe package-win32-cleanup
-package-win32-no-clean: package-win32-base-zip package-win32-base-7zip package-win32-base-exe
+package-win32-zip: package-win32-base-zip package-win32-cleanup
-package-win32: package-win32-no-clean
-# Clean up
- rm -Rf $(win32_destdir)
+package-win32-debug-zip: package-win32-base-debug-zip package-win32-cleanup
-package-wince-base: package-win-common package-win-common-strip
+package-win32-7zip: package-win32-base-7zip package-win32-cleanup
-package-wince-base-zip:
-# Create package
- zip -r vlc-$(VERSION)-wince.zip vlc-$(VERSION)
+package-win32-debug-7zip: package-win32-base-debug-7zip package-win32-cleanup
-package-wince: package-wince-base package-wince-base-zip
-# 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-win32: package-win32-no-clean package-win32-cleanup
-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-win32-debug: package-win32-base-debug-zip package-win32-base-debug-7zip package-win32-cleanup
-# 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)/
-# Clean up
- rm -Rf $(srcdir)/tmp
+#######
+# WinCE
+#######
+package-wince-base: package-win-base
+
+package-wince-base-zip: package-wince-base
+# Create package
+ rm -f -- vlc-$(VERSION)-wince.zip
+ zip -r -9 vlc-$(VERSION)-wince.zip vlc-$(VERSION)
+
+package-wince: package-wince-base-zip package-win32-cleanup
-package-macosx: VLC-release.app
+
+#########################################################################
+## MacOS X ##
+#########################################################################
+package-macosx: VLC-release.app ChangeLog
# Check that the temporary location isn't in the way
@if test -e "$(top_builddir)/vlc-$(VERSION)/"; then \
rm -Rf "$(top_builddir)/vlc-$(VERSION)/" ; \
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
# 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
$(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:
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:
# 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"
- PATH=/Developer/usr/bin:/Developer/Tools:$$PATH packagemaker -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \
+ export PACKAGEMAKER=
+ if test -x /Developer/Tools/packagemaker; then \
+ export PACKAGEMAKER=/Developer/Tools/packagemaker; \
+ fi; \
+ if test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then \
+ export PACKAGEMAKER=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; \
+ 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
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"; \
###############################################################################
# PO translation files update
-# Generate po/POTFILES.in which lists all the files containing translatable
-# strings. Find all source files and remove the generated files
###############################################################################
.PHONY: update-po
update-po:
- rm -f $(top_srcdir)/po/POTFILES.in
- { \
- cd $(top_srcdir) && \
- echo "# automatically created by make update-po" ; \
- echo "" ; \
- echo "# main sources" ; \
- find include src -name '*.[chm]' -o -name '*.[ch]pp' \
- | grep -v '\(misc/modules_\|src/misc/revision.c\|modules/builtin.h\|include/vlc_about.h\)' \
- | sort ; \
- echo "" ; \
- echo "# modules" ; \
- find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -name '*.ui' \
- | grep -v '\(\.moc\.\|gui/gtk2/\)' \
- | grep -vE 'qt4/ui/.*.h' \
- | grep -v 'qt4/resources.cpp\|qt4/dialogs/about.hpp' \
- | grep -v 'gui/opie' \
- | grep -v 'wxwidgets' \
- | grep -v 'mux/rtp/' \
- | grep -v 'demux/rtpxiph.c' \
- | sort ; \
- } > $(top_srcdir)/po/POTFILES.in
- rm -f $(top_srcdir)/po/vlc.pot
cd po && $(MAKE) POTFILES vlc.pot update-po
-#cd po && $(MAKE) update-po
###############################################################################
# Enforce Mac OS X deployment target environment variable
projects / vlc / blobdiff