Updated to use NPM for packaging

owensd · Feb 8, 2017 · fc4e111 · fc4e111
1 parent 734e10c
commit fc4e111
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@
 .out
 .tmp
 node_modules
+.dist
 
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,11 +1,6 @@
 module.exports = function(grunt) {
     grunt.initConfig({
         pkg: grunt.file.readJSON("package.json"),
-        "download-electron": {
-            version: "<%= pkg.config.electron.version %>",
-            outputDir: "<%= pkg.config.electron.installDir %>",
-            rebuild: true
-        },
         "generate-manifest": {
             name: "<%= pkg.name %>",
             version: "<%= pkg.version %>",
@@ -27,7 +22,6 @@ module.exports = function(grunt) {
         }
     });
 
-    grunt.loadNpmTasks("grunt-download-electron");
     grunt.loadNpmTasks("grunt-contrib-symlink");
 
     grunt.registerTask("generate-manifest", "Generate the Electron manifest.", function() {

diff --git a/package.json b/package.json
@@ -3,6 +3,8 @@
   "version": "0.1.0",
   "description": "Test configuration",
   "devDependencies": {
+    "electron": "1.5.0",
+    "electron-packager": "^8.5.1",
     "grunt": "^1.0.0",
     "grunt-download-electron": "^2.1.4",
     "grunt-contrib-symlink": "^1.0.0"
@@ -12,16 +14,12 @@
   "config": {
     "electron": {
       "version": "1.5.0",
-      "installDir": ".deps/electron",
       "manifestDir": ".out/app",
       "main": "electron-host"
     },
     "symlink": {
       "src": "ui/public",
       "dest": ".out/app/public"
     }
-  },
-  "scripts": {
-    "postinstall": "mkdir -p .deps/electron; grunt download-electron"
   }
 }
diff --git a/project.clj b/project.clj
@@ -20,7 +20,9 @@
                        ["cljsbuild" "once" "main"]
                        ["shell" "grunt" "generate-mainjs"]
                        ["shell" "grunt" "symlink"]
-                       ["cljsbuild" "once" "ui"]]}
+                       ["cljsbuild" "once" "ui"]]
+           "electron-package" ["shell" "./node_modules/electron-packager/cli.js" ".out/app" "--out=.dist"]
+           "electron-clean" ["shell" "rm" "-rf" ".out" ".tmp" ".dist"]}
 
  :cljsbuild {:builds {:main {:source-paths ["app/src"]
                              :incremental true
@@ -37,7 +39,7 @@
                            :incremental true
                            :assert true
                            :compiler {:output-to ".out/app/ui.js"
-                                      :output-dir ".out/lib/ui"
+                                      :output-dir ".out/app/lib/ui"
                                       :warnings true
                                       :elide-asserts true
                                       :optimizations :none

diff --git a/ui/public/index.html b/ui/public/index.html
@@ -12,7 +12,7 @@ <h1>Hello World!</h1>
       <p>Script was not loaded.</p>
     </div>
 
-    <script type="text/javascript" src="../../lib/ui/goog/base.js"></script>
+    <script type="text/javascript" src="../lib/ui/goog/base.js"></script>
     <script type="text/javascript" src="../ui.js"></script>
     <script type="text/javascript">goog.require('blog_post.landing')</script>
   </body>