Browse Source

This should address Windows building 2x on CI box

JoshEngebretson 10 years ago
parent
commit
d928c36832

+ 1 - 0
Build/CIScripts/BuildAndroid.js

@@ -12,6 +12,7 @@ namespace('build', function() {
   }, function() {
 
     bcommon.cleanCreateDir(playerBuildDir);
+    bcommon.cleanCreateDir(bcommon.getGenScriptRootDir("ANDROID"));
 
     var atomicTool = host.getAtomicToolBinary();
 

+ 8 - 0
Build/CIScripts/BuildCommon.js

@@ -45,6 +45,13 @@ function testRemoveDir(path) {
   }
 }
 
+function getGenScriptRootDir(platform) {
+
+  return atomicRoot + "Artifacts/Build/Source/Generated/" + platform + "/";
+
+}
+
+
 function cloneRepo(repoUrl, destPath) {
 
 }
@@ -57,3 +64,4 @@ exports.testRemoveDir = testRemoveDir;
 exports.testCreateDir = testCreateDir;
 exports.cloneRepo = cloneRepo;
 exports.cleanCreateDir = cleanCreateDir;
+exports.getGenScriptRootDir = getGenScriptRootDir;

+ 1 - 0
Build/CIScripts/BuildIOS.js

@@ -15,6 +15,7 @@ namespace('build', function() {
     var playerBuildDir = buildDir + "AtomicPlayer/";
 
     bcommon.cleanCreateDir(playerBuildDir);
+    bcommon.cleanCreateDir(bcommon.getGenScriptRootDir("IOS"));
 
     process.chdir(playerBuildDir);
 

+ 1 - 0
Build/CIScripts/BuildMac.js

@@ -15,6 +15,7 @@ namespace('build', function() {
     var playerBuildDir = buildDir + "AtomicPlayer/";
 
     bcommon.cleanCreateDir(playerBuildDir);
+    bcommon.cleanCreateDir(bcommon.getGenScriptRootDir("MACOSX"));
 
     process.chdir(playerBuildDir);
 

+ 1 - 0
Build/CIScripts/BuildWeb.js

@@ -15,6 +15,7 @@ namespace('build', function() {
     var playerBuildDir = buildDir + "AtomicPlayer/";
 
     bcommon.cleanCreateDir(playerBuildDir);
+    bcommon.cleanCreateDir(bcommon.getGenScriptRootDir("WEB"));
 
     process.chdir(playerBuildDir);
 

+ 1 - 1
Build/CIScripts/BuildWindows.js

@@ -13,7 +13,7 @@ namespace('build', function() {
   }, function() {
 
     bcommon.cleanCreateDir(buildDir);
-    bcommon.cleanCreateDir(atomicRoot + "Build/Source/Generated");
+    bcommon.cleanCreateDir(bcommon.getGenScriptRootDir("WINDOWS"));
 
     process.chdir(buildDir);
 

+ 1 - 1
Build/CIScripts/Windows/CompileAtomicTool.bat

@@ -1,3 +1,3 @@
 call "%VS140COMNTOOLS%..\..\VC\bin\amd64\vcvars64.bat"
-cmake ..\\..\\..\\ -DATOMIC_DEV_BUILD=1 -G "Visual Studio 14 2015 Win64"
+cmake ..\\..\\..\\ -DATOMIC_DEV_BUILD=0 -G "Visual Studio 14 2015 Win64"
 msbuild /m Atomic.sln /t:AtomicTool /p:Configuration=Release /p:Platform=x64