]> git.sesse.net Git - vlc/blobdiff - extras/package/macosx/package.mak
macosx: VLC.app shouldn't rely on a script included within VLCKit
[vlc] / extras / package / macosx / package.mak
index d0ac46c062e4f07025582e66c01f8fb321722bf3..41759a165655e8fb1cbf4f0d2f8113baa23b5d36 100644 (file)
@@ -5,89 +5,52 @@ noinst_DATA = VLC.app
 endif
 endif
 
-# This is just for development purposes. 
-# The resulting VLC.app will only run in this tree.
-VLC.app: VLC-tmp.app
+# This is just for development purposes.
+# The resulting VLC-dev.app will only run in this tree.
+VLC-dev.app: VLC-tmp
        rm -Rf $@
-       mv VLC-tmp.app $@
+       cp -R VLC-tmp $@
        $(INSTALL) -m 0755 $(top_builddir)/bin/.libs/vlc $@/Contents/MacOS/VLC
        $(LN_S) -f ../../../modules $@/Contents/MacOS/plugins
 
-# VLC-release.app for packaging and giving it to your friends
+# VLC.app for packaging and giving it to your friends
 # use package-macosx to get a nice dmg
-VLC-release.app: VLC-tmp.app
+VLC.app: VLC-tmp
        rm -Rf $@
-       mv VLC-tmp.app $@
-       PRODUCT="$@" ACTION="release-makefile" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
+       cp -R VLC-tmp $@
+       PRODUCT="$@" ACTION="release-makefile" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/extras/package/macosx/build-package.sh
        find $@ -type d -exec chmod ugo+rx '{}' \;
        find $@ -type f -exec chmod ugo+r '{}' \;
        rm -Rf $@/Contents/Frameworks/BGHUDAppKit.framework/Resources/
 
 
-VLC-tmp.app: vlc
-       $(AM_V_GEN)(cd src && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd))
-       (cd lib && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd))
+VLC-tmp: vlc
+       $(AM_V_GEN)for i in src lib share; do \
+               (cd $$i && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd)); \
+       done
        rm -Rf "$(top_builddir)/tmp" "$@"
        mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
-       cd $(srcdir)/extras/package/macosx; cp -R vlc.xcodeproj Resources README.MacOSX.rtf $(abs_top_builddir)/tmp/extras/package/macosx/
+       cd $(srcdir)/extras/package/macosx; cp -R Resources README.MacOSX.rtf $(abs_top_builddir)/tmp/extras/package/macosx/
+       mkdir -p $(abs_top_builddir)/tmp/extras/package/macosx/vlc.xcodeproj/
+       sed -e s,../../../contrib,$(CONTRIB_DIR),g $(srcdir)/extras/package/macosx/vlc.xcodeproj/project.pbxproj \
+        > $(abs_top_builddir)/tmp/extras/package/macosx/vlc.xcodeproj/project.pbxproj
        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
+           sed "s/#REVISION#/$$REVISION/g" $(top_builddir)/extras/package/macosx/Info.plist \
+        > $(top_builddir)/tmp/extras/package/macosx/Info.plist
        cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/
        cd "$(srcdir)"; cp AUTHORS COPYING THANKS $(abs_top_builddir)/tmp/
-       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/extras/contrib/BGHUDAppKit
-       cp -R $(CONTRIB_DIR)/BGHUDAppKit/BGHUDAppKit.framework $(top_builddir)/tmp/extras/contrib/BGHUDAppKit
-       mkdir -p $(top_builddir)/tmp/extras/contrib/Growl
-       cp -R $(CONTRIB_DIR)/Growl/Growl.framework $(top_builddir)/tmp/extras/contrib/Growl
        mkdir -p $(top_builddir)/tmp/modules/audio_output
        mkdir -p $(top_builddir)/tmp/modules/gui/macosx
-       cd "$(srcdir)/modules/gui/macosx/" && cp \
-           AppleRemote.h \
-           AppleRemote.m \
-           about.h \
-           about.m \
-           applescript.h \
-           applescript.m \
-           controls.h \
-           controls.m \
-           intf.h \
-           intf.m \
-           macosx.m \
-           misc.h \
-           misc.m \
-           open.h \
-           open.m \
-           output.h \
-           output.m \
-           playlist.h \
-           playlist.m \
-           playlistinfo.h \
-           playlistinfo.m \
-           prefs_widgets.h \
-           prefs_widgets.m \
-           prefs.h \
-           prefs.m \
-           simple_prefs.h \
-           simple_prefs.m \
-           wizard.h \
-           wizard.m \
-           bookmarks.h \
-           bookmarks.m \
-           coredialogs.h \
-           coredialogs.m \
-           fspanel.h \
-           fspanel.m \
-                $(abs_top_builddir)/tmp/modules/gui/macosx/
+       cd "$(srcdir)/modules/gui/macosx/" && cp *.h *.m $(abs_top_builddir)/tmp/modules/gui/macosx/
        cd $(top_builddir)/tmp/extras/package/macosx && \
                xcodebuild -target vlc SYMROOT=../../../build DSTROOT=../../../build $(silentstd)
        cp -R -L $(top_builddir)/tmp/build/Default/VLC.bundle $@
-       $(INSTALL) -d $@/Contents/MacOS/
-       $(INSTALL) -d $@/Contents/MacOS/share/
-       cp -r $(srcdir)/share/lua $@/Contents/MacOS/share/
+       mkdir -p $@/Contents/Frameworks && cp -R -L $(CONTRIB_DIR)/Growl.framework $@/Contents/Frameworks/
+       mkdir -p $@/Contents/MacOS/share/locale/
+       cp -r "$(prefix)/lib/vlc/lua" "$(prefix)/share/vlc/lua" $@/Contents/MacOS/share/
+       mkdir -p $@/Contents/MacOS/include/
+       cp -r "$(srcdir)/include/vlc" $@/Contents/MacOS/include/
        $(INSTALL) -m 644 $(srcdir)/share/vlc512x512.png $@/Contents/MacOS/share/vlc512x512.png
-       $(INSTALL) -d $@/Contents/MacOS/share/locale
        cat $(top_srcdir)/po/LINGUAS | while read i; do \
          $(INSTALL) -d $@/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
          $(INSTALL) $(srcdir)/po/$${i}.gmo $@/Contents/MacOS/share/locale/$${i}/LC_MESSAGES/vlc.mo; \
@@ -97,39 +60,37 @@ VLC-tmp.app: vlc
        done
        printf "APPLVLC#" >| $@/Contents/PkgInfo
 
-package-macosx: VLC-release.app ChangeLog
+package-macosx: VLC.app
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/Goodies/"
-       cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-$(VERSION)/VLC.app"
+       cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/vlc-$(VERSION)/VLC.app"
        cd $(srcdir); cp AUTHORS COPYING README THANKS NEWS $(abs_top_builddir)/vlc-$(VERSION)/Goodies/
-       cp $(top_builddir)/ChangeLog $(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
        mkdir -p $(top_builddir)/vlc-$(VERSION)/.background/
        cp $(srcdir)/extras/package/macosx/Resources/about_bg.png $(top_builddir)/vlc-$(VERSION)/.background/background.png
        $(LN_S) -f /Applications $(top_builddir)/vlc-$(VERSION)/
        rm -f "$(top_builddir)/vlc-$(VERSION)-rw.dmg"
-       hdiutil create -verbose -srcfolder "$(top_builddir)/vlc-$(VERSION)" "$(top_builddir)/vlc-$(VERSION)-rw.dmg" -scrub
+       hdiutil create -verbose -srcfolder "$(top_builddir)/vlc-$(VERSION)" "$(top_builddir)/vlc-$(VERSION)-rw.dmg" -scrub -format UDRW
+       mkdir -p ./mount
+       hdiutil attach -readwrite -noverify -noautoopen -mountRoot ./mount "vlc-$(VERSION)-rw.dmg"
+       -osascript "$(srcdir)"/extras/package/macosx/dmg_setup.scpt "vlc-$(VERSION)"
+       hdiutil detach ./mount/"vlc-$(VERSION)"
 # Make sure the image is not writable
 # Note: We can't directly create a read only dmg as we do the bless stuff
        rm -f "$(top_builddir)/vlc-$(VERSION).dmg"
        hdiutil convert "$(top_builddir)/vlc-$(VERSION)-rw.dmg" -format UDBZ -o "$(top_builddir)/vlc-$(VERSION).dmg"
        ls -l "$(top_builddir)/vlc-$(VERSION).dmg"
+       rm -f "$(top_builddir)/vlc-$(VERSION)-rw.dmg"
+       rm -rf "$(top_builddir)/vlc-$(VERSION)"
 
-package-macosx-zip: VLC-release.app ChangeLog
+package-macosx-zip: VLC.app
        mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies/
-       cp -R $(top_builddir)/VLC-release.app $(top_builddir)/vlc-$(VERSION)/VLC.app
-       cp $(top_builddir)/ChangeLog $(top_builddir)/vlc-$(VERSION)/Goodies/
-       cd $(srcdir); cp -R AUTHORS COPYING README THANKS NEWS extras/package/macosx/Delete_Preferences.app/ \
-               $(abs_top_builddir)/vlc-$(VERSION)/Goodies/
+       cp -R $(top_builddir)/VLC.app $(top_builddir)/vlc-$(VERSION)/VLC.app
+       cd $(srcdir); cp -R AUTHORS COPYING README THANKS NEWS $(abs_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
        zip -r -y -9 $(top_builddir)/vlc-$(VERSION).zip $(top_builddir)/vlc-$(VERSION)
-
-package-macosx-framework-zip: ChangeLog
-       mkdir -p $(top_builddir)/vlckit-$(VERSION)/Goodies/
-       cp -R $(srcdir)/projects/macosx/framework/build/Debug/VLCKit.framework $(top_builddir)/vlckit-$(VERSION)/
-       cp $(top_builddir)/ChangeLog $(top_builddir)/vlckit-$(VERSION)/Goodies/
-       cd $(srcdir); cp AUTHORS COPYING README THANKS NEWS $(abs_top_builddir)/vlckit-$(VERSION)/Goodies/
-       zip -r -y -9 $(top_builddir)/vlckit-$(VERSION).zip $(top_builddir)/vlckit-$(VERSION)
+       rm -rf "$(top_builddir)/vlc-$(VERSION)"
 
 package-translations:
        mkdir -p "$(srcdir)/vlc-translations-$(VERSION)"
@@ -150,4 +111,4 @@ package-translations:
        $(AMTAR) chof - $(srcdir)/vlc-translations-$(VERSION) \
          | GZIP=$(GZIP_ENV) gzip -c >$(srcdir)/vlc-translations-$(VERSION).tar.gz
 
-.PHONY: package-macosx package-macosx-zip package-macosx-framework-zip package-translations
+.PHONY: package-macosx package-macosx-zip package-translations