third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#1041 We often build Win32 although we request x64. I suspect a rogue copy of vcvars.bat on the builder's path.

Browse Source
This commit is contained in:
Robin Mills 2015-12-10 04:00:06 +00:00
parent bb032fb6c7
commit db16f80d9f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/cmake/msvc/cmakeDefaults.cmd
View File

@ -16,7 +16,7 @@ if NOT DEFINED _MODE_ SET _MODE_=dll
if NOT DEFINED COPYCMD SET COPYCMD=/Y
rem ---------- check that EXIV2 exists
call:echo checking that %_EXIV2_% exists
echo checking that %_EXIV2_% exists
if NOT EXIST %_EXIV2_% (
echo "_EXIV2_ = %_EXIV2_% does not exist ***" >&2
exit /b 1

7
jenkins_daily.sh
View File

@ -23,6 +23,7 @@ exiv2=$(cygpath -aw .)
build=$(cygpath -aw .\\build)
dist=$(cygpath -au .\\build\\dist\\$vs\\$arch\\$mode\\$config\\bin)
di32=$(cygpath -au .\\build\\dist\\$vs\\Win32\\$mode\\$config\\bin)
di64=$(cygpath -au .\\build\\dist\\$vs\\x64\\$mode\\$config\\bin)
msvc=$(cygpath -aw ./contrib/cmake/msvc)
##
@ -42,10 +43,14 @@ mkdir -p $dist
##
# test the build
# For an unknown reason, we sometimes build the wrong architecture
export EXIV2_BINDIR=$dist
if [ ! -e $dist/exiv2.exe -a -e $di32/exiv2.exe ]; then
if [ "$arch" == "x64" -a !-e $dist/exiv2.exe -a -e $di32/exiv2.exe ]; then
export EXIV2_BINDIR=$di32
fi
if [ "$arch" == "Win32" -a !-e $dist/exiv2.exe -a -e $di64/exiv2.exe ]; then
export EXIV2_BINDIR=$di64
fi
pushd test
for test in addmoddel.sh \
bugfixes-test.sh \