jenkins_build.sh: update src/svn_version.h explicitly before using make -j4 to be certain he exists before any compilation.

v0.27.3
Robin Mills 11 years ago
parent a7d45af556
commit a5f7aa32a7

@ -163,6 +163,7 @@ case "$build" in
echo ./configure --prefix=$PWD/usr $withcurl $withssh echo ./configure --prefix=$PWD/usr $withcurl $withssh
echo ------------- echo -------------
./configure --prefix=$PWD/usr $withcurl $withssh ./configure --prefix=$PWD/usr $withcurl $withssh
(cd src ; make svn_version.h)
make -j4 "LDFLAGS=-L${PWD}/usr/lib -L${PWD}/xmpsdk/src/.libs" make -j4 "LDFLAGS=-L${PWD}/usr/lib -L${PWD}/xmpsdk/src/.libs"
make install make install
make -j4 samples "CXXFLAGS=-I${PWD}/usr/include -I${PWD}/src" "LDFLAGS=-L${PWD}/usr/lib -L${PWD}/xmpsdk/src/.libs -lexiv2" make -j4 samples "CXXFLAGS=-I${PWD}/usr/include -I${PWD}/src" "LDFLAGS=-L${PWD}/usr/lib -L${PWD}/xmpsdk/src/.libs -lexiv2"
@ -176,6 +177,7 @@ case "$build" in
# 1. trying to get Cygwin to build with gettext and friends # 1. trying to get Cygwin to build with gettext and friends
# 2. trying to get Cygwin to install into a local directory # 2. trying to get Cygwin to install into a local directory
./configure --disable-nls $withcurl $withssh ./configure --disable-nls $withcurl $withssh
(cd src ; make svn_version.h)
make -j4 make -j4
# result=$? # result=$?
make install make install
@ -190,6 +192,7 @@ case "$build" in
export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
echo --- recursive MinGW build --- echo --- recursive MinGW build ---
./configure $withcurl $withssh ./configure $withcurl $withssh
(cd src ; make svn_version.h)
make # DO NOT USE -j4. It seems to hang the build! make # DO NOT USE -j4. It seems to hang the build!
make install make install
make samples make samples

Loading…
Cancel
Save