diff --git a/BuildFiles/Packaging/do-release b/BuildFiles/Packaging/do-release index 63d96e8a..77a440f9 100755 --- a/BuildFiles/Packaging/do-release +++ b/BuildFiles/Packaging/do-release @@ -1,4 +1,4 @@ #!/bin/bash -./repackage-one release +scripts/repackage-build release diff --git a/BuildFiles/Packaging/do-sprint b/BuildFiles/Packaging/do-sprint index 5b0ee22a..0129d784 100755 --- a/BuildFiles/Packaging/do-sprint +++ b/BuildFiles/Packaging/do-sprint @@ -1,3 +1,3 @@ #!/bin/bash -./repackage-build sprint +scripts/repackage-build sprint diff --git a/BuildFiles/Packaging/scripts/repackage-build b/BuildFiles/Packaging/scripts/repackage-build index f1b01ef7..c5afc3a1 100755 --- a/BuildFiles/Packaging/scripts/repackage-build +++ b/BuildFiles/Packaging/scripts/repackage-build @@ -15,15 +15,12 @@ svn update if [ "$1" == "release" ]; then DROPFOLDER=release - BUILDNUMLEN=6 echo "Packaging FINISHED RELEASE for super-stable deployments." elif [ "$1" == "sprint" ]; then DROPFOLDER=sprint - BUILDNUMLEN=6 echo "Packaging END-OF-SPRINT for normal deployments." elif [ "$1" == "" ]; then DROPFOLDER=internal - BUILDNUMLEN=8 echo "internal" > ../lastbuild/swarmops/internal/frontend/SprintName.txt echo "Packaging internal test build." else @@ -35,7 +32,7 @@ fi BUILDID=$(cat ../lastbuild/swarmops/$DROPFOLDER/BuildIdentity.txt | tr -d ' \r') COMMITID=$(cat ../lastbuild/swarmops/$DROPFOLDER/CommitIdentity.txt | tr -d ' \r') -BUILDID=$(echo $BUILDID | cut -c 1-$BUILDNUMLEN)$(echo $COMMITID | cut -c 1-7) +BUILDID=$(echo $BUILDID | cut -d '.' -f 1-3).$(echo $COMMITID | cut -c 1-7) echo "" echo "Packaging Swarmops, branch '$DROPFOLDER', build $BUILDID." @@ -59,8 +56,8 @@ if [ "$DROPFOLDER" == "internal" ]; then echo "" >> deploymsg.txt echo "The packages (swarmops-frontend-internal, swarmops-backend-internal) are available from repositories now, and can be tested at http://dev.swarmops.com/ as usual. Last 3 commits listed above." >> deploymsg.txt else - PACKAGELABEL="$DROPFOLDER $(cat ../lastbuild/swarmops/$DROPFOLDER/frontend/SprintName.txt | tr -d '\n')" - echo "NOTE: this is a $DROPFOLDER package bundle. It will deploy automatically to live systems via apt-get upgrade. Yay, we made another sprint!" > deploymsg.txt + PACKAGELABEL="$DROPFOLDER $(cat ../lastbuild/swarmops/$DROPFOLDER/frontend/SprintName.txt | tr -d '\n\r')" + echo "NOTE: this is a $DROPFOLDER package bundle. It will deploy automatically to live systems via apt-get upgrade. Yay, we made another sprint!\r\n" > deploymsg.txt fi # TODO: Add build messages to deploy message, at least for internal build diff --git a/BuildFiles/Packaging/scripts/repackage-one b/BuildFiles/Packaging/scripts/repackage-one index 5e1fa046..7542e02d 100755 --- a/BuildFiles/Packaging/scripts/repackage-one +++ b/BuildFiles/Packaging/scripts/repackage-one @@ -7,17 +7,14 @@ 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 'sprint' or 'release'." exit 1; @@ -65,7 +62,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-$BUILDNUMLEN)$(echo $COMMITID | cut -c 1-7) +BUILDID=$(echo $BUILDID | cut -d '.' -f 1-3).$(echo $COMMITID | cut -c 1-7) echo "" echo "Building package $PACKAGENAME $BUILDID." diff --git a/BuildFiles/Packaging/templates/control-frontend-internal.template b/BuildFiles/Packaging/templates/control-frontend-internal.template index 34ad209e..1ad7f931 100644 --- a/BuildFiles/Packaging/templates/control-frontend-internal.template +++ b/BuildFiles/Packaging/templates/control-frontend-internal.template @@ -2,7 +2,7 @@ Package: swarmops-frontend-internal Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) -Depends: swarmops-common-internal, 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-internal, apache2 (>= 2.2.20), mono-apache-server4 (>= 3.0.11), libapache2-mod-mono (>= 2.11), libgdiplus (>= 2.11), imagemagick, ghostscript Conflicts: swarmops-frontend,swarmops-frontend-stable Homepage: http://swarmops.com/ Description: Swarmops Frontend (Internal) diff --git a/BuildFiles/Packaging/templates/control-frontend-release.template b/BuildFiles/Packaging/templates/control-frontend-release.template index c61ee985..83be3922 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 (>= 3.2.8), libapache2-mod-mono (>= 3.2.8), libgdiplus (>= 3.2.8), imagemagick, ghostscript +Depends: swarmops-common-stable, apache2 (>= 2.2.20), mono-apache-server4 (>= 3.0.11), libapache2-mod-mono (>= 2.11), libgdiplus (>= 2.11), 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 8f6b4ee6..7324e6c6 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 (>= 3.2.8), libapache2-mod-mono (>= 3.2.8), libgdiplus (>= 3.2.8), imagemagick, ghostscript +Depends: swarmops-common, apache2 (>= 2.2.20), mono-apache-server4 (>= 3.0.11), libapache2-mod-mono (>= 2.11), libgdiplus (>= 2.11), imagemagick, ghostscript Conflicts: swarmops-frontend-internal,swarmops-frontend-stable Homepage: http://swarmops.com/ Description: Swarmops Frontend diff --git a/BuildFiles/Packaging/test-build-drop b/BuildFiles/Packaging/test-build-drop index 075282e4..f07bbbcf 100755 --- a/BuildFiles/Packaging/test-build-drop +++ b/BuildFiles/Packaging/test-build-drop @@ -9,10 +9,10 @@ if [ -e /home/packager/lastbuild/swarmops/sprint/BuildDropped.txt ]; then rm /home/packager/lastbuild/swarmops/sprint/BuildDropped.txt - SPRINTNAME=$(cat ../lastbuild/swarmops/sprint/frontend/SprintName.txt | tr -d '\n') - BUILDID=$(cat ../lastbuild/swarmops/sprint/BuildIdentity.txt | tr -d ' \r') - COMMITID=$(cat ../lastbuild/swarmops/sprint/CommitIdentity.txt | tr -d ' \r') - BUILDID=$(echo $BUILDID | cut -c 1-6)$(echo $COMMITID | cut -c 1-7) + SPRINTNAME=$(cat /home/packager/lastbuild/swarmops/sprint/frontend/SprintName.txt | tr -d '\r\n') + BUILDID=$(cat /home/packager/lastbuild/swarmops/sprint/BuildIdentity.txt | tr -d ' \r\n') + COMMITID=$(cat /home/packager/lastbuild/swarmops/sprint/CommitIdentity.txt | tr -d ' \r\n') + BUILDID=$(echo $BUILDID | cut -d '.' -f 1-3).$(echo $COMMITID | cut -c 1-7) mail -a "From: Swarmops Builder " -s "Swarmops SPRINT $SPRINTNAME ($BUILDID) ready." "rick.falkvinge@pirateacademy.eu" < /home/packager/swarmops/templates/mail-sprint-ready.txt diff --git a/Site5/SprintName.txt b/Site5/SprintName.txt index 47522214..963fb244 100644 --- a/Site5/SprintName.txt +++ b/Site5/SprintName.txt @@ -1 +1 @@ -Black-6 +Black-6-fix1