Browse Source

missed changes in CI scripts for Linux

ctrauma 10 years ago
parent
commit
ac825e162b
2 changed files with 5 additions and 5 deletions
  1. 1 1
      Build/CIScripts/BuildLinux.js
  2. 4 4
      Build/CIScripts/HostLinux.js

+ 1 - 1
Build/CIScripts/BuildLinux.js

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

+ 4 - 4
Build/CIScripts/HostLinux.js

@@ -1,7 +1,7 @@
 var fs = require('fs-extra');
 var fs = require('fs-extra');
 var bcommon = require("./BuildCommon");
 var bcommon = require("./BuildCommon");
 
 
-var buildDir = bcommon.artifactsRoot + "Build/Mac/";
+var buildDir = bcommon.artifactsRoot + "Build/Linux/";
 var atomicToolBinary = buildDir + "Bin/AtomicTool";
 var atomicToolBinary = buildDir + "Bin/AtomicTool";
 
 
 function clean() {
 function clean() {
@@ -29,15 +29,15 @@ namespace('build', function() {
     process.chdir(toolBuildDir);
     process.chdir(toolBuildDir);
 
 
     var cmds = [
     var cmds = [
-      'cmake ../../../../ -DATOMICTOOL_NOGEN=1 -G Xcode',
-      'xcodebuild -target AtomicTool -configuration Release'
+        cmds.push("cmake ../../../ -DATOMIC_DEV_BUILD=0 -DCMAKE_BUILD_TYPE=Release -DATOMIC_BUILD_2D=0 -DLINUX=1 ");
+        cmds.push("make AtomicTool")
     ]
     ]
 
 
     jake.exec(cmds, function() {
     jake.exec(cmds, function() {
 
 
       var srcToolBinary = toolBuildDir + "Source/AtomicTool/Release/AtomicTool"
       var srcToolBinary = toolBuildDir + "Source/AtomicTool/Release/AtomicTool"
       fs.copySync(srcToolBinary, atomicToolBinary);
       fs.copySync(srcToolBinary, atomicToolBinary);
-      console.log("Built MacOSX AtomicTool");
+      console.log("Built Linux AtomicTool");
       complete();
       complete();
 
 
     }, {
     }, {