'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:       2013-04-22 14:37:02
Message-ID: 20130422143702.9B655AC87A () svn ! kde ! org
[Download RAW message or body]

SVN commit 1350659 by aheinecke:

Update more locations to KDE/4.10


 M  +4 -4      02-update-gpg4win.sh  
 M  +13 -13    02-update-kde.sh  
 M  +13 -12    config  


--- branches/work/gpg4win/scripts/debian-xcompile/02-update-gpg4win.sh \
#1350658:1350659 @@ -11,16 +11,16 @@
 
 cs
 
-check_git gpg4win-src "$GPG4WIN_GIT"
+check_git gpg4win-src "$GPG4WIN_GIT" KDE/4.10-update
 
 [ -d gpg4win-src ]          || die "Expected checkout directory (gpg4win-src) does \
not exist"  [ -d gpg4win-src/packages ] || die "Expected packages directory \
(gpg4win-src/packages) does not exist"  cd gpg4win-src/packages     || die "Cannot \
change into gpg4win-src/packages"  [ -f download.sh ]          || die "Expected \
download script (gpg4win-src/packages/download.sh) does not exist"  
-if $USE_SQUID ; then
-    run "Removing all downloaded packages (you're using squid)" rm -rf *.zip \
                *.tar.gz *.tar.bz2 
-fi
+#if $USE_SQUID ; then
+#    run "Removing all downloaded packages (you're using squid)" rm -rf *.zip \
*.tar.gz *.tar.bz2  +#fi
 
 # massage packages.current so download.sh skips the kdelibs stuff (which we're going \
to create in the first place)  [ -f packages.current.saved ] && die "A temporary file \
(gpg4win-src/packages/packages.current.saved) is left from on unfinished job. Please \
                remove this first"
--- branches/work/gpg4win/scripts/debian-xcompile/02-update-kde.sh #1350658:1350659
@@ -74,11 +74,11 @@
 #
 
 if $KDELIBS_CROSSCOMPILE ; then
-    if $KDELIBS_USE_SVN ; then
+    if $KDELIBS_USE_GIT ; then
         if [ -z $KDELIBS_REVISION ] ; then
-            run "Checking out kdelibs" svn co "$KDELIBS_SVN_URL" kdelibs
+            check_git kdelibs "$KDELIBS_GIT_URL" "$KDELIBS_GIT_BRANCH"
         else
-            run "Checking out kdelibs" svn co "$KDELIBS_SVN_URL" -r$KDELIBS_REVISION \
kdelibs +            cd kdepimlibs && git checkout $KDELIBS_REVISION && cd ..
         fi
     else
         run "Downloading kdelibs source" wget -N "$KDELIBS_SRC_URL"
@@ -103,7 +103,7 @@
 #
 
 if $KDEPIMLIBS_CROSSCOMPILE ; then
-    if $KDEPIMLIBS_USE_SVN ; then
+    if $KDEPIMLIBS_USE_GIT ; then
         if [ -z $KDEPIMLIBS_REVISION ] ; then
             check_git kdepimlibs "$KDEPIMLIBS_GIT_URL" "$KDEPIMLIBS_GIT_BRANCH"
         else
@@ -128,18 +128,18 @@
 [ -d kdepimlibs ] || die "Cannot find directory kdepimlibs after unpacking"
 
 #
-# kdebase-runtime
+# kde-runtime
 #
 
-if $KDEBASE_RUNTIME_CROSSCOMPILE ; then
-    if $KDEBASE_RUNTIME_USE_SVN ; then
-        if [ -z $KDEBASE_RUNTIME_REVISION ] ; then
-            run "Checking out kdebase-runtime" svn co "$KDEBASE_RUNTIME_SVN_URL" \
kdebase-runtime +if $KDE_RUNTIME_CROSSCOMPILE ; then
+    if $KDE_RUNTIME_USE_SVN ; then
+        if [ -z $KDE_RUNTIME_REVISION ] ; then
+            check_git kde-runtime "$KDE_RUNTIME_GIT_URL" "$KDE_RUNTIME_GIT_BRANCH"
         else
-            run "Checking out kdebase-runtime" svn co "$KDEBASE_RUNTIME_SVN_URL" \
-r$KDEBASE_RUNTIME_REVISION kdebase-runtime +            cd kde-runtime && git \
checkout $KDEPIMLIBS_REVISION && cd ..  fi
     else
-        run "Downloading kdebase-runtime source" wget -N "$KDEBASE_RUNTIME_SRC_URL"
+        run "Downloading kdebase-runtime source" wget -N "$KDE_RUNTIME_SRC_URL"
         rm -rf kdebase-runtime >/dev/null 2>&1
         run "Extracing" extract kdebase-runtime*
         for i in $(ls -d1 kdebase-runtime*|tac) ; do
@@ -151,10 +151,10 @@
         rm -rf kdebase-runtime?* >/dev/null 2>&1
     fi
 else
-    die "Sorry, binary kdebase-runtime package download is not yet implemented"
+    die "Sorry, binary kde-runtime package download is not yet implemented"
 fi
 
-[ -d kdebase-runtime ] || die "Cannot find directory kdebase-runtime after \
unpacking" +[ -d kde-runtime ] || die "Cannot find directory kdebase-runtime after \
unpacking"  
 #
 # kdepim
--- branches/work/gpg4win/scripts/debian-xcompile/config #1350658:1350659
@@ -32,7 +32,6 @@
 readonly debian_version="$(cat /etc/debian_version)" || die "Cannot read \
/etc/debian_version"  case "$debian_version" in
     7.0*) # Wheezy
-    msg Found Wheezy
     ;;
     *)
     die "Found unsupported Debian version $debian_version"
@@ -113,9 +112,10 @@
 #readonly KDESUPPORT_DEV_URL=ftp://ftp.kdab.net/pub/gpg4win/kdesupport-20080828-dev.zip
  
 readonly KDELIBS_CROSSCOMPILE=true
-readonly KDELIBS_USE_SVN=true
+readonly KDELIBS_USE_GIT=true
 readonly KDELIBS_REVISION=
-readonly KDELIBS_SVN_URL=$KDESVN/branches/kdepim/enterprise4/kdelibs-4.1-branch
+readonly KDELIBS_GIT_URL=$KDEGIT:kdelibs
+readonly KDELIBS_GIT_BRANCH=KDE/4.10
 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
 
@@ -123,29 +123,30 @@
 readonly KDEPIMLIBS_USE_GIT=true
 readonly KDEPIMLIBS_REVISION=
 readonly KDEPIMLIBS_GIT_URL=$KDEGIT:kdepimlibs
-readonly KDEPIMLIBS_GIT_BRANCH=enterprise/e4
+readonly KDEPIMLIBS_GIT_BRANCH=KDE/4.10
 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/gpg4win/kdebase-runtime-20080828-src.zip
                
-readonly KDEBASE_RUNTIME_BIN_URL=ftp://ftp.kdab.net/gpg4win/kdebase-runtime-20080828-src.zip
 +readonly KDE_RUNTIME_CROSSCOMPILE=true
+readonly KDE_RUNTIME_USE_GIT=true
+readonly KDE_RUNTIME_REVISION=
+readonly KDE_RUNTIME_GIT_URL=$KDEGIT:kde-runtime
+readonly KDE_RUNTIME_GIT_BRANCH=KDE/4.10
+readonly KDE_RUNTIME_SRC_URL=ftp://ftp.kdab.net/gpg4win/kdebase-runtime-20080828-src.zip
 +readonly KDE_RUNTIME_BIN_URL=ftp://ftp.kdab.net/gpg4win/kdebase-runtime-20080828-src.zip
  
 readonly KDEPIM_CROSSCOMPILE=true
 readonly KDEPIM_USE_GIT=true
 readonly KDEPIM_REVISION=
 readonly KDEPIM_GIT_URL=$KDEGIT:kdepim
-readonly KDEPIM_GIT_BRANCH=enterprise/e4
+readonly KDEPIM_GIT_BRANCH=KDE/4.10
 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
 readonly L10N_KDE4_REVISION=
-readonly L10N_KDE4_SVN_URL=$KDESVN/branches/kdepim/enterprise4/l10n-kde4
+readonly L10N_KDE4_SVN_URL=$KDESVN/trunk/l10n-kde4
 L10N_KDE4_SVN_URL_SUB_N=( de{,/messages,/docs} templates{,/messages} )
 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} )


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