[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:46:24 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=62199cd
The following commit has been merged in the master branch:
commit 62199cdae8cefd7ed4587b5e9896bbc963fd2272
Author: Robin Mills <robin at clanmills.com>
Date: Mon Mar 28 19:53:12 2016 +0000
#1041 Fix to msvc/test_daily.sh
---
contrib/buildserver/test_daily.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/contrib/buildserver/test_daily.sh b/contrib/buildserver/test_daily.sh
index de563a0..f90035c 100755
--- a/contrib/buildserver/test_daily.sh
+++ b/contrib/buildserver/test_daily.sh
@@ -84,14 +84,16 @@ case $PLATFORM in
for arch in x64 Win32; do
if [ -e "$PWD/$vs/$arch/dll/Release/bin/exiv2.exe" ] ; then (
# test the delivered exiv2
- PATH="$PWD/2013/x64/dll/Release/bin:$PATH"
+ PATH="$PWD/$vs/$arch/dll/Release/bin:$PATH"
exiv2 -vV | grep $grep_args
# compile, link and test the sample code
(
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'
+ a=''
+ if [ $arch == x64 ]; then a=64 ; fi
+ cmd /c 'vcvars.bat $vs $a && cl /EHsc -I$vs\$arch\dll\Release\include /MD samples\exifprint.cpp /link 2013\x64\dll\Release\lib\exiv2.lib'
ls -alt exifprint.exe
echo ''
)
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list