[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=36d3af6

The following commit has been merged in the master branch:
commit 36d3af67553233a4b368a0a05579cda6fdc87d41
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Aug 18 13:25:07 2014 +0000

    jenkins script fixes
---
 jenkins_build.bat |  2 +-
 jenkins_build.sh  | 40 ++++++++++++++++++++++++++--------------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/jenkins_build.bat b/jenkins_build.bat
index 2fcbb72..baf9737 100644
--- a/jenkins_build.bat
+++ b/jenkins_build.bat
@@ -2,7 +2,7 @@
 rem --
 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 COMPILER      set COMPILER=G++
diff --git a/jenkins_build.sh b/jenkins_build.sh
index 31adc42..fc18a59 100755
--- a/jenkins_build.sh
+++ b/jenkins_build.sh
@@ -1,28 +1,40 @@
 #!/bin/bash
 
-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
-
-if [ "$ACTION" == /rebuild ]; then
-	if [ -e configure ]; then
-		make distclean;
-	fi
+set +v
+DIR="$PWD"
+if [ "$HOME" == "/Users/rmills" ]; then 
+  source ~/bin/.profile
 fi
+cd "$DIR"
 
-if [ ! -e configure ]; then 
-	make config
-	./configure --prefix=$PWD/usr
+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 PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$PWD/usr/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig
+##
+# cleanup from last time (if there was a last time)
+if [ -e config/config.mk ]; then
+    if [ ! -e bin ]; then
+       mkdir bin
+    fi
+    make distclean
 fi
 
-touch src/version.cpp
+##
+# remove anything left from previous build
+#for ext in .a .la .exe ; do
+#   find . -name "\"*$ext\"" -exec rm -rf {} ";"
+#done
 
-make
+make config
+./configure --prefix=$PWD/usr
+make LDFLAGS=-L${PWD}/usr/lib
 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
 	make tests
 fi
 
+
 # That's all Folks!
 ##

-- 
exiv2 packaging