diff --git a/BuildFiles/Packaging/repackage-build b/BuildFiles/Packaging/scripts/repackage-build similarity index 91% rename from BuildFiles/Packaging/repackage-build rename to BuildFiles/Packaging/scripts/repackage-build index cb613e14..88eda043 100755 --- a/BuildFiles/Packaging/repackage-build +++ b/BuildFiles/Packaging/scripts/repackage-build @@ -42,9 +42,13 @@ echo "Packaging Swarmops, branch '$DROPFOLDER', build $BUILDID." echo "----------------------------------------------------------------------" echo "" -./repackage-one frontend $1 -./repackage-one backend $1 -./repackage-one common $1 +scripts/repackage-one frontend $1 +scripts/repackage-one backend $1 +scripts/repackage-one common $1 + +if [ "$DROPFOLDER" != "internal" ]; then + # packaging extscripts should go here; copy from do-sprint +fi echo "Notifying developers that new build has packaged for test/deployment..." diff --git a/BuildFiles/Packaging/repackage-one b/BuildFiles/Packaging/scripts/repackage-one similarity index 96% rename from BuildFiles/Packaging/repackage-one rename to BuildFiles/Packaging/scripts/repackage-one index 67c1cb80..5e1fa046 100755 --- a/BuildFiles/Packaging/repackage-one +++ b/BuildFiles/Packaging/scripts/repackage-one @@ -19,7 +19,7 @@ else DROPFOLDER=internal BUILDNUMLEN=8 if [ "$1" == "extscripts" ]; then - echo "Error: Cannot package external scripts for internal build. Use 'stable'." + echo "Error: Cannot package external scripts for internal build. Use 'sprint' or 'release'." exit 1; fi fi @@ -91,6 +91,11 @@ if [ "$COPYFILES" == "yes" ]; then mkdir -p $DEPLOYDIR/$TARGETDIR cp -R $SOURCEDIR/* $DEPLOYDIR/$TARGETDIR/. + #Special case: remove staging sandbox from scripts before packaging + if [ "$1" == "extscripts" ]; then + rm -rf $DEPLOYDIR/$TARGETDIR/staging + fi + if [ -d $SOURCEDIR/etcinitd ]; then echo "Adding /etc/init.d files..." mkdir -p etc/init.d diff --git a/BuildFiles/Packaging/test-build-drop b/BuildFiles/Packaging/test-build-drop index d44e4099..d7fa1167 100755 --- a/BuildFiles/Packaging/test-build-drop +++ b/BuildFiles/Packaging/test-build-drop @@ -12,7 +12,7 @@ fi rm /home/packager/lastbuild/swarmops/internal/BuildDropped.txt cd /home/packager/swarmops -./repackage-build +scripts/repackage-build exit 0; diff --git a/BuildFiles/prepare-sprint.sh b/BuildFiles/prepare-sprint.sh index 85dc6812..814ea1c5 100755 --- a/BuildFiles/prepare-sprint.sh +++ b/BuildFiles/prepare-sprint.sh @@ -8,6 +8,8 @@ cd Localization cd .. #Update lines-of-code count -./update-kaylock-count.sh +cd .. +BuildFiles/update-kaylock-count.sh +cd BuildFiles #After this, a manual git push should be done diff --git a/External Dependencies/NBitcoin b/External Dependencies/NBitcoin index e6615094..3e118efe 160000 --- a/External Dependencies/NBitcoin +++ b/External Dependencies/NBitcoin @@ -1 +1 @@ -Subproject commit e66150942e685bf82c8a635faa48f412aab3dd56 +Subproject commit 3e118efebd7f7100311be010fa9a4c3552bbbd89