From 7a7131220dfb96741a39ffdb1930e23aee099651 Mon Sep 17 00:00:00 2001 From: TanninOne Date: Sat, 25 Feb 2017 13:37:24 +0100 Subject: [PATCH] fixes for distribution builds --- BuildSubprojects.js | 9 +++++++-- InstallAssets.json | 14 +++++++++++--- app/package.json | 1 + licenses.json => assets/licenses.json | 0 modules.json => assets/modules.json | 0 extensions/gamebryo-plugin-management/package.json | 2 +- .../gamebryo-savegame-management/package.json | 2 +- extensions/meta-editor/package.json | 2 +- external/modmeta-db/package.json | 2 +- lib/js/nexus-api/lib/Nexus.js | 2 +- lib/js/nexus-api/lib/Nexus.js.map | 2 +- lib/js/nexus-api/lib/types.js | 1 - lib/js/nexus-api/lib/types.js.map | 2 +- lib/js/nexus-api/package.json | 2 +- package.json | 2 +- src/extensions/about_dialog/views/AboutDialog.tsx | 6 ++++-- 16 files changed, 32 insertions(+), 17 deletions(-) rename licenses.json => assets/licenses.json (100%) rename modules.json => assets/modules.json (100%) diff --git a/BuildSubprojects.js b/BuildSubprojects.js index cbd330d64..ffd5edf9a 100644 --- a/BuildSubprojects.js +++ b/BuildSubprojects.js @@ -1,6 +1,7 @@ const Promise = require('bluebird'); const { spawn } = require('child_process'); const copyfiles = require('copyfiles'); +const rebuild = require('electron-rebuild').default; const fs = require('fs-extra-promise'); const glob = require('glob'); const minimist = require('minimist'); @@ -10,8 +11,10 @@ const vm = require('vm'); const projectGroups = fs.readJSONSync('./BuildSubprojects.json'); +const packageJSON = fs.readJSONSync('./package.json'); + const npmcli = process.platform === 'win32' ? 'npm.cmd' : 'npm'; -const rebuild = path.join('node_modules', '.bin', process.platform === 'win32' ? 'electron-rebuild.cmd' : 'electron-rebuild'); +//const rebuild = path.join('node_modules', '.bin', process.platform === 'win32' ? 'electron-rebuild.cmd' : 'electron-rebuild'); const globOptions = { }; const copyfilesAsync = Promise.promisify(copyfiles); @@ -187,7 +190,9 @@ function processRebuild(project, buildType, feedback) { ? __dirname : path.join(__dirname, buildType); - return spawnAsync(rebuild, ['-w', project.module, '-m', moduleDir], {}, feedback); + return rebuild(moduleDir, packageJSON.engines.electron, process.arch, [project.module]); + + //return spawnAsync(rebuild, ['-w', project.module, '-m', moduleDir], {}, feedback); } function evalCondition(condition, context) { diff --git a/InstallAssets.json b/InstallAssets.json index c21af546f..d72e940ca 100644 --- a/InstallAssets.json +++ b/InstallAssets.json @@ -60,7 +60,7 @@ "skipPaths": 1 }, { - "srcPath": "assets/fonts/*", + "srcPath": "locales/*/*", "outPath": "", "target": [ "out", @@ -68,7 +68,7 @@ ] }, { - "srcPath": "locales/*/*", + "srcPath": "assets/images/", "outPath": "", "target": [ "out", @@ -76,7 +76,15 @@ ] }, { - "srcPath": "assets/images/", + "srcPath": "assets/fonts/*", + "outPath": "", + "target": [ + "out", + "app" + ] + }, + { + "srcPath": "assets/*.json", "outPath": "", "target": [ "out", diff --git a/app/package.json b/app/package.json index b210b05fe..eb8cbd147 100644 --- a/app/package.json +++ b/app/package.json @@ -54,6 +54,7 @@ "react-layout-pane": "TanninOne/react-layout-pane", "react-redux": "^4.4.5", "react-sortable-tree": "^0.1.8", + "react-tabs": "^0.8.2", "recharts": "^0.20.8", "redux": "^3.5.2", "redux-act": "^0.5.0", diff --git a/licenses.json b/assets/licenses.json similarity index 100% rename from licenses.json rename to assets/licenses.json diff --git a/modules.json b/assets/modules.json similarity index 100% rename from modules.json rename to assets/modules.json diff --git a/extensions/gamebryo-plugin-management/package.json b/extensions/gamebryo-plugin-management/package.json index 410ae1fa9..90d0ce0ee 100644 --- a/extensions/gamebryo-plugin-management/package.json +++ b/extensions/gamebryo-plugin-management/package.json @@ -10,7 +10,7 @@ "postinstall": "electron-rebuild -w esptk,loot", "copy_esptk": "copyfiles -f ./node_modules/esptk/build/Release/nbind.node ./dist/esptk", "copy_loot": "copyfiles -f ./node_modules/loot/build/Release/nbind.node ./dist/loot && copyfiles -f ./node_modules/loot/loot_api/loot_api.dll ./dist/loot", - "prebuild": "typings install", + "prebuild": "typings prune && typings install", "build": "npm run tsc && npm run webpack && npm run copy_esptk && npm run copy_loot && copyfiles -f src/stylesheets/plugin_management.scss dist", "installDev": "copyfiles -u 1 dist/**/* ../../out/bundledPlugins/gamebryo-plugin-management", "buildDev": "npm run build && npm run installDev" diff --git a/extensions/gamebryo-savegame-management/package.json b/extensions/gamebryo-savegame-management/package.json index fdc1d3e1a..dfcd36348 100644 --- a/extensions/gamebryo-savegame-management/package.json +++ b/extensions/gamebryo-savegame-management/package.json @@ -9,7 +9,7 @@ "webpack": "node ./node_modules/webpack/bin/webpack --config webpack.config.js --display-error-details --progress --profile --color", "clear": "rm-local-modules", "postinstall": "electron-rebuild -w gamebryo-savegame", - "prebuild": "typings install", + "prebuild": "typings prune && typings install", "build": "npm run tsc && npm run webpack && copyfiles -f ./node_modules/gamebryo-savegame/dist/nbind.node ./dist/savegamelib && copyfiles -f ./node_modules/gamebryo-savegame/dist/liblz4.dll ./dist/savegamelib", "installDev": "copyfiles -u 1 dist/**/* ../../out/bundledPlugins/gamebryo-savegame-management", "buildDev": "npm run build && npm run installDev" diff --git a/extensions/meta-editor/package.json b/extensions/meta-editor/package.json index 6e74b9b0a..9b6f6665c 100644 --- a/extensions/meta-editor/package.json +++ b/extensions/meta-editor/package.json @@ -8,7 +8,7 @@ "tsc": "tsc -p .", "webpack": "node ./node_modules/webpack/bin/webpack --config webpack.config.js --display-error-details --progress --profile --color", "installDev": "copyfiles -f dist/* ../../out/bundledPlugins/meta-editor", - "prebuild": "typings install", + "prebuild": "typings prune && typings install", "build": "npm run tsc && npm run webpack && copyfiles -f src/stylesheets/metaeditor.scss dist", "buildDev": "npm run build && npm run installDev" }, diff --git a/external/modmeta-db/package.json b/external/modmeta-db/package.json index 9b0908ef9..456c39251 100644 --- a/external/modmeta-db/package.json +++ b/external/modmeta-db/package.json @@ -4,7 +4,7 @@ "description": "Serves dependency and other meta information for mod files.", "main": "lib/index.js", "scripts": { - "typings": "typings install", + "typings": "typings prune && typings install", "build": "tsc -p ." }, "typings": "lib/index", diff --git a/lib/js/nexus-api/lib/Nexus.js b/lib/js/nexus-api/lib/Nexus.js index dae20eb0e..e0aacda4f 100644 --- a/lib/js/nexus-api/lib/Nexus.js +++ b/lib/js/nexus-api/lib/Nexus.js @@ -1,5 +1,4 @@ "use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); const Promise = require("bluebird"); const node_rest_client_1 = require("node-rest-client"); class NexusError extends Error { @@ -141,5 +140,6 @@ class Nexus { this.mRestClient.registerMethod('getDownloadURLs', this.mBaseURL + '/games/${gameId}/mods/${modId}/files/${fileId}/download_link', 'GET'); } } +Object.defineProperty(exports, "__esModule", { value: true }); exports.default = Nexus; //# sourceMappingURL=Nexus.js.map \ No newline at end of file diff --git a/lib/js/nexus-api/lib/Nexus.js.map b/lib/js/nexus-api/lib/Nexus.js.map index e5eb072f9..410f2d0db 100644 --- a/lib/js/nexus-api/lib/Nexus.js.map +++ b/lib/js/nexus-api/lib/Nexus.js.map @@ -1 +1 @@ -{"version":3,"file":"Nexus.js","sourceRoot":"","sources":["../src/Nexus.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"Nexus.js","sourceRoot":"","sources":["../src/Nexus.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/js/nexus-api/lib/types.js b/lib/js/nexus-api/lib/types.js index 2004e03da..5a01ec1f0 100644 --- a/lib/js/nexus-api/lib/types.js +++ b/lib/js/nexus-api/lib/types.js @@ -1,4 +1,3 @@ "use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); ; //# sourceMappingURL=types.js.map \ No newline at end of file diff --git a/lib/js/nexus-api/lib/types.js.map b/lib/js/nexus-api/lib/types.js.map index d6d8cf48e..6a1d27ab4 100644 --- a/lib/js/nexus-api/lib/types.js.map +++ b/lib/js/nexus-api/lib/types.js.map @@ -1 +1 @@ -{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;AAQC,CAAC"} \ No newline at end of file +{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";AAQC,CAAC"} \ No newline at end of file diff --git a/lib/js/nexus-api/package.json b/lib/js/nexus-api/package.json index d98f16458..be347813b 100644 --- a/lib/js/nexus-api/package.json +++ b/lib/js/nexus-api/package.json @@ -9,7 +9,7 @@ ], "description": "API for the Nexus Mods page", "scripts": { - "postinstall": "typings install", + "postinstall": "typings prune && typings install", "build": "tsc -p ." }, "author": "Black Tree Gaming Ltd.", diff --git a/package.json b/package.json index 9f989c72e..0a56bf1d1 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "installex": "npm install && npm run build", "preinstall": "git submodule update --init --recursive", - "postinstall": "typings install", + "postinstall": "typings prune && typings install", "lessc": "lessc --clean-css --include-path=node_modules/bootswatch:node_modules/bootstrap-less src/stylesheets/index.less out/assets/css/base.css", "sassc": "node-sass src/stylesheets/index.scss out/assets/css/base.css", diff --git a/src/extensions/about_dialog/views/AboutDialog.tsx b/src/extensions/about_dialog/views/AboutDialog.tsx index eff49fe7f..194138d44 100644 --- a/src/extensions/about_dialog/views/AboutDialog.tsx +++ b/src/extensions/about_dialog/views/AboutDialog.tsx @@ -2,6 +2,8 @@ import { ComponentEx, translate } from '../../../util/ComponentEx'; import { ILicense } from '../types/ILicense'; +import {remote} from 'electron'; +import * as path from 'path'; import * as React from 'react'; import { Button, Modal } from 'react-bootstrap'; import { Tab, TabList, TabPanel, Tabs } from 'react-tabs'; @@ -17,8 +19,8 @@ class AboutDialog extends ComponentEx { public render(): JSX.Element { const { t, shown, onHide } = this.props; const fs = require('fs-extra-promise'); - const modules = fs.readJSONSync('./modules.json'); - const licenses = fs.readJSONSync('./licenses.json'); + const modules = fs.readJSONSync(path.join(remote.app.getAppPath(), 'assets', 'modules.json')); + const licenses = fs.readJSONSync(path.join(remote.app.getAppPath(), 'assets', 'licenses.json')); let licenseList = []; let moduleList = [];