[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=0f5de51

The following commit has been merged in the master branch:
commit 0f5de5161781aa26a44a4418a2788346cccede94
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Dec 14 16:56:34 2015 +0000

    #1109 and #1041 Fixes for msvc
---
 contrib/buildserver/dailyReadMe.txt                |  5 ++--
 {buildserver => contrib/buildserver}/test_daily.sh | 34 ++++++++++++----------
 jenkins_daily.sh                                   |  3 +-
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/contrib/buildserver/dailyReadMe.txt b/contrib/buildserver/dailyReadMe.txt
index a162db4..cda1da9 100644
--- a/contrib/buildserver/dailyReadMe.txt
+++ b/contrib/buildserver/dailyReadMe.txt
@@ -100,8 +100,9 @@ dist3\x64\dll\Releasein\exiv2.exe               exiv2.exe and sample appli
                          \lib\exiv2.lib               libraries for exiv2/expat/zlib
                          \include\exiv2/              include files
                          \share\                      man pages
-samples\exifprint.cpp                                 sample code
-logs\                                                 log files
+dist\samples\exifprint.cpp                            sample code
+dist\logs\                                            log files
+distcvars.bat                                       script used by test_daily.sh
 
 To run exiv2.exe:
 c:	emp> cd dist
diff --git a/buildserver/test_daily.sh b/contrib/buildserver/test_daily.sh
similarity index 75%
rename from buildserver/test_daily.sh
rename to contrib/buildserver/test_daily.sh
index b7604f3..1ea012c 100755
--- a/buildserver/test_daily.sh
+++ b/contrib/buildserver/test_daily.sh
@@ -28,6 +28,7 @@ fi
 
 ##
 # figure out today's build
+# http://exiv2.dyndns.org:8080/userContent/builds/Daily
 date=$(date '+%Y-%m-%d')
 build=$(curl --silent $JENKINS/$DAILY/                 \
        |xmllint --pretty 1 - | grep $PLATFORM          \
@@ -59,7 +60,7 @@ grep_args="-e libexiv2 -e ^date -e ^bits -e ^version -e ^time"
 case $PLATFORM in
     macosx)
         # test the delivered exiv2
-        DYLD_LIBRARY_PATH="$PWD/$PLATFORM/lib:$DYLD_LIBRARY_PATH"
+        export DYLD_LIBRARY_PATH="$PWD/$PLATFORM/lib:$DYLD_LIBRARY_PATH"
         $PLATFORM/bin/exiv2 -vV | grep $grep_args
 
         # compile, link and test the sample code
@@ -68,12 +69,12 @@ case $PLATFORM in
         ls -alt exifprint
         echo ''
 
-        exifprint --version     | grep $grep_args
+        ./exifprint --version     | grep $grep_args
     ;;
     
     linux)
         # test the delivered exiv2
-        LD_LIBRARY_PATH="$PWD/$PLATFORM/lib:$LD_LIBRARY_PATH"
+        export LD_LIBRARY_PATH="$PWD/$PLATFORM/lib:$LD_LIBRARY_PATH"
         $PLATFORM/bin/exiv2 -vV | grep $grep_args
 
         # compile, link and test the sample code
@@ -82,7 +83,7 @@ case $PLATFORM in
         ls -alt exifprint
         echo ''
 
-        exifprint --version     | grep $grep_args
+        ./exifprint --version     | grep $grep_args
     ;;    
     
     cygwin)
@@ -92,24 +93,27 @@ case $PLATFORM in
 
         # compile, link and test the sample code
         echo ''
-        # cmd /c "vcvars 2013 64 && cl something"
-        # ls -alt exifprint.exe
-        # echo ''
+        g++ -I$PLATFORM/include -L$PLATFORM/lib samples/exifprint.cpp -lexiv2 -o exifprint
+        ls  -alt exifprint.exe
+        echo ''
 
-        exifprint --version     | grep $grep_args
+        ./exifprint --version     | grep $grep_args
     ;;    
 
     msvc)
         # test the delivered exiv2
-        PATH="$PWD/$PLATFORM/bin:$PATH"
-        $PLATFORM/bin/exiv2 -vV | grep $grep_args
+        PATH="$PWD/2013/x64/dll/Release/bin:$PATH"
+        exiv2 -vV | grep $grep_args
 
         # compile, link and test the sample code
-        echo ''
-        # cp -R $PLATFORM/* /usr/local/
-        # g++ -I$PLATFORM/include -L$PLATFORM/lib samples/exifprint.cpp -lexiv2 -o exifprint
-        # ls -alt exifprint.exe
-        echo ''
+        (
+            export PATH="/cygdrive/c/Windows/System32:$PATH"
+            echo ''
+		    cmd /c 'vcvars.bat 2013 64 && cl /EHsc -I2013\x64\dll\Release\include /MD samples\exifprint.cpp /link 2013\x64\dll\Release\lib\exiv2.lib'
+            ls -alt exifprint.exe
+            echo ''
+        )
+        
         ./exifprint.exe --version     | grep $grep_args
     ;;
 
diff --git a/jenkins_daily.sh b/jenkins_daily.sh
index 5629061..f39755e 100755
--- a/jenkins_daily.sh
+++ b/jenkins_daily.sh
@@ -45,7 +45,7 @@ if [ "$PLATFORM" == "msvc" ]; then
      exe=.exe
      bin=''
 else
-    PATH="/usr/local/bin:$PATH"
+    PATH="/usr/local/bin:/bin:$PATH"
     exiv2=$PWD
     build=$PWD/build
     dist=$PWD/build/dist/$PLATFORM
@@ -74,6 +74,7 @@ echo "---- build = $build ------"
       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

-- 
exiv2 packaging