[vlc-devel] commit: contribs: backported the bin-package mechanism for OSX ( Felix Paul Kühne )

[git version control]

vlc | branch: 0.9-bugfix | Felix Paul Kühne <fkuehne at videolan.org> | Fri Feb 20 13:53:25 2009 +0100| [f6a0db6b2d8c50d118383e62544c7044bb3fa255] | committer: Felix Paul Kühne 

contribs: backported the bin-package mechanism for OSX

A i386 package is already present on ganesh. A PPC package will follow within the day

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f6a0db6b2d8c50d118383e62544c7044bb3fa255
---

 extras/contrib/Makefile  |   36 ++++++++++++++++++++++++++++++++----
 extras/contrib/bootstrap |    9 +++++++++
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile
index 1c62f5b..3b838b3 100644
--- a/extras/contrib/Makefile
+++ b/extras/contrib/Makefile
@@ -27,11 +27,39 @@ include ./config.mak
 
 BUILDDIRS = bin doc etc include info lib man sbin share vlc-lib tmp gecko-sdk
 
-all:
+ifdef HAVE_DARWIN_OS
+TARGETALL=using-bin
+else
+TARGETALL=using-src
+endif
+
+all: $(TARGETALL)
+
+using-src:
 	$(MAKE) -C src
 
-contrib-macosx.tar.bz2:
-	$(WGET) $(CONTRIB_URL)
+# shortcut
+src: using-src
+
+ifdef HAVE_DARWIN_OS
+
+CONTRIBREV=0.9.9
+DARWIN_COMPILER=GCC
+contrib-macosx-$(ARCH)-$(CONTRIBREV)-$(DARWIN_COMPILER).tar.bz2:
+	$(WGET) ftp://ftp.videolan.org/pub/videolan/testing/contrib/$@
+
+using-bin: contrib-macosx-$(ARCH)-$(CONTRIBREV)-$(DARWIN_COMPILER).tar.bz2
+	@if test -d tmp; then \
+		echo "Move away ./tmp, it's in the way" ; \
+		exit 1 ; \
+	fi
+	mkdir tmp
+	(cd tmp && tar jxvf ../$<)
+	./change_prefix.sh tmp @@CONTRIB_PREFIX@@  $(PREFIX)
+	for dir in `(cd tmp && find . -type d)`; do mkdir -p -- $$dir; done
+	for i in `(cd tmp && find . -not -type d)`; do mv -f tmp/$$i $$i; done
+	rm -rf tmp
+endif
 
 clean-src:
 	rm -rf $(BUILDDIRS)
@@ -52,7 +80,7 @@ package-macosx:
 	fi
 	mkdir tmp
 	tar cf - bin sbin include lib vlc-lib share/aclocal* share/autoconf* \
-		share/automake* share/gettext* \
+		share/automake* share/gettext* share/libtool* gecko-sdk \
 		| (cd tmp; tar xf -)
 	./change_prefix.sh tmp $(PREFIX) @@CONTRIB_PREFIX@@
 	(cd tmp; tar cf - .) | bzip2 -c > contrib-macosx.tar.bz2
diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 0fcb9e5..08f9ab4 100755
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -70,6 +70,15 @@ if test "$HOST" != "$BUILD"; then
     STRIP="${HOST}-strip"
 fi
 
+case $HOST in
+    *powerpc*|*ppc*)
+         echo "ARCH=ppc" >> config.mak
+     ;;
+    *86*)
+          echo "ARCH=i386" >> config.mak
+     ;;
+esac
+
 # Check the HAVE_{OS}
 case $HOST in
     *darwin*)