Use ~/build/wx versus ~/build/wx-trunk. I'll be using this for default "trunk" builds and a seperate directory for branches.
Originally committed to SVN as r5094.
This commit is contained in:
parent
ddc12d55ce
commit
6da7e1a4da
1 changed files with 4 additions and 4 deletions
|
@ -159,12 +159,12 @@ flinux.addStep(shell.ShellCommand(
|
|||
WithProperties("--with-build-credit=BuildBot: %s (%s)", "buildername", "slavename"),
|
||||
"--disable-check-wx-stc",
|
||||
"--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={
|
||||
'CC': '/usr/lib/ccache/gcc',
|
||||
'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_DIR': '/home/verm/.ccache',
|
||||
'LUA_CFLAGS': '-I/usr/include/lua5.1',
|
||||
|
@ -221,7 +221,7 @@ ffbsd.addStep(shell.ShellCommand(
|
|||
command=["./configure",
|
||||
"--prefix=/usr/local",
|
||||
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",
|
||||
"--disable-check-wx-opengl",
|
||||
"--disable-check-wx-stc"
|
||||
|
@ -233,7 +233,7 @@ ffbsd.addStep(shell.ShellCommand(
|
|||
'CXX': '/usr/local/libexec/ccache/g++',
|
||||
'CFLAGS': '-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_LDFLAGS': '-L/usr/local/lib -llua-5.1'
|
||||
},
|
||||
|
|
Loading…
Reference in a new issue