jenkins script fixes

v0.27.3
Robin Mills 11 years ago
parent bb58ad5785
commit 36d3af6755

@ -2,7 +2,7 @@
rem -- rem --
rem build exiv2 library from Jenkins (or the command-line) rem build exiv2 library from Jenkins (or the command-line)
if NOT %label%==MSVC exit/b 0 rem if NOT %label%==MSVC exit/b 0
if NOT DEFINED ACTION set ACTION=/build if NOT DEFINED ACTION set ACTION=/build
if NOT DEFINED COMPILER set COMPILER=G++ if NOT DEFINED COMPILER set COMPILER=G++

@ -1,28 +1,40 @@
#!/bin/bash #!/bin/bash
set +v
DIR="$PWD"
if [ "$HOME" == "/Users/rmills" ]; then
source ~/bin/.profile
fi
cd "$DIR"
if [ -z "$tests" ]; then tests=true; fi
export PATH=$PATH:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/bin:/usr/lib/pkgconfig:/opt/local/bin:$PWD/usr/bin:/opt/local/bin:/opt/local/sbin:/opt/pkgconfig:bin export PATH=$PATH:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/bin:/usr/lib/pkgconfig:/opt/local/bin:$PWD/usr/bin:/opt/local/bin:/opt/local/sbin:/opt/pkgconfig:bin
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$PWD/usr/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$PWD/usr/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig
##
if [ "$ACTION" == /rebuild ]; then # cleanup from last time (if there was a last time)
if [ -e configure ]; then if [ -e config/config.mk ]; then
make distclean; if [ ! -e bin ]; then
mkdir bin
fi fi
make distclean
fi fi
if [ ! -e configure ]; then ##
make config # remove anything left from previous build
./configure --prefix=$PWD/usr #for ext in .a .la .exe ; do
fi # find . -name "\"*$ext\"" -exec rm -rf {} ";"
#done
touch src/version.cpp
make make config
./configure --prefix=$PWD/usr
make LDFLAGS=-L${PWD}/usr/lib
make install make install
make samples make samples CXXFLAGS=-I${PWD}/usr/include "LDFLAGS=-L${PWD}/usr/lib -L${PWD}/xmpsdk/src/.libs -lexiv2"
if [ "$tests" == true ]; then if [ "$tests" == true ]; then
make tests make tests
fi fi
# That's all Folks! # That's all Folks!
## ##

Loading…
Cancel
Save