mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Use ~/build/wx versus ~/build/wx-trunk. I'll be using this for default "trunk" builds and a seperate directory for branches.

Browse source 
Originally committed to SVN as r5094.
This commit is contained in:
Amar Takhar 2011-01-02 03:52:43 +00:00
parent ddc12d55ce
commit 6da7e1a4da
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
devel/tinderbox/buildbot/master/master.cfg
View file

@ -159,12 +159,12 @@ flinux.addStep(shell.ShellCommand(
WithProperties("--with-build-credit=BuildBot: %s (%s)", "buildername", "slavename"), WithProperties("--with-build-credit=BuildBot: %s (%s)", "buildername", "slavename"),
"--disable-check-wx-stc", "--disable-check-wx-stc",
"--disable-check-wx-opengl", "--disable-check-wx-opengl",
"--with-wx-config=/home/verm/build/wx-trunk/bin/wx-config" "--with-wx-config=/home/verm/build/wx/bin/wx-config"
], ],
env={ env={
'CC': '/usr/lib/ccache/gcc', 'CC': '/usr/lib/ccache/gcc',
'CXX': '/usr/lib/ccache/g++', 'CXX': '/usr/lib/ccache/g++',
'LDFLAGS': '-Wl,-rpath=/home/verm/build/wx-trunk/lib', 'LDFLAGS': '-Wl,-rpath=/home/verm/build/wx/lib',
'CCACHE_PATH': '/usr/bin', 'CCACHE_PATH': '/usr/bin',
'CCACHE_DIR': '/home/verm/.ccache', 'CCACHE_DIR': '/home/verm/.ccache',
'LUA_CFLAGS': '-I/usr/include/lua5.1', 'LUA_CFLAGS': '-I/usr/include/lua5.1',
@ -221,7 +221,7 @@ ffbsd.addStep(shell.ShellCommand(
command=["./configure", command=["./configure",
"--prefix=/usr/local", "--prefix=/usr/local",
WithProperties("--with-build-credit=BuildBot: %s (%s)", "buildername", "slavename"), WithProperties("--with-build-credit=BuildBot: %s (%s)", "buildername", "slavename"),
"--with-wx-config=/home/verm/build/wx-trunk/bin/wx-config", "--with-wx-config=/home/verm/build/wx/bin/wx-config",
"--enable-maintainer-mode", "--enable-maintainer-mode",
"--disable-check-wx-opengl", "--disable-check-wx-opengl",
"--disable-check-wx-stc" "--disable-check-wx-stc"
@ -233,7 +233,7 @@ ffbsd.addStep(shell.ShellCommand(
'CXX': '/usr/local/libexec/ccache/g++', 'CXX': '/usr/local/libexec/ccache/g++',
'CFLAGS': '-I/usr/local/include', 'CFLAGS': '-I/usr/local/include',
'CXXFLAGS': '-I/usr/local/include', 'CXXFLAGS': '-I/usr/local/include',
'LDFLAGS': '-L/usr/local/lib -rpath /usr/home/verm/build/wx-trunk/lib', 'LDFLAGS': '-L/usr/local/lib -rpath /usr/home/verm/build/wx/lib',
'LUA_CFLAGS': '-I/usr/local/include/lua51', 'LUA_CFLAGS': '-I/usr/local/include/lua51',
'LUA_LDFLAGS': '-L/usr/local/lib -llua-5.1' 'LUA_LDFLAGS': '-L/usr/local/lib -llua-5.1'
}, },