Browse Source

Merge pull request #1101 from JimMarlowe/JM-FX-LINUX

linux xbuild config test
JoshEngebretson 9 years ago
parent
commit
605bd29203
1 changed files with 21 additions and 4 deletions
  1. 21 4
      Build/Scripts/BuildConfig.js

+ 21 - 4
Build/Scripts/BuildConfig.js

@@ -1,6 +1,21 @@
 var os = require('os');
 var os = require('os');
 var path = require('path');
 var path = require('path');
 var spawnSync = require('child_process').spawnSync;
 var spawnSync = require('child_process').spawnSync;
+var fs = require('fs-extra');
+
+// function from BuildCommon, checks to see if a file exists
+function programFileExists(filePath)
+{
+    try
+    {
+        return fs.statSync(filePath).isFile();
+    }
+    catch (err)
+    {
+        return false;
+    }
+}
+
 
 
 function processOptions(config) {
 function processOptions(config) {
 
 
@@ -12,14 +27,16 @@ function processOptions(config) {
     } else {
     } else {
         if (os.platform() == "win32") {
         if (os.platform() == "win32") {
             config["with-atomicnet"] = true;
             config["with-atomicnet"] = true;
-        } else {
+        } else if (os.platform() == "darwin") {
             // see if xbuild is available
             // see if xbuild is available
             config["with-atomicnet"]  = false;
             config["with-atomicnet"]  = false;
-            if ( spawnSync) // TODO: CI box doesn't have spawnSync
+            if ( spawnSync)
                 config["with-atomicnet"] = spawnSync("which", ["xbuild"]).status == 1 ? false : true;
                 config["with-atomicnet"] = spawnSync("which", ["xbuild"]).status == 1 ? false : true;
+        } else if (os.platform() == "linux") {  // see if xbuild is available on linux
+            config["with-atomicnet"] = programFileExists('/usr/bin/xbuild');
         }
         }
-    }
-
+	}
+	
     // paths
     // paths
     config.atomicRoot = path.resolve(__dirname, "../..") + "/";
     config.atomicRoot = path.resolve(__dirname, "../..") + "/";
     config.artifactsRoot = config.atomicRoot + "Artifacts/";
     config.artifactsRoot = config.atomicRoot + "Artifacts/";