@@ -11,7 +11,7 @@ var argv = require('yargs')
1111function jsonValue ( path , value ) { return JSON . parse ( fs . readFileSync ( path ) . toString ( ) ) [ value ] ; } ;
1212
1313var modulePath = path . join ( "." , "node_modules" ) ;
14- var packagerCmd = path . join ( modulePath , ".bin " , "electron-packager " ) ;
14+ var packagerCmd = path . join ( modulePath , "electron-packager " , "cli.js " ) ;
1515var prebuiltPath = path . join ( modulePath , "electron-prebuilt" ) ;
1616var prebuiltPackageJSONPath = path . join ( prebuiltPath , "package.json" ) ;
1717var buildOutputPath = path . join ( "." , "release" ) ;
@@ -22,30 +22,48 @@ var ignorePaths='node_modules/electron-compile/node_modules/electron-compilers|n
2222var electronVersion = jsonValue ( prebuiltPackageJSONPath , 'version' ) ;
2323var appName = jsonValue ( 'package.json' , 'appName' ) ;
2424
25- proc . spawnSync ( compileCmd , [ ] , { stdio : 'inherit' } ) ;
26-
27- console . log ( 'Building ' , appName ) ;
28-
29- var args = [
30- './' ,
31- appName ,
32- '--overwrite' ,
33- '--platform' , argv . platform ,
34- '--arch' , argv . arch ,
35- '--version' , electronVersion ,
36- '--ignore' , ignorePaths ,
37- '--out' , buildOutputPath
38- ] ;
39-
40- var ignoreArgs = [ 'overwrite' , 'platform' , 'arch' , 'version' , 'ignore' , 'out' , '_' , '$0' ]
41- for ( var arg in argv ) {
42- if ( ignoreArgs . indexOf ( arg ) > - 1 ) continue ;
43-
44- if ( argv [ arg ] === true )
45- args . push ( '--' + arg )
46- else
47- args . push ( '--' + arg , argv [ arg ] )
25+ if ( process . platform === 'win32' ) {
26+ compileCmd += '.cmd' ;
4827}
4928
50- args = args . concat ( argv . _ ) ;
51- proc . spawn ( packagerCmd , args , { stdio : 'inherit' } ) ;
29+ var iconPath ;
30+ if ( argv . platform === 'win32' ) {
31+ iconPath = path . join ( "." , "resources" , "win" , "app.ico" )
32+ }
33+ else if ( argv . platform === 'darwin' ) {
34+ iconPath = path . join ( "." , "resources" , "mac" , "app.icns" )
35+ }
36+ else if ( argv . platform === 'linux' ) {
37+ iconPath = path . join ( "." , "resources" , "linux" )
38+ }
39+
40+ var compile = proc . spawn ( compileCmd , [ ] , { stdio : 'inherit' } ) ;
41+ compile . on ( 'close' , function ( ) {
42+ console . log ( 'Building ' , appName ) ;
43+
44+ var args = [
45+ packagerCmd ,
46+ './' ,
47+ appName ,
48+ '--overwrite' ,
49+ '--platform' , argv . platform ,
50+ '--arch' , argv . arch ,
51+ '--version' , electronVersion ,
52+ '--icon' , iconPath ,
53+ '--ignore' , ignorePaths ,
54+ '--out' , buildOutputPath
55+ ] ;
56+
57+ var ignoreArgs = [ 'overwrite' , 'platform' , 'arch' , 'version' , 'ignore' , 'out' , '_' , '$0' ]
58+ for ( var arg in argv ) {
59+ if ( ignoreArgs . indexOf ( arg ) > - 1 ) continue ;
60+
61+ if ( argv [ arg ] === true )
62+ args . push ( '--' + arg )
63+ else
64+ args . push ( '--' + arg , argv [ arg ] )
65+ }
66+
67+ args = args . concat ( argv . _ ) ;
68+ proc . spawn ( process . execPath , args , { stdio : 'inherit' } ) ;
69+ } ) ;
0 commit comments