BuildSystem: Mac OS X - transition to Xcode4

- transition from Xcode3 to Xcode4
- overhaul HandBrake.xcodeproj file
- simplify down to 2 configurations: debug, release
- add xcconfig for useful variants: osx106.i386, osx106.x86_64, osx107.i386, osx107.x86_64
- add configure --xcode-config as preferred method to choose OSX minimum version and SDK
- overhaul Info.plist generation to use m4 instead of cpp
- remove use of direct static libraries on command line - Xcode4 now enables -search_paths_first by default
- reference external build static libraries project file - greatly simplifying project file maintenance
- update universal build targets to use --xcode-config
- update ffmpeg hack to build on i386 in both debug and optimized modes
- update ffmpeg build to show compile verbosity
- enable local yasm when yasm probe fails
- remove unused GCC.ldsysroot
- remove unused GCC.ldminver
- enhance xcodemake to use --sysroot, --minver
- update/regenerate docs accordingly
- add support for configure-time repo probe when svn repo is incompatible format to Xcode via .svn/HANDBRAKE_REPO_PROBE
- replaced make/test/build.matrix.darwin with make/test/build.matrix


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4395 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 20 insertions, 17 deletions

diff --git a/make/variant/darwin.defs b/make/variant/darwin.defs
index 4c9d06bb2..755bcb571 100644
--- a/make/variant/darwin.defs
+++ b/make/variant/darwin.defs
@@ -1,9 +1,10 @@
-UB.archs  = i386 x86_64 ppc ppc64
-UB.builds = $(wildcard $(foreach n,$(UB.archs),$(SRC/)build.$n))
-UB.first  = $(word 1,$(UB.archs))
-UB.other  = $(wordlist 2,999,$(UB.archs))
+UB.xcconfigs = osx106.i386 osx106.x86_64
+UB.builds    = $(wildcard $(foreach n,$(UB.xcconfigs),$(SRC/)build.$n))
+UB.first     = $(word 1,$(UB.xcconfigs))
+UB.more      = $(wordlist 2,999,$(UB.xcconfigs))
+UB.products/ = macosx/release/
 
-UB.BUILD = $(SRC/)configure --force --build=ub.$(1) --arch=$(1) --launch --launch-quiet
+UB.BUILD = $(SRC/)configure --force --build=ub.$(1) --xcconfig=$(1) --launch --launch-quiet
 
 ## linefeed is important
 define UB.BUILD.item
@@ -12,7 +13,7 @@ define UB.BUILD.item
 endef
 
 define UB.BUILD.SERIAL
-	$(foreach n,$(UB.archs),$(call UB.BUILD.item,$n))
+	$(foreach n,$(UB.xcconfigs),$(call UB.BUILD.item,$n))
 endef
 
 define UB.BUILD.PARALLEL
@@ -22,16 +23,16 @@ endef
 define UB.COMBINE
 	$(RM.exe) -fr ub.combine
 	$(MKDIR.exe) -p ub.combine
-	$(CP.exe) ub.$(UB.first)/HandBrakeCLI ub.combine/.
-	$(LIPO.exe) $(foreach n,$(UB.archs),ub.$n/HandBrakeCLI) -create -output ub.combine/HandBrakeCLI
-	$(CP.exe) -R ub.$(UB.first)/HandBrake.app ub.combine/.
-	$(LIPO.exe) $(foreach n,$(UB.archs),ub.$n/$(1)) -create -output ub.combine/$(1)
+	$(CP.exe) ub.$(UB.first)/$(UB.products/)HandBrakeCLI ub.combine/.
+	$(LIPO.exe) $(foreach n,$(UB.xcconfigs),ub.$n/$(UB.products/)HandBrakeCLI) -create -output ub.combine/HandBrakeCLI
+	$(CP.exe) -R ub.$(UB.first)/$(UB.products/)HandBrake.app ub.combine/.
+	$(LIPO.exe) $(foreach n,$(UB.xcconfigs),ub.$n/$(UB.products/)$(1)) -create -output ub.combine/$(1)
 	@lipo -info ub.combine/$(1)
 	@sync
 	@echo ""
-	@echo "$@: { $(UB.archs) } combined -> ub.combine/HandBrakeCLI"
+	@echo "$@: { $(UB.xcconfigs) } combined -> ub.combine/HandBrakeCLI"
 	@echo "$@: UB executable size: `du -sh ub.combine/HandBrakeCLI | awk '{ print $$1 }'`"
 	@echo ""
-	@echo "$@: { $(UB.archs) } combined -> ub.combine/HandBrake.app"
+	@echo "$@: { $(UB.xcconfigs) } combined -> ub.combine/HandBrake.app"
 	@echo "$@: UB executable size: `du -sh ub.combine/$(1) | awk '{ print $$1 }'`"
 endef
diff --git a/make/variant/darwin.rules b/make/variant/darwin.rules
index d59a222b4..cd0d1ade9 100644
--- a/make/variant/darwin.rules
+++ b/make/variant/darwin.rules
@@ -1,14 +1,16 @@
 .PHONY: ub.build ub.combine ub.clean
 
+ub.build: ub.build.serial
+
 ub.build.serial:
 	@$(UB.BUILD.SERIAL)
 
 ub.build.parallel:
 	@set -e; \
-	for arch in $(UB.archs); do \
-	    $(call UB.BUILD.PARALLEL,$$arch) & \
+	for xcconfig in $(UB.xcconfigs); do \
+	    $(call UB.BUILD.PARALLEL,$$xcconfig) & \
 	    children="$$children $$!"; \
-	    echo "pid $$!: $(call UB.BUILD.PARALLEL,$$arch)"; \
+	    echo "pid $$!: $(call UB.BUILD.PARALLEL,$$xcconfig)"; \
 	done; \
 	echo "waiting for background jobs to complete:$$children"; \
 	wait
@@ -16,5 +18,5 @@ ub.build.parallel:
 ub.combine:
 	$(call UB.COMBINE,HandBrake.app/Contents/MacOS/HandBrake)
 
-ub.clean:
-	$(RM.EXE) -fr $(foreach n,$(UB.archs.other),ub.$n)
+#ub.clean:
+#	$(RM.exe) -fr $(foreach n,$(UB.archs.other),ub.$n)