[Scummvm-cvs-logs] SF.net SVN: scummvm:[56026] buildbot/config/master.cfg
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Wed May 25 14:26:32 CEST 2011
Revision: 56026
http://scummvm.svn.sourceforge.net/scummvm/?rev=56026&view=rev
Author: fingolfin
Date: 2011-05-25 12:26:31 +0000 (Wed, 25 May 2011)
Log Message:
-----------
BUILDBOT: Re-enable ccache use
Despite all I/O performance problems, this should still be beneficial
as long as we keep tweaking files like configure, scummsys.h and other
stuff that cause hundreds of files to be recompiled despite no actual
changes to them.
Modified Paths:
--------------
buildbot/config/master.cfg
Modified: buildbot/config/master.cfg
===================================================================
--- buildbot/config/master.cfg 2011-05-22 06:02:19 UTC (rev 56025)
+++ buildbot/config/master.cfg 2011-05-25 12:26:31 UTC (rev 56026)
@@ -71,7 +71,7 @@
# debian lenny 32bit.
scumm_env_lenny = copy.deepcopy(scumm_env)
-scumm_env_lenny["CXX"] = "g++"
+scumm_env_lenny["CXX"] = "ccache g++"
p = {
"configureargs": [ ],
@@ -86,7 +86,7 @@
scumm_root_lenny_x86_64 = "/opt/toolchains/debian-lenny-x86_64"
scumm_env_lenny_x86_64 = copy.deepcopy(scumm_env)
scumm_env_lenny_x86_64["PATH"] = "%s/bin:%s" % (scumm_root_lenny_x86_64, os.environ["PATH"])
-scumm_env_lenny_x86_64["CXX"] = "g++"
+scumm_env_lenny_x86_64["CXX"] = "ccache g++"
scumm_env_lenny_x86_64["CXXFLAGS"] = "-m64 -isystem %s/usr/include" % scumm_root_lenny_x86_64
scumm_env_lenny_x86_64["LDFLAGS"] = "-m64 -Wl,-rpath,%s/lib -Wl,-rpath,%s/usr/lib -L%s/usr/lib" % \
(scumm_root_lenny_x86_64, scumm_root_lenny_x86_64, scumm_root_lenny_x86_64)
@@ -106,7 +106,7 @@
scumm_root_mingw_w32 = "/opt/toolchains/i586-mingw32msvc"
scumm_env_mingw_w32 = copy.deepcopy(scumm_env)
scumm_env_mingw_w32["PATH"] = "%s/bin:%s" % (scumm_root_mingw_w32, os.environ["PATH"])
-scumm_env_mingw_w32["CXX"] = "i586-mingw32msvc-g++"
+scumm_env_mingw_w32["CXX"] = "ccache i586-mingw32msvc-g++"
scumm_env_mingw_w32["CXXFLAGS"] = "-isystem %s/include" % scumm_root_mingw_w32
scumm_env_mingw_w32["LDFLAGS"] = "-L%s/lib" % scumm_root_mingw_w32
@@ -128,7 +128,7 @@
scumm_root_mingw_w64 = "/opt/toolchains/mingw-w64-bin_i686-linux"
scumm_env_mingw_w64 = copy.deepcopy(scumm_env)
scumm_env_mingw_w64["PATH"] = "%s/bin:%s" % (scumm_root_mingw_w64, os.environ["PATH"])
-scumm_env_mingw_w64["CXX"] = "x86_64-pc-mingw32-g++"
+scumm_env_mingw_w64["CXX"] = "ccache x86_64-pc-mingw32-g++"
scumm_env_mingw_w64["CXXFLAGS"] = "-isystem %s/include" % scumm_root_mingw_w64
scumm_env_mingw_w64["LDFLAGS"] = "-L%s/lib" % scumm_root_mingw_w64
@@ -151,7 +151,7 @@
scumm_root_wii = "/opt/toolchains/devkitPPC-r16"
scumm_env_wii = copy.deepcopy(scumm_env)
scumm_env_wii["PATH"] = "%s/devkitPPC/bin:%s" % (scumm_root_wii, os.environ["PATH"])
-scumm_env_wii["CXX"] = "powerpc-gekko-g++"
+scumm_env_wii["CXX"] = "ccache powerpc-gekko-g++"
scumm_env_wii["CXXFLAGS"] = "-isystem %s/3rd/include" % scumm_root_wii
scumm_env_wii["LDFLAGS"] = "-L%s/3rd/lib" % scumm_root_wii
scumm_env_wii["DEVKITPRO"] = "%s" % scumm_root_wii
@@ -177,7 +177,7 @@
scumm_root_gc = "/opt/toolchains/devkitPPC-r16"
scumm_env_gc = copy.deepcopy(scumm_env)
scumm_env_gc["PATH"] = "%s/devkitPPC/bin:%s" % (scumm_root_gc, os.environ["PATH"])
-scumm_env_gc["CXX"] = "powerpc-gekko-g++"
+scumm_env_gc["CXX"] = "ccache powerpc-gekko-g++"
scumm_env_gc["CXXFLAGS"] = "-isystem %s/3rd/include" % scumm_root_gc
scumm_env_gc["LDFLAGS"] = "-L%s/3rd/lib" % scumm_root_gc
scumm_env_gc["DEVKITPRO"] = "%s" % scumm_root_gc
@@ -203,7 +203,7 @@
scumm_root_ds = "/opt/toolchains/devkitARM-r30"
scumm_env_ds = copy.deepcopy(scumm_env)
scumm_env_ds["PATH"] = "%s/devkitARM/bin:%s" % (scumm_root_ds, os.environ["PATH"])
-scumm_env_ds["CXX"] = "arm-eabi-c++"
+scumm_env_ds["CXX"] = "ccache arm-eabi-c++"
#scumm_env_ds["CXXFLAGS"] = "-isystem %s/include" % scumm_root_ds
#scumm_env_ds["LDFLAGS"] = "-L%s/lib" % scumm_root_ds
scumm_env_ds["DEVKITPRO"] = scumm_root_ds
@@ -232,7 +232,7 @@
scumm_root_osx_intel = "/opt/toolchains/i686-apple-darwin9-10.4"
scumm_env_osx_intel = copy.deepcopy(scumm_env)
scumm_env_osx_intel["PATH"] = "%s/bin:%s" % (scumm_root_osx_intel, os.environ["PATH"])
-scumm_env_osx_intel["CXX"] = "i686-apple-darwin9-g++"
+scumm_env_osx_intel["CXX"] = "ccache i686-apple-darwin9-g++"
scumm_env_osx_intel["CXXFLAGS"] = "-isystem %s/include" % scumm_root_osx_intel
scumm_env_osx_intel["LDFLAGS"] = "-L%s/lib" % scumm_root_osx_intel
@@ -254,7 +254,7 @@
scumm_root_osx_ppc = "/opt/toolchains/powerpc-apple-darwin8-10.2"
scumm_env_osx_ppc = copy.deepcopy(scumm_env)
scumm_env_osx_ppc["PATH"] = "%s/bin:%s" % (scumm_root_osx_ppc, os.environ["PATH"])
-scumm_env_osx_ppc["CXX"] = "ppc-apple-darwin8-g++"
+scumm_env_osx_ppc["CXX"] = "ccache ppc-apple-darwin8-g++"
scumm_env_osx_ppc["CXXFLAGS"] = "-fabi-version=1 -fno-use-cxa-atexit -isystem %s/include" % scumm_root_osx_ppc
scumm_env_osx_ppc["LDFLAGS"] = "-L%s/lib -static-libgcc -ldl" % scumm_root_osx_ppc
scumm_env_osx_ppc["MACOSX_DEPLOYMENT_TARGET"] = "10.2"
@@ -277,7 +277,7 @@
scumm_libdir_iphone = "%s/SDK/usr/local" % scumm_root_iphone
scumm_env_iphone = copy.deepcopy(scumm_env)
scumm_env_iphone["PATH"] = "%s/bin:%s" % (scumm_root_iphone, os.environ["PATH"])
-scumm_env_iphone["CXX"] = "arm-apple-darwin9-g++"
+scumm_env_iphone["CXX"] = "ccache arm-apple-darwin9-g++"
scumm_env_iphone["CXXFLAGS"] = "-isystem %s/include" % scumm_libdir_iphone
scumm_env_iphone["LDFLAGS"] = "-F%s/SDK/System/Library/PrivateFrameworks -bind_at_load -L%s/lib" % (scumm_root_iphone, scumm_libdir_iphone)
scumm_env_iphone["LIBDIR"] = scumm_libdir_iphone
@@ -300,7 +300,7 @@
scumm_root_psp = "/opt/toolchains/psp"
scumm_env_psp = copy.deepcopy(scumm_env)
scumm_env_psp["PATH"] = "%s/bin:%s" % (scumm_root_psp, os.environ["PATH"])
-scumm_env_psp["CXX"] = "psp-g++"
+scumm_env_psp["CXX"] = "ccache psp-g++"
scumm_env_psp["CXXFLAGS"] = "-isystem %s/include" % scumm_root_psp
scumm_env_psp["LDFLAGS"] = "-L%s/lib" % scumm_root_psp
scumm_env_psp["PSPDEV"] = scumm_root_psp
@@ -336,7 +336,7 @@
scumm_env_ps2 = copy.deepcopy(scumm_env)
scumm_env_ps2["PATH"] = "%s/tools/bin:%s/tools/ee/bin:%s/tools/iop/bin:%s/tools/dvp/bin:%s/sdk/bin:%s" % \
(scumm_root_ps2, scumm_root_ps2, scumm_root_ps2, scumm_root_ps2, scumm_root_ps2, os.environ["PATH"])
-scumm_env_ps2["CXX"] = "ee-g++"
+scumm_env_ps2["CXX"] = "ccache ee-g++"
#scumm_env_ps2["CXXFLAGS"] = "-isystem %s/include" % scumm_root_ps2
#scumm_env_ps2["LDFLAGS"] = "-L%s/lib" % scumm_root_ps2
scumm_env_ps2["PS2DEV"] = "%s/tools" % scumm_root_ps2
@@ -364,7 +364,7 @@
scumm_root_gp2x = "/opt/toolchains/open2x-gcc-4.1.1"
scumm_env_gp2x = copy.deepcopy(scumm_env)
scumm_env_gp2x["PATH"] = "%s/bin:%s" % (scumm_root_gp2x, os.environ["PATH"])
-scumm_env_gp2x["CXX"] = "arm-open2x-linux-g++"
+scumm_env_gp2x["CXX"] = "ccache arm-open2x-linux-g++"
scumm_env_gp2x["CXXFLAGS"] = "-isystem %s/include" % scumm_root_gp2x
scumm_env_gp2x["LDFLAGS"] = "-L%s/lib" % scumm_root_gp2x
@@ -385,7 +385,7 @@
scumm_root_gp2xwiz = "/opt/toolchains/open2x-gcc-4.1.1"
scumm_env_gp2xwiz = copy.deepcopy(scumm_env)
scumm_env_gp2xwiz["PATH"] = "%s/bin:%s" % (scumm_root_gp2xwiz, os.environ["PATH"])
-scumm_env_gp2xwiz["CXX"] = "arm-open2x-linux-g++"
+scumm_env_gp2xwiz["CXX"] = "ccache arm-open2x-linux-g++"
scumm_env_gp2xwiz["CXXFLAGS"] = "-isystem %s/include" % scumm_root_gp2xwiz
scumm_env_gp2xwiz["LDFLAGS"] = "-L%s/lib" % scumm_root_gp2xwiz
@@ -408,7 +408,7 @@
scumm_root_dc= "/opt/toolchains/dc"
scumm_env_dc = copy.deepcopy(scumm_env)
scumm_env_dc["PATH"] = "%s/bin:%s" % (scumm_root_dc, os.environ["PATH"])
-scumm_env_dc["CXX"] = "sh-elf-g++"
+scumm_env_dc["CXX"] = "ccache sh-elf-g++"
scumm_env_dc["CXXFLAGS"] = "-isystem %s/include" % scumm_root_dc
scumm_env_dc["LDFLAGS"] = "-L%s/lib" % scumm_root_dc
scumm_env_dc["IP_TEMPLATE_FILE"] = "/opt/extras-dc/IP.TMPL"
@@ -432,7 +432,7 @@
scumm_root_wince = "/opt/toolchains/mingw32ce-0.5.1"
scumm_env_wince = copy.deepcopy(scumm_env)
scumm_env_wince["PATH"] = "%s/bin:%s" % (scumm_root_wince, os.environ["PATH"])
-scumm_env_wince["CXX"] = "arm-wince-mingw32ce-g++"
+scumm_env_wince["CXX"] = "ccache arm-wince-mingw32ce-g++"
scumm_env_wince["CXXFLAGS"] = "-isystem %s/include -I%s/include/SDL" % (scumm_root_wince, scumm_root_wince)
scumm_env_wince["LDFLAGS"] = "-L%s/lib" % scumm_root_wince
@@ -452,7 +452,7 @@
scumm_root_motoezx = "/opt/toolchains/motoezx"
scumm_env_motoezx = copy.deepcopy(scumm_env)
scumm_env_motoezx["PATH"] = "%s/bin:%s/crosstool/bin:%s" % (scumm_root_motoezx, scumm_root_motoezx, os.environ["PATH"])
-scumm_env_motoezx["CXX"] = "arm-linux-gnu-g++"
+scumm_env_motoezx["CXX"] = "ccache arm-linux-gnu-g++"
scumm_env_motoezx["CXXFLAGS"] = "-isystem %s/include" % (scumm_root_motoezx)
scumm_env_motoezx["LDFLAGS"] = "-L%s/lib" % scumm_root_motoezx
@@ -473,7 +473,7 @@
scumm_root_motomagx = "/opt/toolchains/motomagx/arm-eabi2"
scumm_env_motomagx = copy.deepcopy(scumm_env)
scumm_env_motomagx["PATH"] = "%s/bin:%s" % (scumm_root_motomagx, os.environ["PATH"])
-scumm_env_motomagx["CXX"] = "arm-linux-gnueabi-g++"
+scumm_env_motomagx["CXX"] = "ccache arm-linux-gnueabi-g++"
scumm_env_motomagx["CXXFLAGS"] = "-isystem %s/include" % (scumm_root_motomagx)
scumm_env_motomagx["LDFLAGS"] = "-L%s/lib" % scumm_root_motomagx
@@ -494,7 +494,7 @@
scumm_root_n64 = "/opt/toolchains/mips64-n64"
scumm_env_n64 = copy.deepcopy(scumm_env)
scumm_env_n64["PATH"] = "%s/bin:%s" % (scumm_root_n64, os.environ["PATH"])
-scumm_env_n64["CXX"] = "mips64-g++"
+scumm_env_n64["CXX"] = "ccache mips64-g++"
scumm_env_n64["N64SDK"] = "/opt/toolchains/mips64-n64"
p = {
@@ -517,7 +517,7 @@
scumm_root_dingux = "/opt/toolchains/dingux-mipsel"
scumm_env_dingux = copy.deepcopy(scumm_env)
scumm_env_dingux["PATH"] = "%s/usr/bin:%s" % (scumm_root_dingux, os.environ["PATH"])
-scumm_env_dingux["CXX"] = "mipsel-linux-g++"
+scumm_env_dingux["CXX"] = "ccache mipsel-linux-g++"
p = {
"configureargs": [
@@ -543,7 +543,7 @@
#scumm_root_op = "/opt/toolchains/arm-angstrom-openpandora"
#scumm_env_op = copy.deepcopy(scumm_env)
#scumm_env_op["PATH"] = "%s/bin:%s" % (scumm_root_op, os.environ["PATH"])
-#scumm_env_op["CXX"] = "arm-angstrom-linux-gnueabi-g++"
+#scumm_env_op["CXX"] = "ccache arm-angstrom-linux-gnueabi-g++"
#
#p = {
# "configureargs": [
@@ -567,7 +567,7 @@
scumm_env_caanoo["SDK_PATH"] = "%s" % scumm_root_caanoo
scumm_env_caanoo["TARGET_SYS"] = "arm-none-linux-gnueabi"
scumm_env_caanoo["PATH"] = "%s/bin:%s" % (scumm_root_caanoo, os.environ["PATH"])
-scumm_env_caanoo["CXX"] = "arm-none-linux-gnueabi-g++"
+scumm_env_caanoo["CXX"] = "ccache arm-none-linux-gnueabi-g++"
scumm_env_caanoo["CXXFLAGS"] = "-isystem %s/arm-none-linux-gnueabi/usr/include" % scumm_root_caanoo
scumm_env_caanoo["LDFLAGS"] = "-L%s/arm-none-linux-gnueabi/usr/lib" % scumm_root_caanoo
@@ -591,7 +591,7 @@
scumm_root_android = "/opt/toolchains/android"
scumm_env_android = copy.deepcopy(scumm_env)
scumm_env_android["PATH"] = "%s/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:%s" % (scumm_root_android, os.environ["PATH"])
-scumm_env_android["CXX"] = "arm-linux-androideabi-g++"
+scumm_env_android["CXX"] = "ccache arm-linux-androideabi-g++"
scumm_env_android["CXXFLAGS"] = "-isystem %s/3rd-android-4-armeabi-release/include" % scumm_root_android
scumm_env_android["LDFLAGS"] = "-L%s/3rd-android-4-armeabi-release/lib" % scumm_root_android
scumm_env_android["ANDROID_SDK"] = "%s/android-sdk-linux_x86" % scumm_root_android
@@ -616,6 +616,7 @@
scumm_root_webos = "/opt/toolchains/webos"
scumm_env_webos = copy.deepcopy(scumm_env)
scumm_env_webos["PATH"] = "%s/PalmPDK/arm-gcc/bin:%s" % (scumm_root_webos, os.environ["PATH"])
+scumm_env_android["CXX"] = "ccache arm-wince-mingw32ce-g++"
scumm_env_webos["WEBOS_SDK"] = "%s/PalmSDK/Current" % scumm_root_webos
scumm_env_webos["WEBOS_PDK"] = "%s/PalmPDK" % scumm_root_webos
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list