Fixes to build process following Black-4

This commit is contained in:
Rick Falkvinge
2014-10-27 12:46:24 +01:00
parent 6fed257b9f
commit fe6d391f11
6 changed files with 27 additions and 3 deletions
+2 -2
View File
@@ -206,7 +206,7 @@
<publishDir>\\swarmops-dev\builddrop\swarmops\sprint\frontend</publishDir>
<useLabelSubDirectory>false</useLabelSubDirectory>
<cleanPublishDirPriorToCopy>true</cleanPublishDirPriorToCopy>
<alwaysPublish>false</alwaysPublish>
<alwaysPublish>true</alwaysPublish> <!-- must be True or won't copy! -->
</buildpublisher>
<buildpublisher>
@@ -214,7 +214,7 @@
<publishDir>\\swarmops-dev\builddrop\swarmops\sprint\backend</publishDir>
<useLabelSubDirectory>false</useLabelSubDirectory>
<cleanPublishDirPriorToCopy>true</cleanPublishDirPriorToCopy>
<alwaysPublish>false</alwaysPublish>
<alwaysPublish>true</alwaysPublish> <!-- must be True! -->
</buildpublisher>
<!-- Write metadata to deploy folder, signal packager that new build is available -->
+4
View File
@@ -0,0 +1,4 @@
#!/bin/bash
./repackage-one release
+4 -1
View File
@@ -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."
+4
View File
@@ -0,0 +1,4 @@
#!/bin/bash
./repackage-build sprint
+13
View File
@@ -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