Merge pull request #57 from birarda/console-packaging

add latest icons, move source files to src

console/.gitignore

@@ -1,2 +1,2 @@
-Console-darwin-x64/
+Console-*/
 npm-debug.log

console/CMakeLists.txt

@@ -1,7 +1,15 @@
 set(PACKAGING_TARGET_NAME package-console)
 
 # add a target that when built will produce an executable of console for this platform
+if (APPLE)
+  set(PACKAGE_COMMAND package-darwin)
+elseif (WIN32)
+  set(PACKAGE_COMMAND package-win)
+elseif (UNIX)
+  set(PACKAGE_COMMAND package-linux)
+endif ()
+
 add_custom_target(${PACKAGING_TARGET_NAME}
-  COMMAND npm run-script package-darwin
+  COMMAND npm run-script ${PACKAGE_COMMAND}
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )

console/package.json

@@ -9,19 +9,22 @@
   ],
   "devDependencies": {
     "electron-packager": "^5.1.1",
-    "electron-prebuilt": "^0.35.0"
+    "electron-prebuilt": "0.36.0"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/highfidelity/hifi.git"
   },
-  "main": "main.js",
+  "main": "src/main.js",
   "scripts": {
     "start": "electron . --local-debug-builds",
     "local-release": "electron . --local-release-builds",
-    "package-darwin": "electron-packager . Console --platform=darwin --arch=x64 --version=0.35.2"
+    "package-darwin": "electron-packager . Console --overwrite --platform=darwin --arch=x64 --version=0.36.0 --icon=resources/console.icns",
+    "package-win": "electron-packager . Console --overwrite --platform=win32 --arch=x64 --version=0.36.0 --icon=resources/console.ico",
+    "package-linux": "electron-packager . Console --overwrite --platform=linux --arch=x64 --version=0.36.0"
   },
   "dependencies": {
-    "yargs": "^3.30.0"
+    "yargs": "^3.30.0",
+    "extend": "^3.0.0"
   }
 }

console/src/main.js

@@ -19,8 +19,10 @@ require('crash-reporter').start();
 // be closed automatically when the JavaScript object is garbage collected.
 var mainWindow = null;
 var appIcon = null;
-var TRAY_ICON = 'resources/tray-icon.png';
-var APP_ICON = 'resources/tray-icon.png';
+
+var path = require('path');
+var TRAY_ICON = path.join(__dirname, '../resources/console-tray.png');
+var APP_ICON = path.join(__dirname, '../resources/console.png');
 
 // Quit when all windows are closed.
 app.on('window-all-closed', function() {