'branches/work/gpg4win/scripts/debian-xcompile'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/gpg4win/scripts/debian-xcompile
From:       Andre Heinecke <aheinecke () intevation ! de>
Date:       2012-12-06 8:22:20
Message-ID: 20121206082220.76029AC867 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1327555 by aheinecke:

Add a check_git function


 A             02-update-gpg4win.sh   02-update-gpg4win2-svn.sh#1327428
 D             02-update-gpg4win2-svn.sh  
 D             02-update-kde-svn.sh  
 A             02-update-kde.sh   02-update-kde-svn.sh#1327428
 M  +27 -24    config  
 M  +23 -0     functions  
 M  +3 -3      make-all.sh  


--- branches/work/gpg4win/scripts/debian-xcompile/config #1327554:1327555
@@ -35,7 +35,7 @@
     readonly squeeze=false
     ;;
     6.0*) # squeeze
-    msg "Found Squeeze - Warning: Unsupported platform"
+    msg Found Squeeze
     readonly etch=false
     readonly lenny=false
     readonly squeeze=true
@@ -76,10 +76,8 @@
     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:
-#readonly GPG4WIN_SVN=http://svn.wald.intevation.org/svn/gpg4win/trunk
-readonly GPG4WIN_SVN=svn+ssh://svn.wald.intevation.org/gpg4win/trunk
+# gpg4win git
+readonly GPG4WIN_GIT=git://git.gnupg.org/gpg4win.git
 
 readonly GPG4WIN_SRC="$SRCDIR/gpg4win-src"
 
@@ -104,9 +102,11 @@
 readonly QT_NATIVE_BUILD="$BUILDDIR/qt-native"
 
 # KDE stuff
-#readonly KDESVN=svn://anonsvn.kde.org:443/home/kde
-readonly KDESVN=svn+ssh://svn.kde.org/home/kde
+readonly KDESVN=svn://anonsvn.kde.org/home/kde
+#readonly KDESVN=svn+ssh://svn.kde.org/home/kde
 
+readonly KDEGIT=git@git.kde.org
+
 readonly KDE_BUILD_TYPE=debugfull # Debug Release
 
 readonly KDE_SRC_ZIP="zip -r"
@@ -121,10 +121,11 @@
 readonly KDEWIN32_USE_SVN=false
 readonly KDEWIN32_REVISION=
 readonly KDEWIN32_SVN_URL=$KDESVN/trunk/kdesupport/kdewin32
-readonly KDEWIN32_SRC_URL=ftp://ftp.kdab.net/pub/gpg4win/kdewin32-20080828-src.zip
-readonly KDEWIN32_BIN_URL=ftp://ftp.kdab.net/pub/gpg4win/kdewin32-20080828-src.zip
+readonly KDEWIN32_SRC_URL=ftp://ftp.kdab.net/gpg4win/kdewin32-20080828-src.zip
+readonly KDEWIN32_BIN_URL=ftp://ftp.kdab.net/gpg4win/kdewin32-20080828-src.zip
 
-readonly AUTOMOC_USE_SVN=true
+readonly AUTOMOC_USE_GIT=true
+readonly AUTOMOC_GIT_URL=$KDEGIT:automoc
 readonly AUTOMOC_REVISION=
 #readonly AUTOMOC_SRC_URL=ftp://ftp.kdab.net/pub/gpg4win/automoc-20080828-src.zip
 #readonly AUTOMOC_BIN_URL=ftp://ftp.kdab.net/pub/gpg4win/automoc-20080828-src.zip
@@ -136,29 +137,31 @@
 readonly KDELIBS_USE_SVN=true
 readonly KDELIBS_REVISION=
 readonly KDELIBS_SVN_URL=$KDESVN/branches/kdepim/enterprise4/kdelibs-4.1-branch
-readonly KDELIBS_SRC_URL=ftp://ftp.kdab.net/pub/gpg4win/kdelibs-20080828-src.zip
-readonly KDELIBS_BIN_URL=ftp://ftp.kdab.net/pub/gpg4win/kdelibs-20080828-src.zip
+readonly KDELIBS_SRC_URL=ftp://ftp.kdab.net/gpg4win/kdelibs-20080828-src.zip
+readonly KDELIBS_BIN_URL=ftp://ftp.kdab.net/gpg4win/kdelibs-20080828-src.zip
 
 readonly KDEPIMLIBS_CROSSCOMPILE=true
-readonly KDEPIMLIBS_USE_SVN=true
+readonly KDEPIMLIBS_USE_GIT=true
 readonly KDEPIMLIBS_REVISION=
-readonly KDEPIMLIBS_SVN_URL=$KDESVN/branches/kdepim/enterprise4/kdepimlibs
-readonly KDEPIMLIBS_SRC_URL=ftp://ftp.kdab.net/pub/gpg4win/kdepimlibs-20080828-src.zip
                
-readonly KDEPIMLIBS_BIN_URL=ftp://ftp.kdab.net/pub/gpg4win/kdepimlibs-20080828-src.zip
 +readonly KDEPIMLIBS_GIT_URL=$KDEGIT:kdepimlibs
+readonly KDEPIMLIBS_GIT_BRANCH=enterprise/e4
+readonly KDEPIMLIBS_SRC_URL=ftp://ftp.kdab.net/gpg4win/kdepimlibs-20080828-src.zip
+readonly KDEPIMLIBS_BIN_URL=ftp://ftp.kdab.net/gpg4win/kdepimlibs-20080828-src.zip
 
 readonly KDEBASE_RUNTIME_CROSSCOMPILE=true
 readonly KDEBASE_RUNTIME_USE_SVN=true
 readonly KDEBASE_RUNTIME_REVISION=
 readonly KDEBASE_RUNTIME_SVN_URL=$KDESVN/branches/kdepim/enterprise4/kdebase-4.1-branch/runtime
                
-readonly KDEBASE_RUNTIME_SRC_URL=ftp://ftp.kdab.net/pub/gpg4win/kdebase-runtime-20080828-src.zip
                
-readonly KDEBASE_RUNTIME_BIN_URL=ftp://ftp.kdab.net/pub/gpg4win/kdebase-runtime-20080828-src.zip
 +readonly KDEBASE_RUNTIME_SRC_URL=ftp://ftp.kdab.net/gpg4win/kdebase-runtime-20080828-src.zip
 +readonly KDEBASE_RUNTIME_BIN_URL=ftp://ftp.kdab.net/gpg4win/kdebase-runtime-20080828-src.zip
  
 readonly KDEPIM_CROSSCOMPILE=true
-readonly KDEPIM_USE_SVN=true
+readonly KDEPIM_USE_GIT=true
 readonly KDEPIM_REVISION=
-readonly KDEPIM_SVN_URL=$KDESVN/branches/kdepim/enterprise4/kdepim
-readonly KDEPIM_SRC_URL=ftp://ftp.kdab.net/pub/gpg4win/kdepim-20080828-src.zip
-readonly KDEPIM_BIN_URL=ftp://ftp.kdab.net/pub/gpg4win/kdepim-20080828-src.zip
+readonly KDEPIM_GIT_URL=$KDEGIT:kdepim
+readonly KDEPIM_GIT_BRANCH=enterprise/e4
+readonly KDEPIM_SRC_URL=ftp://ftp.kdab.net/gpg4win/kdepim-20080828-src.zip
+readonly KDEPIM_BIN_URL=ftp://ftp.kdab.net/gpg4win/kdepim-20080828-src.zip
 
 #readonly L10N_KDE4_CROSSCOMPILE=true
 readonly L10N_KDE4_USE_SVN=true
@@ -168,8 +171,8 @@
 readonly L10N_KDE4_SVN_URL_SUB_N
 L10N_KDE4_SVN_URL_SUB=( scripts \
{de,templates}/messages/{kde{pim{,libs},libs,base},qt} \
de/docs/kde{pim{,libs},libs,base} )  readonly L10N_KDE4_SVN_URL_SUB
-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
+readonly L10N_KDE4_SRC_URL=ftp://ftp.kdab.net/gpg4win/l10n-kde4-20080828-src.zip
+readonly L10N_KDE4_BIN_URL=ftp://ftp.kdab.net/gpg4win/l10n-kde4-20080828-src.zip
 
 if $etch ; then
     readonly SVN_NON_RECURSIVE=-N
--- branches/work/gpg4win/scripts/debian-xcompile/functions #1327554:1327555
@@ -95,6 +95,29 @@
     cat /proc/cpuinfo | grep -cE ^processor || die "Cannot determine number of CPUs \
in the system"  }
 
+function check_git() {
+    local DIR="$1" URL="$2" BRANCH="$3"
+
+    if [ -n $BRANCH ]; then
+        BRANCH=master
+    fi
+
+    if [ -d "$DIR" ] ; then
+
+        cd_or_die "$DIR"
+
+        # check that it's the same repository
+        # if not, try svn switch
+        run "Fetching GIT changes" git fetch "$URL"
+        run "Checking out $BRANCH" git checkout "$BRANCH"
+        run "Updating the working copy" git merge --ff-only origin/"$BRANCH"
+
+        cd - || die "Cannot cd back again"
+    else
+        run "Cloning Git repository" git clone "$URL" "$DIR"
+    fi
+}
+
 function check_svn() {
     local DIR="$1" URL="$2" 
 
--- branches/work/gpg4win/scripts/debian-xcompile/make-all.sh #1327554:1327555
@@ -5,11 +5,11 @@
 "$PREFIX"/01-user-setup.sh || exit 1
 
 # step 2: download and checkout stuff, and build what we already can:
-"$PREFIX"/02-update-kde-svn.sh &
+"$PREFIX"/02-update-kde.sh #&
 p_kde=$!
-"$PREFIX"/02-update-gpg4win2-svn.sh && "$PREFIX"/10-build-installer-stage1.sh &
+"$PREFIX"/02-update-gpg4win.sh && "$PREFIX"/10-build-installer-stage1.sh #&
 p_gpg=$!
-"$PREFIX"/02-update-qt.sh           && "$PREFIX"/10-build-qt.sh &
+"$PREFIX"/02-update-qt.sh           && "$PREFIX"/10-build-qt.sh #&
 p_qt=$!
 
 if wait $p_qt ; then


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic