From 87237f167ac29aa5819563cdf259e68370489b56 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Wed, 11 Jan 2017 16:27:30 +0100 Subject: [PATCH] Some script changes --- BuildFiles/Building/scripts/prebuild-fixes | 3 +++ BuildFiles/Building/scripts/update-kaylock-count | 10 ++++++++++ BuildFiles/prepare-sprint | 1 - BuildFiles/update-kaylock-count | 2 ++ Site/Controls/v5/Base/MainMenu.ascx.cs | 4 ++-- 5 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 BuildFiles/Building/scripts/update-kaylock-count diff --git a/BuildFiles/Building/scripts/prebuild-fixes b/BuildFiles/Building/scripts/prebuild-fixes index 6e8ac9fd..30e4d69e 100755 --- a/BuildFiles/Building/scripts/prebuild-fixes +++ b/BuildFiles/Building/scripts/prebuild-fixes @@ -13,6 +13,9 @@ find . -iname '*.cs' -exec perl -pi -e 's/Resources.Controls.([A-Za-z\.]+)/Resou cd ../.. +# Update line count + +./update-kaylock-count # Restore packages, command line version diff --git a/BuildFiles/Building/scripts/update-kaylock-count b/BuildFiles/Building/scripts/update-kaylock-count new file mode 100644 index 00000000..1bb9ed0d --- /dev/null +++ b/BuildFiles/Building/scripts/update-kaylock-count @@ -0,0 +1,10 @@ +#!/bin/bash + +# Updates LOC count for Swarmops. Run from parent folder, +# like 'BuildFiles/update-loc.sh' for the output to write to right folder. + +# Update the LOC count on every sprint deploy. + +find . \( -name '*.cs' -o -name '*.as?x' \) | grep -v "External Dep" | grep -v "Site4" | grep -v "Site5" | xargs wc -l > LINESOFCODE +tail -n 1 LINESOFCODE | cut -c 2-7 | xargs printf "%'d" | xargs -I {} sed -i 's/.*/{}/' Site/Controls/v5/Base/MainMenu.ascx.cs + diff --git a/BuildFiles/prepare-sprint b/BuildFiles/prepare-sprint index 69769f44..5ad06529 100755 --- a/BuildFiles/prepare-sprint +++ b/BuildFiles/prepare-sprint @@ -10,7 +10,6 @@ cd .. #Update lines-of-code count cd .. BuildFiles/update-kaylock-count -tail -n 1 LINESOFCODE | cut -c 2-7 | xargs printf "%'d" | xargs -I {} sed -i 's/.*/{}/' Site/Controls/v5/Base/MainMenu.ascx.cs cd BuildFiles #After this, a manual git push should be done diff --git a/BuildFiles/update-kaylock-count b/BuildFiles/update-kaylock-count index b3abd50c..1bb9ed0d 100755 --- a/BuildFiles/update-kaylock-count +++ b/BuildFiles/update-kaylock-count @@ -6,3 +6,5 @@ # Update the LOC count on every sprint deploy. find . \( -name '*.cs' -o -name '*.as?x' \) | grep -v "External Dep" | grep -v "Site4" | grep -v "Site5" | xargs wc -l > LINESOFCODE +tail -n 1 LINESOFCODE | cut -c 2-7 | xargs printf "%'d" | xargs -I {} sed -i 's/.*/{}/' Site/Controls/v5/Base/MainMenu.ascx.cs + diff --git a/Site/Controls/v5/Base/MainMenu.ascx.cs b/Site/Controls/v5/Base/MainMenu.ascx.cs index c860ff17..d20f6adf 100644 --- a/Site/Controls/v5/Base/MainMenu.ascx.cs +++ b/Site/Controls/v5/Base/MainMenu.ascx.cs @@ -61,7 +61,7 @@ namespace Swarmops.Controls.Base output.Write( "
  • " + String.Format(Resources.Menu5.Menu5_Beta_BuildTime, Formatting.SwarmopsBuildTime) + "
  • "); - output.Write("
  • " + String.Format(Resources.Menu5.Menu5_Beta_LinesOfCode, @"140,936") + "
  • "); + output.Write("
  • " + String.Format(Resources.Menu5.Menu5_Beta_LinesOfCode, @"KAYLOCKHERE") + "
  • "); output.Write("
  •  
  • "); output.Write(""); output.Write(""); // End of beta menu @@ -203,4 +203,4 @@ namespace Swarmops.Controls.Base output.Write (""); } } -} \ No newline at end of file +}