X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=make%2Fvariant%2Fdarwin.defs;h=4c9d06bb26c7666e1313eb03e950d3e22b7ecacf;hb=0127c54ac319533945d02788f0a22d02fe699c7a;hp=6f8f6729dd2b338ff1ed5281043a9ab71e9f8e43;hpb=9f2cfdb81c9b40ea164bc25daca45c77ebe376a6;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/make/variant/darwin.defs b/make/variant/darwin.defs
index 6f8f6729..4c9d06bb 100644
--- a/make/variant/darwin.defs
+++ b/make/variant/darwin.defs
@@ -1,61 +1,37 @@
-## UB build support
-##
-## PROCEDURE:
-##
-##  1. Perform a build (let us call it arch-X).
-##  2. cd into arch-X's build/ driectory.
-##  3. Launch builds of the remaining architectures.
-##     We compute $(UB.archs.other) to be the remaining archs to build.
-##     The entire list is defined $(UB.archs) .
-##  4. Combine other architectures into arch-X's binaries.
-##
-## EXAMPLE: serial method, archs: i386,x86_64,ppc,ppc64
-##
-##  ./configure --launch
-##  cd build/
-##  make ub.build.serial
-##  make ub.combine
-##
-## EXAMPLE: parallel method, archs: i386,x86_64,ppc,ppc64
-##
-##  ./configure --launch
-##  cd build/
-##  make ub.build.parallel
-##  make ub.combine
-##
-## EXAMPLE: serial, archs: i386,x86_64 (assuming i386 is native)
-##
-##  ./configure --launch
-##  cd build/
-##  make ub.build.parallel UB.archs="i386 x86_64"
-##  make ub.combine UB.archs="i386 x86_64"
-##
-UB.archs       = i386 x86_64 ppc ppc64
-UB.archs.other = $(filter-out $(BUILD.arch),$(UB.archs))
-UB.builds      = $(wildcard $(foreach n,$(UB.archs.other),$(PROJECT/)build.$n))
+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.BUILD = $(PROJECT/)configure --launch --launch-dir=ub.$(1) --arch=$(1)
+UB.BUILD = $(SRC/)configure --force --build=ub.$(1) --arch=$(1) --launch --launch-quiet
 
 ## linefeed is important
 define UB.BUILD.item
-	$(call UB.BUILD,$(1))
+	$(call UB.BUILD,$(1)) --launch-jobs=0
 
 endef
 
 define UB.BUILD.SERIAL
-	$(foreach n,$(UB.archs.other),$(call UB.BUILD.item,$n))
+	$(foreach n,$(UB.archs),$(call UB.BUILD.item,$n))
 endef
 
 define UB.BUILD.PARALLEL
-	$(call UB.BUILD,$(1)) 2>&1 > ub.$(1).log
+	$(call UB.BUILD,$(1)) >/dev/null 2>&1
 endef
 
 define UB.COMBINE
 	$(RM.exe) -fr ub.combine
 	$(MKDIR.exe) -p ub.combine
-	$(CP.exe) -R HandBrake.app ub.combine/.
-	lipo $(1) $(foreach n,$(UB.archs.other),ub.$n/$(1)) -create -output ub.combine/$(1)
+	$(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)
+	@lipo -info ub.combine/$(1)
+	@sync
 	@echo ""
-	@sync; lipo -info ub.combine/$(1)
-	@du -sh ub.combine/$(1)
+	@echo "$@: { $(UB.archs) } 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 executable size: `du -sh ub.combine/$(1) | awk '{ print $$1 }'`"
 endef