Skip to content

Commit

Permalink
Merge branch 'master' of github.com:loopline-systems/electron-builder
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanjudis committed Nov 25, 2015
2 parents 23c9290 + 55bbd44 commit e45872a
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 4 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ config.json.sample:
},
"win" : {
"title" : "Loopline Systems",
"version" : "x.x.x.x",
"icon" : "assets/win/icon.ico",
"nsiTemplate" : "path/to/custom/installer.nsi.tpl"
}
Expand All @@ -129,6 +130,9 @@ This property contains the configuration for the OSX dmg window. This property i
### `win.title`
Title of your application shown in generated windows installer.

### `win.version`
Version of your application shown in add/remove programs list.

### `win.icon`
Icon to be shown in installation process.

Expand Down
3 changes: 2 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
var platforms = require( './lib/platforms' );
var path = require( 'path' );
var fs = require( 'fs' );
var mkdirp = require( 'mkdirp' );

/**
* Prototype for electron-builder
Expand Down Expand Up @@ -42,7 +43,7 @@ var Builder = {
// directory exists
if ( !fs.existsSync( options.out ) ) {
options.log( '- Ouput directory ´' + options.out + '´ does not exist ' );
fs.mkdirSync( options.out );
mkdirp.sync( options.out );
options.log( '- Created ´' + options.out + '´ ' );
}

Expand Down
1 change: 1 addition & 0 deletions lib/win.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ var WinBuilder = {
var configFilePath = writeConfigFile( nsiTemplate, {
appPath : _windowsify( options.appPath ),
name : options.config.win.title,
version : options.config.win.version,
out : _windowsify( options.out )
} );

Expand Down
23 changes: 20 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,23 @@
"url": "https://github.com/loopline-systems/electron-builder.git"
},
"keywords": [
"electron"
"electron",
"builder",
"build",
"installer",
"install",
"packager",
"pack",
"nsis",
"appdmg",
"app",
"dmg",
"msi",
"exe",
"setup",
"Windows",
"OS X",
"Mac"
],
"bin": {
"electron-builder": "cli.js"
Expand All @@ -28,7 +44,8 @@
"lodash.assign": "^3.2.0",
"lodash.camelcase": "^3.0.1",
"lodash.template": "^3.6.1",
"meow": "^3.1.0"
"meow": "^3.1.0",
"mkdirp": "^0.5.1"
},
"optionalDependencies": {
"appdmg": "^0.3.1"
Expand All @@ -37,7 +54,7 @@
"eslint": "^0.21.2",
"proxyquire": "^1.5.0",
"tap-nyan": "0.0.2",
"tap-spec": "^3.0.0",
"tap-spec": "^4.1.1",
"tape": "^4.0.0",
"tmp": "0.0.28"
}
Expand Down
3 changes: 3 additions & 0 deletions templates/installer.nsi.tpl
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
!define APP_NAME "<%= name %>"
!define APP_VERSION "<%= version %>"
!define APP_DIR "${APP_NAME}"

Name "${APP_NAME}"
Expand Down Expand Up @@ -58,6 +59,8 @@ Section
"UninstallString" "$INSTDIR\Uninstall ${APP_NAME}.exe"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" \
"DisplayIcon" "$INSTDIR\icon.ico"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" \
"DisplayVersion" "$APP_VERSION"
SectionEnd

# create a section to define what the uninstaller does
Expand Down

0 comments on commit e45872a

Please sign in to comment.