From a5f7aa32a79a0ee2845d8b05e4e16cb6ecca8e2b Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Mon, 8 Dec 2014 21:09:29 +0000 Subject: [PATCH] jenkins_build.sh: update src/svn_version.h explicitly before using make -j4 to be certain he exists before any compilation. --- jenkins_build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jenkins_build.sh b/jenkins_build.sh index ec5bcab4..6a846960 100755 --- a/jenkins_build.sh +++ b/jenkins_build.sh @@ -163,6 +163,7 @@ case "$build" in echo ./configure --prefix=$PWD/usr $withcurl $withssh echo ------------- ./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 install 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 # 2. trying to get Cygwin to install into a local directory ./configure --disable-nls $withcurl $withssh + (cd src ; make svn_version.h) make -j4 # result=$? make install @@ -190,6 +192,7 @@ case "$build" in export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig echo --- recursive MinGW build --- ./configure $withcurl $withssh + (cd src ; make svn_version.h) make # DO NOT USE -j4. It seems to hang the build! make install make samples