[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=fd22050

The following commit has been merged in the master branch:
commit fd220506b4aaded38e23cc5a289d0306e4697b45
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Jun 21 14:15:48 2015 +0000

    Updated build scripts.
---
 website/Checklist.txt             |  4 ++--
 website/bin/exiv2-buildrelease.sh | 45 +++++++++++++++++++++++++++------------
 website/bin/exiv2-buildwinexe.sh  | 29 +++++++++++++++++--------
 3 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/website/Checklist.txt b/website/Checklist.txt
index fc68fbc..528793e 100644
--- a/website/Checklist.txt
+++ b/website/Checklist.txt
@@ -37,8 +37,8 @@ MSVC
   Run tests with 10 executables
   Compile with 11  msvc2012
   Run tests with 11 executables
-Tag release
-Create packages
+Tag release (bin/exiv2-tagrelease.sh)
+Create packages (bin/exiv2-buildrelease.sh, bin/exiv2-buildwinexe.sh)
 Finalize webpages with package information (bin/release_info.sh)
 Publish webpages and packages locally
 Download and test packages
diff --git a/website/bin/exiv2-buildrelease.sh b/website/bin/exiv2-buildrelease.sh
index 5e9263c..c962628 100755
--- a/website/bin/exiv2-buildrelease.sh
+++ b/website/bin/exiv2-buildrelease.sh
@@ -20,58 +20,75 @@ if [ -e exiv2-$rel ] ; then
     echo File exiv2-$rel already exists, exiting...
     exit 1
 fi
-
+echo
+echo ==========================================================================
 echo Exporting sources, this may take a while...
-
+echo
 path=tags/$rel
 if [ $rel = trunk ] ; then
     path=trunk
 fi
 svn export svn://dev.exiv2.org/svn/$path
 mv $rel exiv2-$rel
-
-# Prepare the source code
+echo
+echo ==========================================================================
+echo Preparing the source code
+echo
 cd exiv2-$rel
 make config
 ./configure --disable-shared
-make -j3
+make -j4
 sudo make install
-make samples
+make -j4 samples
 make doc
 cd test
 make
 cd .. 
 rm -f ABOUT-NLS
 rm -f .gitignore
-rm -rf test/
 rm -rf kdevelop/
+sudo make uninstall
 make distclean
+rm -rf test/
 rm -f Makefile
 rm -f bootstrap.linux
 rm -f msvc64\runner.txt
 # 01-Dec-2013, ahu: Include CMake files in the distribution
 #find . -type f -name '*[Cc][Mm][Aa][Kk][Ee]*' | xargs rm -f
 rm -rf xmpsdk/src/.libs
-
-# Create source and doc packages
+rm -f config.log
+rm -rf website
+rm -f jenkins_build.bat jenkins_build.sh
+rm -f fixxml.sh
+echo
+echo ==========================================================================
+echo Creating source and doc packages
+echo
 cd ..
 tar zcvf exiv2-$rel-doc.tar.gz exiv2-$rel/doc/index.html exiv2-$rel/doc/html exiv2-$rel/doc/include
 rm -rf exiv2-$rel/doc/html
 tar zcvf exiv2-$rel.tar.gz exiv2-$rel
-
-# Test the tarball: unpack, build and run tests
+echo
+echo ==========================================================================
+echo Testing the tarball: unpack, build and run tests
+echo
 rm -rf exiv2-$rel
 tar zxvf exiv2-$rel.tar.gz
 cd exiv2-$rel
 ./configure
-make -j5
-make install
-make samples
+make -j4
+sudo make install
+make -j4 samples
 echo Exporting tests, this may take a while...
 svn export svn://dev.exiv2.org/svn/tags/$rel/test
 du -sk test/
 cd test
 make
 cd ../..
+echo
+echo ==========================================================================
+echo Error-summary
+echo
+grep 'Error ' exiv2-buildrelease-$rel.out | grep -v -e'BasicError ' -e'Error 1 (ignored)'
 
 ) 2>&1 | tee exiv2-buildrelease-$rel.out 2>&1
diff --git a/website/bin/exiv2-buildwinexe.sh b/website/bin/exiv2-buildwinexe.sh
index f2140d8..5efb9b2 100755
--- a/website/bin/exiv2-buildwinexe.sh
+++ b/website/bin/exiv2-buildwinexe.sh
@@ -17,17 +17,21 @@ if [ ! -e $dir ] ; then
     echo "Error: Directory $dir doesn't exist."
     exit 1
 fi
-
-# Configure and cross-compile
+echo
+echo ==========================================================================
+echo Configure and cross-compile
+echo
 cd $dir
-make maintainer-clean
+sudo make maintainer-clean
 make config
 ./configure --disable-shared --disable-visibility --target=i586-mingw32msvc --host=i586-mingw32msvc --build=i586-linux --disable-nls --with-zlib=$HOME/mingw --with-libiconv-prefix=$HOME/mingw --with-expat=$HOME/mingw
-make -j3
-
-# Prepare package
+make -j4
+echo
+echo ==========================================================================
+echo Prepare package
+echo
 cd src
-rel=`grep EXV_PACKAGE_VERSION ../msvc2012/include/exv_msvc.h | sed 's/.*"\(.*\)"/
/'`
+rel=`grep EXV_PACKAGE_VERSION ../include/exiv2/exv_msvc.h | sed 's/.*"\(.*\)"/
/'`
 tmpdir=exiv2-$rel-win
 rm -rf $tmpdir
 mkdir $tmpdir
@@ -40,11 +44,18 @@ cp $HOME/mingw/dll/libexpat.dll .
 todos cmd.txt cmdxmp.txt
 $HOME/src/exiv2/exiv2-htmlman.sh ../exiv2.1
 zip exiv2-$rel-win.zip exiv2.exe cmd.txt cmdxmp.txt exiv2-man.html libexpat.dll
-
-# Cleanup
+echo
+echo ==========================================================================
+echo Cleanup
+echo
 mv exiv2-$rel-win.zip ../../..
 cd ..
 rm -rf $tmpdir
 cd ../..
+echo
+echo ==========================================================================
+echo Error-summary
+echo
+grep 'Error ' exiv2-buildwinexe.out | grep -v -e'BasicError ' -e'Error 1 (ignored)'
 
 ) 2>&1 | tee exiv2-buildwinexe.out 2>&1

-- 
exiv2 packaging