[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=3ffb1d7

The following commit has been merged in the master branch:
commit 3ffb1d7648ab86857cf61611acfb5a01fe4c12e1
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Dec 24 05:38:53 2015 +0000

    #1109  Modified cmake_daily to build multiple using more than one version of Visual Studio.  Added (untested) mingw support.
---
 .../{functions.so => buildserver.library}          |  0
 contrib/buildserver/cmake_daily.sh                 | 85 +++++++++++++++-------
 contrib/buildserver/jenkins_build.sh               |  2 +-
 contrib/buildserver/test_daily.sh                  |  2 +-
 4 files changed, 59 insertions(+), 30 deletions(-)

diff --git a/contrib/buildserver/functions.so b/contrib/buildserver/buildserver.library
similarity index 100%
rename from contrib/buildserver/functions.so
rename to contrib/buildserver/buildserver.library
diff --git a/contrib/buildserver/cmake_daily.sh b/contrib/buildserver/cmake_daily.sh
index 8c76c93..fc5b1a3 100755
--- a/contrib/buildserver/cmake_daily.sh
+++ b/contrib/buildserver/cmake_daily.sh
@@ -3,6 +3,7 @@
 ##
 # jenkins_daily.sh
 ##
+source $(find . -name buildserver.library)
 
 ##
 # configure the build (only used for msvc builds)
@@ -12,7 +13,6 @@ config=Release
 vs=2013
 
 result=0
-source $(find . -name functions.so)
 
 ##
 # determine location of the build and source directories
@@ -34,7 +34,7 @@ fi
 
 ##
 # create a clean directory for an out-of-source build
-rm    -rf $dist
+rm    -rf  dist
 mkdir -p  $dist
 mkdir -p  $build/dist/logs
 
@@ -44,32 +44,61 @@ echo "---- build = $build ------"
 ##
 # perform the build
 (
-  if [ "$PLATFORM" == "msvc" ]; then
-    ##
-    # get windows cmd.exe to perform the build
-    # use a subshell to restore the path
-    (
-      PATH="$msvc:/cygdrive/c/Program Files/csvn/bin:/cygdrive/c/Program Files (x86)/WANdisco/Subversion/csvn/bin:/cygdrive/c/Program Files/7-zip:/cygdrive/c/Program Files (x86)/cmake/bin:$PATH:/cygdrive/c/Windows/System32"
-      cmd.exe /c "cd $build && vcvars $vs $arch && cmakeBuild --rebuild --exiv2=$exiv2 $*"
-      result=$?
-      cp     $msvc/vcvars.bat $build/dist # required by test_daily.sh
-    )
-  else
-    pushd $build > /dev/null
-    (
-      # build 64 bit library
-      export CFLAGS=-m64
-      export CXXFLAGS=-m64
-      export LDFLAGS=-m64
-      # Always use /usr/local/bin/cmake
-      # I can guarantee it to be at least 3.4.1
-      # because I built it from source and installed it
-      /usr/local/bin/cmake -DCMAKE_INSTALL_PREFIX=$dist -DEXIV2_ENABLE_NLS=OFF $exiv2
-      make
-      /usr/local/bin/cmake --build . --target install
-    )
-    popd > /dev/null
-  fi
+   case $PLATFORM in
+     msvc)
+        ##
+        # get windows cmd.exe to perform the build
+        # use a subshell to restore the path
+        (
+          PATH="$msvc:/cygdrive/c/Program Files/csvn/bin:/cygdrive/c/Program Files (x86)/WANdisco/Subversion/csvn/bin:/cygdrive/c/Program Files/7-zip:/cygdrive/c/Program Files (x86)/cmake/bin:$PATH:/cygdrive/c/Windows/System32"
+          # cmd.exe /c "cd $build && vcvars $vs $arch && cmakeBuild --rebuild --exiv2=$exiv2 $*"
+          for ARCH in x64 win32; do #always build x64 (used by test suite)
+          	for VS in 2005 2013; do #always build 2013 (used by test suite)
+              cmd.exe /c "cd $build && vcvars $VS $ARCH && cmakeBuild --rebuild --exiv2=$exiv2 $*"
+            done
+          done
+          result=$?
+          cp     $msvc/vcvars.bat $build/dist # required by test_daily.sh
+        )
+    ;;
+
+    mingw)
+        if [ ! -z "$RECURSIVE" ]; then
+            # we are already in MinGW/bash, so build
+            /usr/local/bin/cmake -DCMAKE_INSTALL_PREFIX=$dist -DEXIV2_ENABLE_NLS=OFF $exiv2
+        else
+            # recursively invoke MinGW/bash with appropriate tool chain
+        	export RECURSIVE=1
+            export CFLAGS=-m64
+            export CXXFLAGS=-m64
+            export LDFLAGS=-m64
+
+            export TMP=/tmp
+            export TEMP=$TMP
+            if [ "$x64" == true ]; then
+                /cygdrive/c/MinGW64/msys/1.0/bin/bash.exe -c "export PATH=/c/TDM-GCC-64/bin:/c/MinGW64/bin:/c/MinGW64/msys/1.0/bin:/c/MinGW64/msys/1.0/local/bin; $0"
+                result=$?
+            fi
+        fi
+    ;;
+
+    *)
+      pushd $build > /dev/null
+      (
+        # build 64 bit library
+        export CFLAGS=-m64
+        export CXXFLAGS=-m64
+        export LDFLAGS=-m64
+        # Always use /usr/local/bin/cmake
+        # I can guarantee it to be at least 3.4.1
+        # because I built it from source and installed it
+        /usr/local/bin/cmake -DCMAKE_INSTALL_PREFIX=$dist -DEXIV2_ENABLE_NLS=OFF $exiv2
+        make
+        /usr/local/bin/cmake --build . --target install
+      )
+      popd > /dev/null
+    ;;
+
 ) | tee "$build/dist/logs/build.log"
 
 ##
diff --git a/contrib/buildserver/jenkins_build.sh b/contrib/buildserver/jenkins_build.sh
index 16499e3..a8d20dd 100755
--- a/contrib/buildserver/jenkins_build.sh
+++ b/contrib/buildserver/jenkins_build.sh
@@ -11,7 +11,7 @@
 #    status    : filter last build with grep
 #
 ##
-source $(find . -name functions.so)
+source $(find . -name buildserver.library)
 
 base=$(basename $0)
 if [ -z "$base" ]; then base=jenkins_build ; fi
diff --git a/contrib/buildserver/test_daily.sh b/contrib/buildserver/test_daily.sh
index fdb9092..f665b43 100755
--- a/contrib/buildserver/test_daily.sh
+++ b/contrib/buildserver/test_daily.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source $(find . -name functions.so)
+source $(find . -name buildserver.library)
 
 ##
 # figure out today's build

-- 
exiv2 packaging