diff --git a/BuildFiles/Building/ccnet.config b/BuildFiles/Building/ccnet.config index 030cff05..fd8d1c48 100644 --- a/BuildFiles/Building/ccnet.config +++ b/BuildFiles/Building/ccnet.config @@ -186,26 +186,8 @@ 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 - - - + @@ -217,35 +199,10 @@ - - - - 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\sprint\Site5-Deployment + C:\Lab\Swarmops\build\Site5-Deployment \\swarmops-dev\builddrop\swarmops\sprint\frontend false true @@ -253,7 +210,7 @@ - C:\Lab\Swarmops\sprint\Backend\bin\Release + C:\Lab\Swarmops\build\Backend\bin\Release \\swarmops-dev\builddrop\swarmops\sprint\backend false true @@ -269,7 +226,7 @@ cmd.exe - /c git rev-parse HEAD > \\swarmops-dev\builddrop\swarmops\sprint\CommitIdentity.txt + /c copy \\swarmops-dev\builddrop\swarmops\internal\CommitIdentity.txt \\swarmops-dev\builddrop\swarmops\sprint\CommitIdentity.txt diff --git a/BuildFiles/Packaging/templates/control-backend-release.template b/BuildFiles/Packaging/templates/control-backend-release.template index 59469cc6..7e9f416f 100644 --- a/BuildFiles/Packaging/templates/control-backend-release.template +++ b/BuildFiles/Packaging/templates/control-backend-release.template @@ -2,7 +2,7 @@ Package: swarmops-backend-stable Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) -Depends: swarmops-common-stable,mono-runtime,libmono-corlib4.0-cil,libmono-posix4.0-cil,libmono-system-data4.0-cil +Depends: swarmops-common-stable,mono-runtime,libmono-corlib4.0-cil,libmono-posix4.0-cil,libmono-system-data4.0-cil,libmono-system-web-http4.0-cil,libmono-system-web-services4.0-cil Conflicts: swarmops-backend-internal,swarmops-backend Homepage: http://swarmops.com/ Description: Swarmops Backend (Stable) diff --git a/BuildFiles/Packaging/templates/control-backend-sprint.template b/BuildFiles/Packaging/templates/control-backend-sprint.template index 81520d31..c75779ae 100644 --- a/BuildFiles/Packaging/templates/control-backend-sprint.template +++ b/BuildFiles/Packaging/templates/control-backend-sprint.template @@ -2,7 +2,7 @@ Package: swarmops-backend Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) -Depends: swarmops-common,mono-runtime,libmono-corlib4.0-cil,libmono-posix4.0-cil,libmono-system-data4.0-cil +Depends: swarmops-common,mono-runtime,libmono-corlib4.0-cil,libmono-posix4.0-cil,libmono-system-data4.0-cil,libmono-system-web-http4.0-cil,libmono-system-web-services4.0-cil Conflicts: swarmops-backend-internal,swarmops-backend-stable Homepage: http://swarmops.com/ Description: Swarmops Backend