X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=5899bf7de39301b6b334d44b6c3ee9f55704a582;hb=2a0e2bd242f7dc7cda4ee096e58f42d13db9803f;hp=5f69d6d912c813c916e7d8c542e1bef2ee134a81;hpb=a79208b6dcdd445e2900c37d57225588439d6df4;p=vlc diff --git a/Makefile.am b/Makefile.am index 5f69d6d912..5899bf7de3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,8 +12,9 @@ NULL = # - . should come before mozilla/bindings because the plugin needs libvlc.a # - po should come before . because VLC.app needs the pofiles # - loader should come before modules because some plugins need it -SUBDIRS = intl loader src modules po . mozilla bindings activex share m4 doc -DIST_SUBDIRS = $(SUBDIRS) ipkg +SUBDIRS = intl po libs/loader libs/srtp src modules . \ + mozilla bindings activex share doc +DIST_SUBDIRS = $(SUBDIRS) m4 ipkg EXTRA_DIST = \ HACKING \ @@ -188,7 +189,8 @@ EXTRA_DIST += \ extras/MacOSX/Resources/fs_exit_fullscreen.png \ extras/MacOSX/Resources/fs_background.png \ extras/MacOSX/fullscreen_panel.svg \ - extras/MacOSX/vlc.pbproj/project.pbxproj \ + extras/MacOSX/ub.sh \ + extras/MacOSX/vlc.xcodeproj/project.pbxproj \ extras/MacOSX/Delete_Preferences.app/Contents/Info.plist \ extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo \ extras/MacOSX/Delete_Preferences.app/Contents/MacOS/applet \ @@ -287,7 +289,7 @@ LIBVLC = src/$(LIB_libvlc) vlc_LDFLAGS = else if HAVE_WIN32 -vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` -Wl,-rpath $(libdir) -L$(top_builddir)/src -lvlc +vlc_LDFLAGS = -L$(top_builddir)/src -lvlc `$(VLC_CONFIG) --libs vlc` LIB_libvlc = libvlc.dll.a LIBVLC = else @@ -433,24 +435,10 @@ VLC-release.app: vlc cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done - case $(host_os) in \ - *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ - cd ../../../ && \ - cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ - $(top_builddir)/VLC-release.app;; \ - *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ - cd ../../../ && \ - cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ - $(top_builddir)/VLC-release.app;; \ - *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ + cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ cd ../../../ && \ cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \ - $(top_builddir)/VLC-release.app;; \ - *darwin9*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ - cd ../../../ && \ - cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \ - $(top_builddir)/VLC-release.app;; \ - esac + $(top_builddir)/VLC-release.app; \ rm -Rf $(top_builddir)/tmp $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS $(INSTALL) $(top_builddir)/vlc \ @@ -579,24 +567,10 @@ VLC.app: vlc cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done - case $(host_os) in \ - *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'&& \ - cd ../../../ && \ - cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ - $(top_builddir)/VLC.app;; \ - *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'&& \ - cd ../../../ && \ - cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ - $(top_builddir)/VLC.app;; \ - *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ - cd ../../../ && \ - cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \ - $(top_builddir)/VLC.app;; \ - *darwin9*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ + cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ cd ../../../ && \ cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \ - $(top_builddir)/VLC.app;; \ - esac + $(top_builddir)/VLC.app; \ rm -Rf $(top_builddir)/tmp $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS $(INSTALL) $(top_builddir)/vlc \ @@ -698,12 +672,16 @@ package-win-common: mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/admin" cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ; + cp $(srcdir)/share/http/.hosts $(top_builddir)/vlc-${VERSION}/http/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/.hosts ; cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ; cp $(srcdir)/share/http/js/*.js $(top_builddir)/vlc-${VERSION}/http/js/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/js/*.js ; cp $(srcdir)/share/http/dialogs/* $(top_builddir)/vlc-${VERSION}/http/dialogs/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/dialogs/* ; + cp $(srcdir)/share/http/dialogs/.hosts $(top_builddir)/vlc-${VERSION}/http/dialogs/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/dialogs/.hosts ; cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-${VERSION}/http/ ; cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-${VERSION}/http/images/ cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ; @@ -714,11 +692,13 @@ package-win-common: cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-${VERSION}/http/old/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/old/*.html ; cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-${VERSION}/http/old/ ; + cp $(srcdir)/share/http/old/.hosts $(top_builddir)/vlc-${VERSION}/http/old/ ; cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-${VERSION}/http/old/ ; cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-${VERSION}/http/old/vlm/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/old/vlm/*.html ; cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-${VERSION}/http/old/admin/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/old/admin/*.html ; + cp $(srcdir)/share/http/old/admin/.access $(top_builddir)/vlc-${VERSION}/http/old/admin/ ; cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ; @@ -897,14 +877,76 @@ package-macosx: else \ cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \ fi - cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/vlc-${VERSION}/ && cp -R extras/MacOSX/Delete_Preferences.app $(top_builddir)/vlc-${VERSION}/ + cd "$(srcdir)" && 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/MacOSX/Delete_Preferences.app $(top_builddir)/vlc-${VERSION}/Goodies/Delete\ VLC\ Preferences.app && \ + cp README.MacOSX.rtf $(top_builddir)/vlc-${VERSION}/Read\ Me.rtf && \ + cp extras/MacOSX/Resources/about_bg.png $(top_builddir)/vlc-${VERSION}/.background/background.png ; + +# Place a link to the application folder + ln -s /Applications $(top_builddir)/vlc-${VERSION}/Applications ; # Create disk image echo "Creating disk image" ; rm -f "$(top_builddir)/vlc-${VERSION}.dmg" ; hdiutil create -srcfolder "$(top_builddir)/vlc-${VERSION}" \ - "$(top_builddir)/vlc-${VERSION}.dmg" -format UDZO \ + "$(top_builddir)/vlc-${VERSION}.dmg" -format UDRW \ -scrub -imagekey zlib-level=9 ; + +# Make sure the root window of the dmg will pop up when the dmg is mounted. +# Note: We dont mount in /Volumes to be sure we won't collide with an other +# finder mounted dmg with the same name. + echo "Make sure the root window of the dmg will pop up when the dmg is mounted" ; + mkdir -p $(top_builddir)/vlcmnt ; + hdiutil attach -readwrite -noverify -noautoopen "$(top_builddir)/vlc-${VERSION}.dmg" -mountpoint "$(top_builddir)/vlcmnt/vlc-${VERSION}" ; + bless --folder "$(top_builddir)/vlcmnt/vlc-${VERSION}/" --openfolder "$(top_builddir)/vlcmnt/vlc-${VERSION}" ; + sleep 1 # Make sure operation completes + +# Place the image disk finder icon at the correct place +# Note: careful here the finder does some weird things +# sometimes. delays in the script should prevent those. + cd "$(srcdir)" + osascript -e "tell application \"Finder\"" \ + -e " set f to POSIX file (\"$(top_builddir)/vlcmnt/vlc-${VERSION}/\" as string) as alias" \ + -e " tell folder f" \ + -e " open" \ + -e " tell container window" \ + -e " set toolbar visible to false" \ + -e " set statusbar visible to false" \ + -e " set current view to icon view" \ + -e " delay 1 -- Sync" \ + -e " set the bounds to {50, 100, 1000, 1000} -- Big size so the finder won't do silly things" \ + -e " end tell" \ + -e " delay 1 -- Sync" \ + -e " set icon size of the icon view options of container window to 128" \ + -e " set arrangement of the icon view options of container window to not arranged" \ + -e " set background picture of the icon view options of container window to file \".background:background.png\"" \ + -e " set position of item \"VLC.app\" to {100, 20}" \ + -e " set position of item \"Applications\" to {310, 20}" \ + -e " set position of item \"Goodies\" to {40, 200}" \ + -e " set position of item \"Read Me.rtf\" to {410, 200}" \ + -e " set the bounds of the container window to {50, 100, 590, 500}" \ + -e " update without registering applications" \ + -e " delay 5 -- Sync" \ + -e " close" \ + -e " end tell" \ + -e " -- Sync" \ + -e " delay 5" \ + -e "end tell" || true # Make sure we don't make the build bots fail + +# Unmount the image now + hdiutil detach "$(top_builddir)/vlcmnt/vlc-${VERSION}" ; + rm -R $(top_builddir)/vlcmnt ; + +# Make sure the image is not writable +# 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" ; + rm "$(top_builddir)/vlc-${VERSION}-rw.dmg" ; + +# We are done echo "Disk image creation completed:" ; ls -la "$(top_builddir)/vlc-${VERSION}.dmg" ; echo ;