SVN commit 1216972 by mutz: 12-build-kdelibs.sh: build tests, too M +7 -2 02-update-kde-svn.sh M +1 -0 12-build-kdelibs.sh M +10 -0 config --- branches/work/gpg4win/scripts/debian-xcompile/02-update-kde-svn.sh #1216971:1216972 @@ -195,9 +195,14 @@ else SVN_ARGS=-r$L10N_KDE4_REVISION fi - run "Checking out l10n-kde4" svn co $SVN_ARGS -N "$L10N_KDE4_SVN_URL" l10n-kde4 + if [ -d l10n-kde4 ] ; then + OP=up + else + OP=co + fi + run "Checking out l10n-kde4" svn $OP $SVN_ARGS $SVN_NON_RECURSIVE "$L10N_KDE4_SVN_URL" l10n-kde4 cd_or_die l10n-kde4 - run "Checking out l10n-kde4 subdirs, pt.1" svn up $SVN_ARGS -N "${L10N_KDE4_SVN_URL_SUB_N[@]}" + run "Checking out l10n-kde4 subdirs, pt.1" svn up $SVN_ARGS $SVN_NON_RECURSIVE "${L10N_KDE4_SVN_URL_SUB_N[@]}" run "Checking out l10n-kde4 subdirs, pt.2" svn up $SVN_ARGS "${L10N_KDE4_SVN_URL_SUB[@]}" [ -d scripts -a -x scripts/autogen.sh ] || die "Cannot find directory l10n-kde4/scripts/autogen.sh after unpacking" run "Creating subdir build files" ./scripts/autogen.sh --- branches/work/gpg4win/scripts/debian-xcompile/12-build-kdelibs.sh #1216971:1216972 @@ -118,6 +118,7 @@ -DCMAKE_INSTALL_PREFIX="$INST" -C "$TOOLSDIR/mingw32-kdelibs.cmake" \ -DONLY_KLEO=ON -DKDEWIN_DIR="$STAGE1_BUILD/src/playground/install" \ -DBoost_INCLUDE_DIR="$STAGE1_BUILD/src/playground/install/include/boost-1_34" \ + -DKDE4_BUILD_TESTS=ON \ -DKDE4_ENABLE_HTMLHANDBOOK=ON "$SRCDIR/kdepimlibs" run "Building kdepimlibs (win32)" make --- branches/work/gpg4win/scripts/debian-xcompile/config #1216971:1216972 @@ -68,8 +68,13 @@ fi # icecream stuff +if $etch ; then readonly ICECREAM_WEB=ftp://ftp.kdab.net/pub/gpg4win/devtools/debian-etch-mingw32-icecream-env.tar.gz readonly ICECREAM_LOCAL=/opt/debian-etch-mingw32-icecream-env.tar.gz +else + readonly ICECREAM_WEB=ftp://ftp.kdab.net/pub/gpg4win/devtools/debian-lenny-mingw32-icecream-env.tar.gz + readonly ICECREAM_LOCAL=/opt/debian-lenny-mingw32-icecream-env.tar.gz +fi # gpg4win svn # https fails with --non-interactive b/c of the self-signed certificate, so use http: @@ -166,3 +171,8 @@ readonly L10N_KDE4_SRC_URL=ftp://ftp.kdab.net/pub/gpg4win/l10n-kde4-20080828-src.zip readonly L10N_KDE4_BIN_URL=ftp://ftp.kdab.net/pub/gpg4win/l10n-kde4-20080828-src.zip +if $etch ; then + readonly SVN_NON_RECURSIVE=-N +else + readonly SVN_NON_RECURSIVE="--depth=files" +fi