From 813d34a767c85c024d096a68112e0e52cce3431c Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Fri, 7 Nov 2014 00:26:02 +0100 Subject: [PATCH] Requiring Mono 3.2.8+ --- BuildFiles/Packaging/{release.sh => do-release} | 0 BuildFiles/Packaging/{sprint.sh => do-sprint} | 0 BuildFiles/Packaging/repackage-one | 5 ++++- .../Packaging/templates/control-backend-release.template | 2 +- .../Packaging/templates/control-backend-sprint.template | 2 +- .../Packaging/templates/control-frontend-release.template | 2 +- .../Packaging/templates/control-frontend-sprint.template | 2 +- 7 files changed, 8 insertions(+), 5 deletions(-) rename BuildFiles/Packaging/{release.sh => do-release} (100%) rename BuildFiles/Packaging/{sprint.sh => do-sprint} (100%) diff --git a/BuildFiles/Packaging/release.sh b/BuildFiles/Packaging/do-release similarity index 100% rename from BuildFiles/Packaging/release.sh rename to BuildFiles/Packaging/do-release diff --git a/BuildFiles/Packaging/sprint.sh b/BuildFiles/Packaging/do-sprint similarity index 100% rename from BuildFiles/Packaging/sprint.sh rename to BuildFiles/Packaging/do-sprint diff --git a/BuildFiles/Packaging/repackage-one b/BuildFiles/Packaging/repackage-one index 64b408f0..67c1cb80 100755 --- a/BuildFiles/Packaging/repackage-one +++ b/BuildFiles/Packaging/repackage-one @@ -7,14 +7,17 @@ DEPLOYDIR=usr/share/swarmops if [ "$2" == "release" ]; then CONTROLSUFFIX=-release DROPFOLDER=release + BUILDNUMLEN=6 echo "Packaging FINISHED RELEASE for super-stable deployments." elif [ "$2" == "sprint" ]; then CONTROLSUFFIX=-sprint DROPFOLDER=sprint + BUILDNUMLEN=6 echo "Packaging END-OF-SPRINT for normal deployments." else CONTROLSUFFIX=-internal DROPFOLDER=internal + BUILDNUMLEN=8 if [ "$1" == "extscripts" ]; then echo "Error: Cannot package external scripts for internal build. Use 'stable'." exit 1; @@ -62,7 +65,7 @@ cp ../lastbuild/swarmops/$DROPFOLDER/CommitIdentity.txt ./CommitIdentity.txt BUILDID=$(cat BuildIdentity.txt | tr -d ' \r') COMMITID=$(cat CommitIdentity.txt | tr -d ' \r') -BUILDID=$(echo $BUILDID | cut -c 1-8)$(echo $COMMITID | cut -c 1-7) +BUILDID=$(echo $BUILDID | cut -c 1-$BUILDNUMLEN)$(echo $COMMITID | cut -c 1-7) echo "" echo "Building package $PACKAGENAME $BUILDID." diff --git a/BuildFiles/Packaging/templates/control-backend-release.template b/BuildFiles/Packaging/templates/control-backend-release.template index 7e9f416f..03e7e9e8 100644 --- a/BuildFiles/Packaging/templates/control-backend-release.template +++ b/BuildFiles/Packaging/templates/control-backend-release.template @@ -2,7 +2,7 @@ Package: swarmops-backend-stable Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) -Depends: swarmops-common-stable,mono-runtime,libmono-corlib4.0-cil,libmono-posix4.0-cil,libmono-system-data4.0-cil,libmono-system-web-http4.0-cil,libmono-system-web-services4.0-cil +Depends: swarmops-common-stable,mono-runtime (>= 3.2.8),libmono-corlib4.0-cil (>= 3.2.8),libmono-posix4.0-cil (>= 3.2.8),libmono-system-data4.0-cil (>= 3.2.8),libmono-system-web-http4.0-cil (>= 3.2.8),libmono-system-web-services4.0-cil (>= 3.2.8) Conflicts: swarmops-backend-internal,swarmops-backend Homepage: http://swarmops.com/ Description: Swarmops Backend (Stable) diff --git a/BuildFiles/Packaging/templates/control-backend-sprint.template b/BuildFiles/Packaging/templates/control-backend-sprint.template index c75779ae..63b23c5a 100644 --- a/BuildFiles/Packaging/templates/control-backend-sprint.template +++ b/BuildFiles/Packaging/templates/control-backend-sprint.template @@ -2,7 +2,7 @@ Package: swarmops-backend Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) -Depends: swarmops-common,mono-runtime,libmono-corlib4.0-cil,libmono-posix4.0-cil,libmono-system-data4.0-cil,libmono-system-web-http4.0-cil,libmono-system-web-services4.0-cil +Depends: swarmops-common,mono-runtime (>= 3.2.8),libmono-corlib4.0-cil (>= 3.2.8),libmono-posix4.0-cil (>= 3.2.8),libmono-system-data4.0-cil (>= 3.2.8),libmono-system-web-http4.0-cil (>= 3.2.8),libmono-system-web-services4.0-cil (>= 3.2.8) Conflicts: swarmops-backend-internal,swarmops-backend-stable Homepage: http://swarmops.com/ Description: Swarmops Backend diff --git a/BuildFiles/Packaging/templates/control-frontend-release.template b/BuildFiles/Packaging/templates/control-frontend-release.template index ed00c2dc..c61ee985 100644 --- a/BuildFiles/Packaging/templates/control-frontend-release.template +++ b/BuildFiles/Packaging/templates/control-frontend-release.template @@ -2,7 +2,7 @@ Package: swarmops-frontend-stable Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) -Depends: swarmops-common-stable, apache2 (>= 2.2.20), mono-apache-server4 (>= 2.10-1), libapache2-mod-mono (>= 2.10-1), libgdiplus (>= 2.10-3), imagemagick, ghostscript +Depends: swarmops-common-stable, apache2 (>= 2.2.20), mono-apache-server4 (>= 3.2.8), libapache2-mod-mono (>= 3.2.8), libgdiplus (>= 3.2.8), imagemagick, ghostscript Conflicts: swarmops-frontend-internal,swarmops-frontend Homepage: http://swarmops.com/ Description: Swarmops Frontend (Stable) diff --git a/BuildFiles/Packaging/templates/control-frontend-sprint.template b/BuildFiles/Packaging/templates/control-frontend-sprint.template index f367bde0..8f6b4ee6 100644 --- a/BuildFiles/Packaging/templates/control-frontend-sprint.template +++ b/BuildFiles/Packaging/templates/control-frontend-sprint.template @@ -2,7 +2,7 @@ Package: swarmops-frontend Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) -Depends: swarmops-common, apache2 (>= 2.2.20), mono-apache-server4 (>= 2.10-1), libapache2-mod-mono (>= 2.10-1), libgdiplus (>= 2.10-3), imagemagick, ghostscript +Depends: swarmops-common, apache2 (>= 2.2.20), mono-apache-server4 (>= 3.2.8), libapache2-mod-mono (>= 3.2.8), libgdiplus (>= 3.2.8), imagemagick, ghostscript Conflicts: swarmops-frontend-internal,swarmops-frontend-stable Homepage: http://swarmops.com/ Description: Swarmops Frontend