From fe6d391f11efabb30becf345326373b0519b3b04 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Mon, 27 Oct 2014 12:46:24 +0100 Subject: [PATCH] Fixes to build process following Black-4 --- BuildFiles/Building/ccnet.config | 4 ++-- BuildFiles/Packaging/release.sh | 4 ++++ BuildFiles/Packaging/repackage-build | 5 ++++- BuildFiles/Packaging/sprint.sh | 4 ++++ BuildFiles/prepare-sprint.sh | 13 +++++++++++++ .../{update-loc.sh => update-kaylock-count.sh} | 0 6 files changed, 27 insertions(+), 3 deletions(-) create mode 100755 BuildFiles/Packaging/release.sh create mode 100755 BuildFiles/Packaging/sprint.sh create mode 100755 BuildFiles/prepare-sprint.sh rename BuildFiles/{update-loc.sh => update-kaylock-count.sh} (100%) diff --git a/BuildFiles/Building/ccnet.config b/BuildFiles/Building/ccnet.config index fd8d1c48..a55c85ed 100644 --- a/BuildFiles/Building/ccnet.config +++ b/BuildFiles/Building/ccnet.config @@ -206,7 +206,7 @@ \\swarmops-dev\builddrop\swarmops\sprint\frontend false true - false + true @@ -214,7 +214,7 @@ \\swarmops-dev\builddrop\swarmops\sprint\backend false true - false + true diff --git a/BuildFiles/Packaging/release.sh b/BuildFiles/Packaging/release.sh new file mode 100755 index 00000000..63d96e8a --- /dev/null +++ b/BuildFiles/Packaging/release.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +./repackage-one release + diff --git a/BuildFiles/Packaging/repackage-build b/BuildFiles/Packaging/repackage-build index d654c7c6..cb613e14 100755 --- a/BuildFiles/Packaging/repackage-build +++ b/BuildFiles/Packaging/repackage-build @@ -15,12 +15,15 @@ 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 @@ -32,7 +35,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-8)$(echo $COMMITID | cut -c 1-7) +BUILDID=$(echo $BUILDID | cut -c 1-$BUILDNUMLEN)$(echo $COMMITID | cut -c 1-7) echo "" echo "Packaging Swarmops, branch '$DROPFOLDER', build $BUILDID." diff --git a/BuildFiles/Packaging/sprint.sh b/BuildFiles/Packaging/sprint.sh new file mode 100755 index 00000000..4cd31798 --- /dev/null +++ b/BuildFiles/Packaging/sprint.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +./repackage-build sprint + diff --git a/BuildFiles/prepare-sprint.sh b/BuildFiles/prepare-sprint.sh new file mode 100755 index 00000000..85dc6812 --- /dev/null +++ b/BuildFiles/prepare-sprint.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +#Before this, a manual git pull should be done + +#Download localizations +cd Localization +./download.sh +cd .. + +#Update lines-of-code count +./update-kaylock-count.sh + +#After this, a manual git push should be done diff --git a/BuildFiles/update-loc.sh b/BuildFiles/update-kaylock-count.sh similarity index 100% rename from BuildFiles/update-loc.sh rename to BuildFiles/update-kaylock-count.sh