Separate out atomic-cli-mac from atomic-cli

CLI/atomic-cli-mac/.gitignore

@@ -0,0 +1,2 @@
+
+bin/*

CLI/atomic-cli-mac/index.js

@@ -0,0 +1,10 @@
+
+var PLATFORM_DATA_DIR = __dirname + "/data";
+var ATOMICTOOL_BIN = __dirname + "/bin/AtomicTool";
+var EDITOR_APPLICATION = __dirname + "/bin/editor/AtomicEditor.app";
+var EDITOR_DATA_DIR = __dirname + "/bin/editor/AtomicEditor.app/Contents/Resources";
+
+exports.PLATFORM_DATA_DIR = PLATFORM_DATA_DIR;
+exports.EDITOR_APPLICATION = EDITOR_APPLICATION;
+exports.EDITOR_DATA_DIR = EDITOR_DATA_DIR;
+exports.ATOMICTOOL_BIN = ATOMICTOOL_BIN;

CLI/atomic-cli-mac/package.json

@@ -0,0 +1,27 @@
+{
+  "author": {
+    "email": "[email protected]",
+    "name": "Atomic Game Engine",
+    "url": "http://www.AtomicGameEngine.com"
+  },
+  "bugs": {
+    "url": "https://github.com/AtomicGameEngine/AtomicGameEngine/issues"
+  },
+  "dependencies": {
+  },
+  "description": "Mac dependencies for atomic-cli",
+  "engines": {
+    "node": ">=0.8.0"
+  },
+  "homepage": "http://www.AtomicGameEngine.com",
+   "licenses": [{
+    "type": "Atomic Game Engine",
+    "url": "https://github.com/AtomicGameEngine/AtomicGameEngine/blob/master/LICENSE.md"
+  }],
+  "main": "./index.js",
+  "name": "atomic-cli-mac",
+  "preferGlobal": true,
+  "repository": "https://github.com/AtomicGameEngine/AtomicGameEngine",
+  "version": "0.2.4",
+  "os" : ["darwin"]
+}

CLI/atomic-cli/.gitignore

@@ -0,0 +1 @@
+node_modules/*

CLI/index.js → CLI/atomic-cli/index.js

@@ -7,10 +7,20 @@ var path = require("path");
 var spawn = require("child_process").spawn;
 var wrench = require("wrench");
 
-var DATA_DIR = __dirname + "/data/";
+try {
+  var platform_cli = require('atomic-cli-mac');
+  console.log(platform_cli);
+}
+catch (e) {
+
+  console.log(e);
+}
+
+
+var DATA_DIR = platform_cli.EDITOR_DATA_DIR;
 exports.DATA_DIR = DATA_DIR;
 
-var ATOMIC_TOOL_BIN = __dirname + "/data/bin/Mac/AtomicTool";
+var ATOMIC_TOOL_BIN = platform_cli.ATOMICTOOL_BIN;
 
 var HTTP_PORT = 4000;
 var SOCKET_PORT = HTTP_PORT+1;
@@ -22,7 +32,7 @@ exports.VERSION = JSON.parse(fs.readFileSync(__dirname + "/package.json")).versi
 var exec = function (command, flags, opts) {
     opts = opts || {};
     if (opts.verbose !== false) {
-        //console.log([command].concat(flags).join(" "));
+        console.log([command].concat(flags).join(" "));
     }
 
     // Run everything through cmd.exe on Windows to be able to find .bat files

CLI/package.json → CLI/atomic-cli/package.json

@@ -22,6 +22,9 @@
     "xmldom": "~0.1.16",
     "httpreq": "*"
   },
+  "optionalDependencies" : {
+    "atomic-cli-mac" : "./atomic-cli-mac-disabled/"
+  },
   "description": "CLI for the Atomic Game Engine",
   "engines": {
     "node": ">=0.8.0"

Source/AtomicTool/AtomicTool.cpp

@@ -46,7 +46,7 @@ void AtomicTool::Setup()
                 if (!value.Length())
                     ErrorExit("Unable to parse --cli-data-path");
 
-                cliDataPath_ = value;
+                cliDataPath_ = AddTrailingSlash(value);
             }
         }
 

Source/ToolCore/Build/BuildMac.cpp

@@ -29,7 +29,7 @@ void BuildMac::Initialize()
 
     String dataPath = tsystem->GetDataPath();
     String projectResources = project->GetResourcePath();
-    String coreDataFolder = dataPath + "Atomic/Resources/CoreData/";
+    String coreDataFolder = dataPath + "CoreData/";
 
     AddResourceDir(coreDataFolder);
     AddResourceDir(projectResources);
@@ -54,7 +54,7 @@ void BuildMac::Build(const String& buildPath)
 
     String dataPath = tsystem->GetDataPath();
 
-    String appSrcPath = dataPath + "Atomic/Deployment/MacOS/AtomicPlayer.app";
+    String appSrcPath = dataPath + "Deployment/MacOS/AtomicPlayer.app";
 
     fileSystem->CreateDir(buildPath_);