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

List:       kde-commits
Subject:    branches/work/gpg4win/scripts/debian-xcompile
From:       Marc Mutz <mutz () kde ! org>
Date:       2010-02-11 13:50:59
Message-ID: 1265896259.426288.5864.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1088743 by mutz:

Merge etch-xcompile changes

 M  +4 -0      00-root-setup.sh  
 M  +1 -1      10-build-installer-stage1.sh  
 M  +1 -1      30-build-installer-stage2.sh  
 M  +34 -4     config  


--- branches/work/gpg4win/scripts/debian-xcompile/00-root-setup.sh #1088742:1088743
@@ -11,6 +11,10 @@
 
 load config "configuration file"
 
+# my apt-get doesn't work with these...
+unset http_proxy
+unset ftp_proxy
+
 if [ -n "$APT_RELEASE" ]; then
     if ! grep -q $APT_RELEASE $APT_SOURCES_LIST ; then
 	ask "Required $APT_RELEASE is not in $APT_SOURCES_LIST. Add?" \
--- branches/work/gpg4win/scripts/debian-xcompile/10-build-installer-stage1.sh \
#1088742:1088743 @@ -11,7 +11,7 @@
 
 [ -d "$GPG4WIN_SRC" ] || die "Did not find gpg4win source code in $GPG4WIN_SRC"
 cd_or_die "$GPG4WIN_SRC"
-run "Running autogen.sh" ./autogen.sh
+run "Running autogen.sh --force" ./autogen.sh --force
 [ -d "$STAGE1_BUILD" ] || mkdir -p -- "$STAGE1_BUILD" || die "Failed to make \
directory $STAGE1_BUILD"  rm -rf "$STAGE1_BUILD" || die "Failed to remove stale build \
dir $STAGE1_BUILD"  
--- branches/work/gpg4win/scripts/debian-xcompile/30-build-installer-stage2.sh \
#1088742:1088743 @@ -11,7 +11,7 @@
 
 [ -d "$GPG4WIN_SRC" ] || die "Did not find gpg4win source code in $GPG4WIN_SRC"
 cd_or_die "$GPG4WIN_SRC"
-run "Running autogen.sh" ./autogen.sh
+run "Running autogen.sh --force" ./autogen.sh --force
 [ -d "$STAGE2_BUILD" ] || mkdir -p -- "$STAGE2_BUILD" || die "Failed to make \
directory $STAGE2_BUILD"  rm -rf "$STAGE2_BUILD" || die "Failed to remove stale build \
dir $STAGE2_BUILD"  
--- branches/work/gpg4win/scripts/debian-xcompile/config #1088742:1088743
@@ -20,10 +20,37 @@
 
 readonly TODAY=$(date +%Y%m%d)
 
+readonly debian_version="$(cat /etc/debian_version)" || die "Cannot read \
/etc/debian_version" +case "$debian_version" in
+    4.0) # etch
+    msg Found Etch
+    readonly etch=true
+    readonly lenny=false
+    readonly squeeze=false
+    ;;
+    5.0) # lenny
+    msg Found Lenny
+    readonly etch=false
+    readonly lenny=true
+    readonly squeeze=false
+    ;;
+    6.0) # squeeze
+    msg "Found Squeeze - Warning: Unsupported platform"
+    readonly etch=false
+    readonly lenny=false
+    readonly squeeze=true
+    ;;
+    *)
+    die "Unknown Debian version $debian_version"
+    ;;
+esac
+
 # apt-get stuff
 readonly APT_SOURCES_LIST=/etc/apt/sources.list
 readonly APT_PREFERENCES=/etc/apt/preferences
-readonly APT_RELEASE=
+if $etch ; then
+    readonly APT_RELEASE=etch-backports
+fi
 
 # packages needed
 readonly INSTALLER_TOOLCHAIN="mingw32 nsis stow zip unzip bzip2 texinfo imagemagick \
libglib2.0-dev tetex-bin tetex-extra gs-common hyperlatex latex-xcolor subversion \
icecc wget libjpeg62-dev libpng12-dev zlib1g-dev libdbus-1-dev libdbus-glib-1-dev \
libssl-dev libx11-dev libxext-dev autoconf automake gettext shared-mime-info \
libsm-dev libxml2-dev libxml2-utils libxslt1-dev libbz2-dev" @@ -33,9 +60,12 @@
 # invocation.  See the following debian bugreports for details:
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=471975
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=481391
-readonly INSTALLER_TOOLCHAIN2="cmake"
-# backported packages to be installed from $APT_RELEASE
-readonly BACKPORTED_TOOLCHAIN=""
+if $etch ; then
+    # backported packages to be installed from $APT_RELEASE
+    readonly BACKPORTED_TOOLCHAIN="cmake"
+else
+    readonly INSTALLER_TOOLCHAIN2="cmake"
+fi
 
 # icecream stuff
 readonly ICECREAM_WEB=ftp://ftp.kdab.net/pub/gpg4win/devtools/debian-etch-mingw32-icecream-env.tar.gz



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