Getting ready for release 0.7.4.

matthewbauer · Jun 8, 2015 · 5b47165 · 5b47165
1 parent c6cee7a
commit 5b47165
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 16 deletions.
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
@@ -29,7 +29,7 @@ module.exports = (grunt) ->
           version: '<%= app.electron.version %>'
           platform: 'darwin'
           arch: 'x64'
-          sign: 'Mac Developer: Matthew Bauer (86DMNNXPP9)'
+          sign: '"Mac Developer: Matthew Bauer (86DMNNXPP9)"'
           prune: true
           asar: true
           icon: '<%= app.icns %>'
@@ -126,7 +126,7 @@ module.exports = (grunt) ->
     shell:
       run: command: 'electron .'
   grunt.registerTask 'run', ['shell:run']
-  grunt.registerTask 'package-osx', ['app.asar', 'electron:darwin-x64', 'appdmg']
+  grunt.registerTask 'package-osx', ['app.asar', 'electron:darwin-x64']
   grunt.registerTask 'package-win', ['electron:win32-x64']
   grunt.registerTask 'install', ['electron-rebuild']
   grunt.registerTask 'app', ['coffee:app', 'cson:app', 'copy:app', 'copy:dependencies']

diff --git a/package.json b/package.json
@@ -19,16 +19,16 @@
     "build": "grunt build"
   },
   "dependencies": {
-    "atom-keymap": "^5.1.5",
     "coffee-script": "^1.9.3",
+    "cson": "^3.0.1",
     "gametime-db": "^0.6.7",
     "gametime-nointro": "^0.5.2",
-    "gametime-player": "^0.6.14",
+    "gametime-player": "^0.6.16",
     "gametime-retro": "^0.1.4",
     "jquery": "^2.1.4",
-    "node-retro": "^0.6.11",
+    "libretro": "^0.1.1",
+    "node-retro": "^0.6.13",
     "request": "^2.57.0",
-    "season": "^5.2.0",
     "space-pen": "^5.1.1",
     "underscore": "^1.8.3"
   },

diff --git a/src/core.coffee b/src/core.coffee
@@ -1,11 +1,11 @@
-path = require 'path'
+CSON = require './cson'
 
-CSON = require 'season'
+path = require 'path'
 
 {Core} = require 'node-retro'
 {getCore} = require 'gametime-retro'
 
-cores = CSON.readFileSync CSON.resolve path.normalize "./cores/base"
+cores = CSON.requireFile '../cores/base'
 
 module.exports.getCore = (rom) ->
   new Promise (resolve, reject) ->

diff --git a/src/cson.coffee b/src/cson.coffee
@@ -0,0 +1,9 @@
+cson = require 'CSON'
+
+module.exports = cson
+cson._requireFile = cson.requireFile
+module.exports.requireFile = (filename) ->
+  try
+    return cson._requireFile require.resolve "#{filename}.json"
+  catch error
+    return cson._requireFile require.resolve "#{filename}.cson"
diff --git a/src/game.coffee b/src/game.coffee
@@ -1,4 +1,4 @@
-Model = require './Model'
+Model = require './model'
 db = require './db_asar'
 PlayerView = require './player-view'
 

diff --git a/src/keys.coffee b/src/keys.coffee
@@ -1,7 +1,9 @@
-$ = require 'jquery'
-CSON = require 'season'
 path = require 'path'
-keymaps = CSON.readFileSync CSON.resolve path.normalize './keymaps/base.cson'
+
+$ = require 'jquery'
+CSON = require './cson'
+
+keymaps = CSON.requireFile '../keymaps/base'
 
 $(window).on 'keydown', (event) ->
   for selector, keys of keymaps

diff --git a/src/player-input.coffee b/src/player-input.coffee
@@ -1,4 +1,4 @@
-retro = require 'node-retro'
+retro = require 'libretro'
 
 module.exports =
 class Input

diff --git a/static/index.js b/static/index.js
@@ -1,6 +1,9 @@
 // bootstrap script
 
-require('coffee-script').register();
+try {
+  require('coffee-script').register();
+} catch(e) {
+}
 
 window.resizeTo(1200, 600);
 var $ = require('jquery');

diff --git a/static/player.js b/static/player.js
@@ -1,6 +1,9 @@
 // bootstrap script
 
-require('coffee-script').register();
+try {
+  require('coffee-script').register();
+} catch(e) {
+}
 
 var $ = require('jquery');
 $(function() {