From 977ab0290f4310762ff14a025a0953f821abfc6c Mon Sep 17 00:00:00 2001 From: jtc42 Date: Tue, 7 May 2019 19:27:22 +0100 Subject: [PATCH] Split builder config --- app/builder-config-appx.yaml | 13 +++++++++++++ app/builder-config-base.yaml | 27 +++++++++++++++++++++++++++ app/builder-config-dmg.yaml | 13 +++++++++++++ app/builder-config-linux.yaml | 12 ++++++++++++ app/builder-config-raspi.yaml | 11 +++++++++++ app/builder-config-win.yaml | 35 +---------------------------------- package.json | 6 +++++- 7 files changed, 82 insertions(+), 35 deletions(-) create mode 100644 app/builder-config-appx.yaml create mode 100644 app/builder-config-base.yaml create mode 100644 app/builder-config-dmg.yaml create mode 100644 app/builder-config-linux.yaml create mode 100644 app/builder-config-raspi.yaml diff --git a/app/builder-config-appx.yaml b/app/builder-config-appx.yaml new file mode 100644 index 00000000..addc17f3 --- /dev/null +++ b/app/builder-config-appx.yaml @@ -0,0 +1,13 @@ +extends: app/builder-config-base.yaml +win: + target: + - NSIS + - appx + icon: app/icons/win/icon.ico +appx: + applicationId: OpenFlexureEV + identityName: 60425J.T.Collins.OpenFlexureeV + publisher: CN=CC867BEF-0715-4D48-8035-8881993DBB68 + publisherDisplayName: J. T. Collins + backgroundColor: '#C5247F' +electronVersion: 4.1.5 diff --git a/app/builder-config-base.yaml b/app/builder-config-base.yaml new file mode 100644 index 00000000..9c0642e5 --- /dev/null +++ b/app/builder-config-base.yaml @@ -0,0 +1,27 @@ +directories: + output: release-builds + buildResources: app/resources +appId: org.openflexure.ev +artifactName: ${name}-${os}-${arch}.${ext} +asar: true +files: + - filter: + - '**/*' + - '!**/node_modules/*/{CHANGELOG.md,README.md,README,readme.md,readme}' + - '!**/node_modules/*/{test,__tests__,tests,powered-test,example,examples}' + - '!**/node_modules/*.d.ts' + - '!**/node_modules/.bin' + - '!**/*.{iml,o,hprof,orig,pyc,pyo,rbc,swp,csproj,sln,xproj}' + - '!.editorconfig' + - '!**/._*' + - '!**/{.DS_Store,.git,.hg,.svn,CVS,RCS,SCCS,.gitignore,.gitattributes}' + - '!**/{__pycache__,thumbs.db,.flowconfig,.idea,.vs,.nyc_output}' + - '!**/{appveyor.yml,.travis.yml,circle.yml}' + - '!**/{npm-debug.log,yarn.lock,.yarn-integrity,.yarn-metadata.json}' + - '!**/.env.*' + - '!**/{.idea,.vscode}${/*}' + - '!**/app/installers${/*}' + - '!**/hooks${/*}' + - '!**/platforms${/*}' + - '!**/release-builds${/*}' + - '!src${/*}' diff --git a/app/builder-config-dmg.yaml b/app/builder-config-dmg.yaml new file mode 100644 index 00000000..c2ab40be --- /dev/null +++ b/app/builder-config-dmg.yaml @@ -0,0 +1,13 @@ +extends: app/builder-config-base.yaml +mac: + icon: app/icons/mac/icon.icns + category: public.app-category.utilities +dmg: + contents: + - x: 110 + y: 150 + - x: 240 + y: 150 + type: link + path: /Applications +electronVersion: 4.1.5 diff --git a/app/builder-config-linux.yaml b/app/builder-config-linux.yaml new file mode 100644 index 00000000..56d965a1 --- /dev/null +++ b/app/builder-config-linux.yaml @@ -0,0 +1,12 @@ +extends: app/builder-config-base.yaml +linux: + target: + - AppImage + - target: deb + arch: + - x64 + - armv7l + icon: app/icons/png/1024x1024.png +deb: + category: Science +electronVersion: 4.1.5 diff --git a/app/builder-config-raspi.yaml b/app/builder-config-raspi.yaml new file mode 100644 index 00000000..1894918b --- /dev/null +++ b/app/builder-config-raspi.yaml @@ -0,0 +1,11 @@ +extends: app/builder-config-base.yaml +linux: + target: + - AppImage + - target: deb + arch: + - armv7l + icon: app/icons/png/1024x1024.png +deb: + category: Science +electronVersion: 3.0.13 diff --git a/app/builder-config-win.yaml b/app/builder-config-win.yaml index 2ed3008e..9a6b6d37 100644 --- a/app/builder-config-win.yaml +++ b/app/builder-config-win.yaml @@ -1,39 +1,6 @@ -directories: - output: release-builds - buildResources: app/resources -appId: org.openflexure.ev -artifactName: ${name}-${os}-${arch}.${ext} -asar: true -files: - - filter: - - '**/*' - - '!**/node_modules/*/{CHANGELOG.md,README.md,README,readme.md,readme}' - - '!**/node_modules/*/{test,__tests__,tests,powered-test,example,examples}' - - '!**/node_modules/*.d.ts' - - '!**/node_modules/.bin' - - '!**/*.{iml,o,hprof,orig,pyc,pyo,rbc,swp,csproj,sln,xproj}' - - '!.editorconfig' - - '!**/._*' - - '!**/{.DS_Store,.git,.hg,.svn,CVS,RCS,SCCS,.gitignore,.gitattributes}' - - '!**/{__pycache__,thumbs.db,.flowconfig,.idea,.vs,.nyc_output}' - - '!**/{appveyor.yml,.travis.yml,circle.yml}' - - '!**/{npm-debug.log,yarn.lock,.yarn-integrity,.yarn-metadata.json}' - - '!**/.env.*' - - '!**/{.idea,.vscode}${/*}' - - '!**/app/installers${/*}' - - '!**/hooks${/*}' - - '!**/platforms${/*}' - - '!**/release-builds${/*}' - - '!src${/*}' +extends: app/builder-config-base.yaml win: target: - NSIS - - appx icon: app/icons/win/icon.ico -appx: - applicationId: OpenFlexureEV - identityName: 60425J.T.Collins.OpenFlexureeV - publisher: CN=CC867BEF-0715-4D48-8035-8881993DBB68 - publisherDisplayName: J. T. Collins - backgroundColor: '#C5247F' electronVersion: 4.1.5 diff --git a/package.json b/package.json index f4e74cd2..40bac1ff 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,12 @@ "license": "GNU General Public License v3.0 ", "main": "./app/app.js", "scripts": { - "dist:all": "electron-builder --linux --win --config app/builder-config.yaml", + "dist:all": "npm run dist:linux && npm run dist:raspi && npm run dist:win", + "dist:linux": "electron-builder --linux --config app/builder-config-linux.yaml", + "dist:raspi": "electron-builder --linux --config app/builder-config-raspi.yaml", "dist:win": "electron-builder --win --config app/builder-config-win.yaml", + "dist:appx": "electron-builder --win --config app/builder-config-appx.yaml", + "dist:dmg": "electron-builder --mac --config app/builder-config-dmg.yaml", "release": "npm run build:web && npm run dist:all", "build:android": "npm run setup-webpack-config && tns build android --bundle --env.production && npm run remove-webpack-config", "build:ios": "npm run setup-webpack-config && tns build ios --bundle --env.production && npm run remove-webpack-config",