[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:06 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=078d983
The following commit has been merged in the master branch:
commit 078d983a06df735d88794df558386a6a1263da50
Author: Robin Mills <robin at clanmills.com>
Date: Sat Dec 19 21:24:03 2015 +0000
#1109 and #1041. Factored out common code into functions.so Documentation update.
---
contrib/buildserver/ReadMe.txt | 63 +++++++++++++++++++++
contrib/buildserver/cmake_daily.sh | 28 ++--------
contrib/buildserver/functions.so | 47 ++++++++++++++++
contrib/buildserver/jenkins_build.sh | 104 +++--------------------------------
contrib/buildserver/test_daily.sh | 36 ++----------
5 files changed, 129 insertions(+), 149 deletions(-)
diff --git a/contrib/buildserver/ReadMe.txt b/contrib/buildserver/ReadMe.txt
index 8fd3801..6f3f9a5 100644
--- a/contrib/buildserver/ReadMe.txt
+++ b/contrib/buildserver/ReadMe.txt
@@ -6,6 +6,7 @@ User Documentation and Scripts
-rw-r--r--@ 1 rmills staff 63B 15 Dec 22:26 ReadMe.txt <---- This file
-rwxr-xr-x@ 1 rmills staff 440B 15 Dec 23:07 cmakeDailyAll.sh* <---- run cmake_daily.sh on all platforms
-rwxr-xr-x@ 1 rmills staff 424B 14 Dec 23:12 testDailyAll.sh* <---- run test_daily.sh on all platform
+-rw-r--r--@ 1 rmills staff 655B 19 Dec 21:06 functions.so <---- library for the scripts
Documentation and Scripts used by Jenkins
-rwxr-xr-x+ 1 rmills staff 11K 15 Dec 22:17 jenkins_build.sh* <---- Primary build script (called by Jenkins)
@@ -154,6 +155,68 @@ body {
z-index : -1;
}
+Notes concerning MinGW
+----------------------
+
+#########################################
+## #!/bin/bash
+## # mingw32.sh
+## # invoke 32bit MinGW bash
+## #
+## export "PATH=c:\MinGW\bin;c:\MinGW\msys\1.0\bin;C:\MinGW\msys\1.0\local\bin;"
+## /cygdrive/c/MinGW/msys/1.0/bin/bash.exe $*
+##
+## # That's all Folks
+## ##
+#########################################
+
+#########################################
+## : mingw32.bat
+## : invoke MinGW bash
+## :
+## setlocal
+## set "PATH=c:\MinGWin;c:\MinGW\msys.0in;C:\MinGW\msys.0\localin;"
+## set "PS1=\! ${PWD}> "
+## c:\MinGW\msys.0inash.exe %*%
+##
+## : That's all Folks
+#########################################
+
+#########################################
+## see http://clanmills.com/exiv2/mingw.shtml about 64bit build
+## Install a fresh (32 bit) mingw/msys into c:\MinGW64
+## install the 64 bit compiler from: http://tdm-gcc.tdragon.net
+## I used the "on-demand" installer and "Create" put the tools in c:\TDM-GCC-64. The main change is to add the 64 bit compilers to the path BEFORE the 32 bit compilers.
+## set PATH=c:\TDM-GCC-64in;c:\MinGWin;c:\MinGW\msys.0in;C:\MinGW\msys.0\localin;
+##
+## keep MinGW64 for 64 bit builds and /usr/lib has 64bit libraries
+## keep MinGW for 32 bit builds and /usr/lib has 32bit libraries
+##
+## install msys-coreutils, binutils, autotools
+##
+## For pkg-config see http://clanmills.com/exiv2/mingw.shtml
+#########################################
+
+#########################################
+## zlib and expat
+## mkdir -p ~/gnu/zlib ~/gnu/expat
+## get the tar.gz files and tar zxf them
+## build (see http://clanmills.com/exiv2/mingw.shtml about zlib)
+## DO THIS IN BOTH c:\MinGW and c:\MinGW64
+#########################################
+
+#########################################
+## The keith bug
+## rm -rf /c/MinGW/lib/libintl.la
+#########################################
+
+#########################################
+## to build dlfcn-win32
+## git clone https://github.com/dlfcn-win32/dlfcn-win32
+## cd dlfcn-win32 ; ./configure --prefix=/usr --enable-shared ; make ; make install
+#########################################
+
+
Robin Mills
robin at clanmills.com
diff --git a/contrib/buildserver/cmake_daily.sh b/contrib/buildserver/cmake_daily.sh
index d546cb2..4a49dca 100755
--- a/contrib/buildserver/cmake_daily.sh
+++ b/contrib/buildserver/cmake_daily.sh
@@ -2,6 +2,7 @@
##
# jenkins_daily.sh
+##
##
# configure the build (only used for msvc builds)
@@ -11,29 +12,7 @@ config=Release
vs=2013
result=0
-
-##
-# which PLATFORM
-# JOB_NAME is defined when script is called by Jenkins
-# example: JOB_NAME=trunk-cmake-daily/label=msvc
-# PLATFORM must be defined as msvc when called from ssh
-if [ ! -z "$JOB_NAME" ];then
- PLATFORM=$(echo $JOB_NAME | cut -d= -f 2)
-fi
-if [ "$PLATFORM" == "" ]; then
- export PLATFORM=''
- if [ `uname` == Darwin ]; then
- PLATFORM=macosx
- elif [ `uname -o` == Cygwin ]; then
- PLATFORM=cygwin
- # tweak path to ensure the correct version of perl and expr for autotools
- export "PATH=/bin:$PATH"
- elif [ `uname -o` == Msys ]; then
- PLATFORM=mingw
- else
- PLATFORM=linux
- fi
-fi
+source functions.so
##
# determine location of the build and source directories
@@ -82,7 +61,7 @@ echo "---- build = $build ------"
export CFLAGS=-m64
export CXXFLAGS=-m64
export LDFLAGS=-m64
- # Always use /usr/local/bin/cmake
+ # 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
@@ -92,6 +71,7 @@ echo "---- build = $build ------"
popd > /dev/null
fi
) | tee "$build/dist/logs/build.log"
+
##
# test the build
if [ -e $dist/$bin/exiv2$exe ]; then
diff --git a/contrib/buildserver/functions.so b/contrib/buildserver/functions.so
new file mode 100644
index 0000000..e06eae9
--- /dev/null
+++ b/contrib/buildserver/functions.so
@@ -0,0 +1,47 @@
+##
+# functions.so - source this from scripts
+##
+
+result=0
+if [ -z "$JENKINS" ]; then export JENKINS=http://exiv2.dyndns.org:8080; fi
+if [ -z "$DAILY" ]; then export DAILY=userContent/builds/Daily ; fi
+
+##
+# which PLATFORM
+# JOB_NAME is defined when script is called by Jenkins
+# example: JOB_NAME=trunk-cmake-daily/label=msvc
+# PLATFORM must be defined as msvc when called from ssh
+if [ ! -z "$JOB_NAME" ];then
+ PLATFORM=$(echo $JOB_NAME | cut -d= -f 2)
+fi
+if [ "$PLATFORM" == "" ]; then
+ export PLATFORM=''
+ if [ `uname` == Darwin ]; then
+ PLATFORM=macosx
+ elif [ `uname -o` == Cygwin ]; then
+ PLATFORM=cygwin
+ # tweak path to ensure the correct version of perl and expr for autotools
+ export "PATH=/bin:$PATH"
+ elif [ `uname -o` == Msys ]; then
+ PLATFORM=mingw
+ else
+ PLATFORM=linux
+ fi
+fi
+
+##
+# functions
+thepath () {
+ if [ -d $1 ]; then
+ ( cd $1;
+ pwd );
+ else
+ ( cd $(dirname $1);
+ echo $(pwd)/$(basename $1) );
+ fi
+}
+
+# That's all Folks!
+##
+
+
diff --git a/contrib/buildserver/jenkins_build.sh b/contrib/buildserver/jenkins_build.sh
index f18764d..f07f92a 100755
--- a/contrib/buildserver/jenkins_build.sh
+++ b/contrib/buildserver/jenkins_build.sh
@@ -10,36 +10,15 @@
# arguments:
# status : filter last build with grep
#
-# environment variables (all optional)
-# JENKINS : URL of jenkins server. Default http://exiv2.dyndns.org:8080
##
-if [ -z "$JENKINS" ]; then export JENKINS=http://exiv2.dyndns.org:8080; fi
-result=0
+source functions.so
+
base=$(basename $0)
if [ -z "$base" ]; then base=jenkins_build ; fi
tmp=/tmp/$base.tmp
start=$(date)
starts=$(date +%s)
-##
-# functions
-run_tests() {
- if [ "$result" == "0" ]; then
- if [ "$tests" == true ]; then
- make tests
- fi
- fi
-}
-
-thepath () {
- if [ -d $1 ]; then
- ( cd $1;
- pwd );
- else
- ( cd $(dirname $1);
- echo $(pwd)/$(basename $1) );
- fi
-}
##
# arg: status [grep-args]
@@ -64,20 +43,13 @@ if [ "$1" == "status" ]; then
exit $result
fi
-##
-# where are we?
-export PLATFORM=''
-if [ `uname` == Darwin ]; then
- PLATFORM=macosx
-elif [ `uname -o` == Cygwin ]; then
- PLATFORM=cygwin
- # tweak path to ensure the correct version of perl and expr for autotools
- export "PATH=/bin:$PATH"
-elif [ `uname -o` == Msys ]; then
- PLATFORM=mingw
-else
- PLATFORM=linux
-fi
+run_tests() {
+ if [ "$result" == "0" ]; then
+ if [ "$tests" == true ]; then
+ make tests
+ fi
+ fi
+}
##
# set up some defaults (used when running this script from the terminal)
@@ -222,64 +194,6 @@ case "$build" in
result=$?
fi
)
-#########################################
-## #!/bin/bash
-## # mingw32.sh
-## # invoke 32bit MinGW bash
-## #
-## export "PATH=c:\MinGW\bin;c:\MinGW\msys\1.0\bin;C:\MinGW\msys\1.0\local\bin;"
-## /cygdrive/c/MinGW/msys/1.0/bin/bash.exe $*
-##
-## # That's all Folks
-## ##
-#########################################
-
-#########################################
-## : mingw32.bat
-## : invoke MinGW bash
-## :
-## setlocal
-## set "PATH=c:\MinGWin;c:\MinGW\msys.0in;C:\MinGW\msys.0\localin;"
-## set "PS1=\! ${PWD}> "
-## c:\MinGW\msys.0inash.exe %*%
-##
-## : That's all Folks
-#########################################
-
-#########################################
-## see http://clanmills.com/exiv2/mingw.shtml about 64bit build
-## Install a fresh (32 bit) mingw/msys into c:\MinGW64
-## install the 64 bit compiler from: http://tdm-gcc.tdragon.net
-## I used the "on-demand" installer and "Create" put the tools in c:\TDM-GCC-64. The main change is to add the 64 bit compilers to the path BEFORE the 32 bit compilers.
-## set PATH=c:\TDM-GCC-64in;c:\MinGWin;c:\MinGW\msys.0in;C:\MinGW\msys.0\localin;
-##
-## keep MinGW64 for 64 bit builds and /usr/lib has 64bit libraries
-## keep MinGW for 32 bit builds and /usr/lib has 32bit libraries
-##
-## install msys-coreutils, binutils, autotools
-##
-## For pkg-config see http://clanmills.com/exiv2/mingw.shtml
-#########################################
-
-#########################################
-## zlib and expat
-## mkdir -p ~/gnu/zlib ~/gnu/expat
-## get the tar.gz files and tar zxf them
-## build (see http://clanmills.com/exiv2/mingw.shtml about zlib)
-## DO THIS IN BOTH c:\MinGW and c:\MinGW64
-#########################################
-
-#########################################
-## The keith bug
-## rm -rf /c/MinGW/lib/libintl.la
-#########################################
-
-#########################################
-## to build dlfcn-win32
-## git clone https://github.com/dlfcn-win32/dlfcn-win32
-## cd dlfcn-win32 ; ./configure --prefix=/usr --enable-shared ; make ; make install
-#########################################
-
fi
;;
diff --git a/contrib/buildserver/test_daily.sh b/contrib/buildserver/test_daily.sh
index 2ac755d..b2ff56f 100755
--- a/contrib/buildserver/test_daily.sh
+++ b/contrib/buildserver/test_daily.sh
@@ -1,30 +1,6 @@
#!/bin/bash
-if [ -z "$JENKINS" ]; then export JENKINS=http://exiv2.dyndns.org:8080 ; fi
-if [ -z "$DAILY" ]; then export DAILY=userContent/builds/Daily ; fi
-
-##
-# which PLATFORM
-# JOB_NAME is defined when script is called by Jenkins
-# example: JOB_NAME=trunk-cmake-daily/label=msvc
-# PLATFORM must be defined as msvc when called from ssh
-if [ ! -z "$JOB_NAME" ];then
- PLATFORM=$(echo $JOB_NAME | cut -d= -f 2)
-fi
-if [ "$PLATFORM" == "" ]; then
- export PLATFORM=''
- if [ `uname` == Darwin ]; then
- PLATFORM=macosx
- elif [ `uname -o` == Cygwin ]; then
- PLATFORM=cygwin
- # tweak path to ensure the correct version of perl and expr for autotools
- export "PATH=/bin:$PATH"
- elif [ `uname -o` == Msys ]; then
- PLATFORM=mingw
- else
- PLATFORM=linux
- fi
-fi
+source functions.source
##
# figure out today's build
@@ -71,7 +47,7 @@ case $PLATFORM in
./exifprint --version | grep $grep_args
;;
-
+
linux)
# test the delivered exiv2
export LD_LIBRARY_PATH="$PWD/$PLATFORM/lib:$LD_LIBRARY_PATH"
@@ -84,8 +60,8 @@ case $PLATFORM in
echo ''
./exifprint --version | grep $grep_args
- ;;
-
+ ;;
+
cygwin)
# test the delivered exiv2
PATH="$PWD/$PLATFORM/bin:$PATH"
@@ -98,7 +74,7 @@ case $PLATFORM in
echo ''
./exifprint --version | grep $grep_args
- ;;
+ ;;
msvc)
# test the delivered exiv2
@@ -113,7 +89,7 @@ case $PLATFORM in
ls -alt exifprint.exe
echo ''
)
-
+
./exifprint.exe --version | grep $grep_args
;;
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list