From 26a74d16a97c8b7d29f024169b8cedabfcfa97d1 Mon Sep 17 00:00:00 2001 From: Ramiro Saenz Date: Thu, 2 Jun 2016 10:32:34 -0300 Subject: [PATCH] Minor fixes --- build/winstaller.js | 2 +- package.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/winstaller.js b/build/winstaller.js index 4df40c76..68d24b65 100644 --- a/build/winstaller.js +++ b/build/winstaller.js @@ -12,7 +12,7 @@ if ( !arch ) { var resultPromise = electronInstaller.createWindowsInstaller({ appDirectory: './dist/Rambox-win32-'+arch - ,outputDirectory: './dist' + ,outputDirectory: './dist/setup-'+arch ,title: 'Rambox' ,loadingGif: './resources/installer/loading.gif' ,authors: 'Rambox' diff --git a/package.json b/package.json index b91e9ae5..53c9d428 100644 --- a/package.json +++ b/package.json @@ -19,10 +19,11 @@ "pack:linux64": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=linux --arch=x64 --version=1.1.1 --icon=resources/installer/Icon.ico --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite", "build": "npm run build:osx && npm run build:win", "build:osx": "build \"dist/Rambox-darwin-x64/Rambox.app\" --platform=osx", + "build:win": "node ./build/winstaller.js ia32 && node ./build/winstaller.js x64", "build:win32": "node ./build/winstaller.js ia32", "build:win64": "node ./build/winstaller.js x64", "setup:osx": "npm run sencha:clean && npm run sencha:compile && npm run clean:osx && npm run pack:osx && npm run build:osx", - "setup:win": "npm run sencha:clean && npm run sencha:compile && npm run clean:win && npm run pack:win && npm run build:win64", + "setup:win": "npm run sencha:clean && npm run sencha:compile && npm run clean:win && npm run pack:win && npm run build:win && mv ./dist/setup-ia32/RELEASES ./dist/setup-ia32/RELEASES-ia32 && mv ./dist/setup-x64/RELEASES ./dist/setup-x64/RELEASES-x64", "zip:win32": "bestzip \"dist/Rambox-win32-ia32-portable.zip\" \"dist/Rambox-win32-ia32/*\"", "zip:win64": "bestzip \"dist/Rambox-win32-x64-portable.zip\" \"dist/Rambox-win32-x64/*\"", "zip:linux32": "bestzip \"dist/Rambox-linux-ia32.zip\" \"dist/Rambox-linux-ia32/*\"",