An attempt to fix the nightly builds failing due to inclusion of wrong precompiled headers.
authorAdrian Godoroja <robotive@me.com>
Mon, 09 Jan 2012 23:04:17 +0200
changeset 4480 ccef3ee414cb
parent 4479 62403b7e52d5
child 4481 f6191276f60e
An attempt to fix the nightly builds failing due to inclusion of wrong precompiled headers.
Makefile
Release/Makefile
--- a/Makefile	Mon Jan 09 21:47:41 2012 +0200
+++ b/Makefile	Mon Jan 09 23:04:17 2012 +0200
@@ -15,10 +15,10 @@
 .PHONY: all adium clean localizable-strings latest test astest install
 
 adium:
-	xcodebuild -project Adium.xcodeproj -configuration $(BUILDCONFIGURATION) CFLAGS="$(ADIUM_CFLAGS)" build
+	xcodebuild -project Adium.xcodeproj -configuration $(BUILDCONFIGURATION) CFLAGS="$(ADIUM_CFLAGS)" $(ADIUM_NIGHTLY_FLAGS) build
 
 test:
-	xcodebuild -project Adium.xcodeproj -configuration $(BUILDCONFIGURATION) CFLAGS="$(ADIUM_CFLAGS)" -target "Unit tests" build
+	xcodebuild -project Adium.xcodeproj -configuration $(BUILDCONFIGURATION) CFLAGS="$(ADIUM_CFLAGS)" $(ADIUM_NIGHTLY_FLAGS) -target "Unit tests" build
 astest:
 	osascript unittest\ runner.applescript | tr '\r' '\n'
 
--- a/Release/Makefile	Mon Jan 09 21:47:41 2012 +0200
+++ b/Release/Makefile	Mon Jan 09 23:04:17 2012 +0200
@@ -65,6 +65,7 @@
 	VERSION:=$(VERSION)$(REVISION)
 	BUILD_IN_DEBUG_MODE=TRUE
 	BUILDFLAGS+="ADIUM_CFLAGS=-DNIGHTLY_RELEASE"
+	BUILDFLAGS+="ADIUM_NIGHTLY_FLAGS=CACHE_ROOT=/var/folders/buildbot/com.apple.Xcode.$(strip $(shell id -u))/nightly/$(strip $(NIGHTLY_REPO))/$(strip $(NIGHTLY_BRANCH))" # Required, otherwise wrong precompiled headers are used.
 endif
 
 ifeq ($(BUILD_IN_DEBUG_MODE),TRUE)
@@ -74,6 +75,7 @@
 endif
 
 BUILDFLAGS+="BUILDCONFIGURATION=$(BUILDSTYLE)"
+
 ifeq ($(BETA),TRUE)
 	BUILDFLAGS+="ADIUM_CFLAGS=-DBETA_RELEASE"
 endif