vlc | branch: master | Rafaël Carré <[email protected]> | Thu Jan 12 15:53:45 2012 -0500| [0ddec016f38442789f891c7f60c56717c76539fd] | committer: Rafaël Carré
VLCKit: move building/packaging to project folder > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0ddec016f38442789f891c7f60c56717c76539fd --- extras/package/macosx/package.mak | 8 +------- projects/macosx/framework/Makefile | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/extras/package/macosx/package.mak b/extras/package/macosx/package.mak index 35258f4..a0a3183 100644 --- a/extras/package/macosx/package.mak +++ b/extras/package/macosx/package.mak @@ -89,12 +89,6 @@ package-macosx-zip: VLC.app zip -r -y -9 $(top_builddir)/vlc-$(VERSION).zip $(top_builddir)/vlc-$(VERSION) rm -rf "$(top_builddir)/vlc-$(VERSION)" -package-macosx-framework-zip: - mkdir -p $(top_builddir)/vlckit-$(VERSION)/Goodies/ - cp -R $(srcdir)/projects/macosx/framework/build/Debug/VLCKit.framework $(top_builddir)/vlckit-$(VERSION)/ - 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) - package-translations: mkdir -p "$(srcdir)/vlc-translations-$(VERSION)" for i in `cat "$(top_srcdir)/po/LINGUAS"`; do \ @@ -114,4 +108,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 diff --git a/projects/macosx/framework/Makefile b/projects/macosx/framework/Makefile index 8472959..009b9c2 100644 --- a/projects/macosx/framework/Makefile +++ b/projects/macosx/framework/Makefile @@ -1,5 +1,17 @@ -all: - xcodebuild +VLCKit.zip: VLCKit + zip -r -y -9 $@ $< + +VLCKit: build/Debug/VLCKit.framework + rm -rf $@-tmp && mkdir -p $@-tmp + cp -R $< $@-tmp + cp ../../../COPYING $@-tmp + mv $@-tmp $@ && touch $@ + +build/Debug/VLCKit.framework: + xcodebuild -project VLCKit.xcodeproj -target "Build Everything" clean: - xcodebuild clean \ No newline at end of file + xcodebuild -project VLCKit.xcodeproj clean + rm -fr VLCKit VLCKit.zip + +.PHONY: clean _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
