From 52fd9045b1e685e86f221dadbe03a0570db7871f Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Wed, 5 Nov 2014 15:13:29 +0100 Subject: [PATCH 1/2] Moved Sprint build back to own branch --- BuildFiles/Building/ccnet.config | 68 ++++++++++++++++++++++++++++---- 1 file changed, 61 insertions(+), 7 deletions(-) diff --git a/BuildFiles/Building/ccnet.config b/BuildFiles/Building/ccnet.config index 768b78e8..0826788b 100644 --- a/BuildFiles/Building/ccnet.config +++ b/BuildFiles/Building/ccnet.config @@ -194,8 +194,28 @@ C:\Lab\Swarmops\artifact-sprint http://build.swarmops.com/server/auxiliary/project/Swarmops/ViewLatestBuildReport.aspx + + git://github.com/Swarmops/Swarmops + sprint + true + true + true + git + false + false + false + Build {0} + Build-{0} + Swarmops Build + builds@swarmops.com + c:\Lab\Swarmops\sprint + 180000 + + + + - + @@ -207,22 +227,56 @@ - + + + + cmd.exe + /c rebuild-all.cmd + C:\Lab\Swarmops\sprint\External Dependencies + + + + + + C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe + C:\Lab\Swarmops\sprint + Backend\Backend.csproj + /p:Configuration=Release + Build + 1200 + C:\Program Files (x86)\CruiseControl.NET\server\Rodemeyer.MsBuildToCCnet.dll + + + + + + C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe + C:\Lab\Swarmops\sprint + Interface\Interface.csproj + /p:Configuration=Release + Build + 1200 + C:\Program Files (x86)\CruiseControl.NET\server\Rodemeyer.MsBuildToCCnet.dll + + + + + - C:\Lab\Swarmops\build\Site5-Deployment + C:\Lab\Swarmops\sprint\Site5-Deployment \\swarmops-dev\builddrop\swarmops\sprint\frontend false true - true + false - C:\Lab\Swarmops\build\Backend\bin\Release + C:\Lab\Swarmops\sprint\Backend\bin\Release \\swarmops-dev\builddrop\swarmops\sprint\backend false true - true + false @@ -234,7 +288,7 @@ cmd.exe - /c copy \\swarmops-dev\builddrop\swarmops\internal\CommitIdentity.txt \\swarmops-dev\builddrop\swarmops\sprint\CommitIdentity.txt + /c git rev-parse HEAD > \\swarmops-dev\builddrop\swarmops\sprint\CommitIdentity.txt From 7c1d655a3bdd9dc7d94835c7c6d425a55a9565c6 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Wed, 5 Nov 2014 15:34:52 +0100 Subject: [PATCH 2/2] Updated csproj to reflect new loc --- Logic/Logic.csproj | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Logic/Logic.csproj b/Logic/Logic.csproj index 4ed860f2..cdbe7b62 100644 --- a/Logic/Logic.csproj +++ b/Logic/Logic.csproj @@ -352,6 +352,9 @@ + + + @@ -376,15 +379,18 @@ - - - + + + + + + Designer