ride: 4.5.4097 -> 4.6.4265
Changelog: https://github.com/Dyalog/ride/releases/tag/v4.6.4265
This commit is contained in:
@@ -22,19 +22,19 @@ index a5baa0f..4ed2350 100644
|
||||
},
|
||||
};
|
||||
wf('_/version.js', `D=${JSON.stringify(vi)}`);
|
||||
@@ -51,8 +51,7 @@ const incl = new RegExp('^$'
|
||||
const pkg = (x, y, f) => {
|
||||
rq('electron-packager')({
|
||||
@@ -53,8 +53,7 @@ const pkg = (x, y, f) => {
|
||||
const tmpdir = `/tmp/ridebuild_${version}_${rq('os').userInfo().username}`;
|
||||
rq('@electron/packager')({
|
||||
dir: '.',
|
||||
- platform: x,
|
||||
- arch: y,
|
||||
+ asar: true,
|
||||
tmpdir: '/tmp/ridebuild',
|
||||
tmpdir,
|
||||
out: `_/${pj.name}`,
|
||||
overwrite: true,
|
||||
@@ -79,8 +78,8 @@ const pkg = (x, y, f) => {
|
||||
ProductName: 'RIDE',
|
||||
InternalName: 'RIDE',
|
||||
@@ -81,8 +80,8 @@ const pkg = (x, y, f) => {
|
||||
ProductName: 'Ride',
|
||||
InternalName: 'Ride',
|
||||
},
|
||||
- }).then(() => {
|
||||
- const d = `_/${pj.name}/${pj.productName}-${x}-${y}`;
|
||||
@@ -43,15 +43,15 @@ index a5baa0f..4ed2350 100644
|
||||
rm(`${d}/version`);
|
||||
fs.existsSync(`${d}/LICENSE`) && mv(`${d}/LICENSE`, `${d}/LICENSE.electron`);
|
||||
generateLicenses(`${d}/ThirdPartyNotices.txt`);
|
||||
@@ -88,6 +87,7 @@ const pkg = (x, y, f) => {
|
||||
@@ -90,6 +89,7 @@ const pkg = (x, y, f) => {
|
||||
}, e => f(e));
|
||||
};
|
||||
|
||||
+const self = (f) => { b(e => (e ? f(e) : pkg(undefined, undefined, f))); };
|
||||
const l = (f) => { b(e => (e ? f(e) : pkg('linux', 'x64', f))); };
|
||||
const la= (f) => { b(e => (e ? f(e) : pkg('linux', 'arm64', f))); };
|
||||
const w = (f) => { b(e => (e ? f(e) : pkg('win32', 'ia32', f))); };
|
||||
const o = (f) => { b(e => (e ? f(e) : pkg('darwin', 'x64', f))); };
|
||||
@@ -109,6 +109,7 @@ tasks.ma=ma; tasks.masarm = ma;
|
||||
@@ -113,6 +113,7 @@ tasks.ma=ma; tasks.masarm = ma;
|
||||
tasks.a = a; tasks.arm = a;
|
||||
tasks.d = d; tasks.dist = d;
|
||||
tasks.c = c; tasks.clean = c;
|
||||
|
||||
@@ -16,25 +16,18 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "ride";
|
||||
version = "4.5.4097";
|
||||
version = "4.6.4265";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dyalog";
|
||||
repo = "ride";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-xR+HVC1JVrPkgPhIJZxdTVG52+QbanmD1c/uO5l84oc=";
|
||||
hash = "sha256-11wlKK0z3/KRKMKNrDvZLvK7vV0UzrMTaG0ei9n6VEk=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-C8puCz/w5xkaR4QVXXOdoO8n4gNZrRWMcB9/f1DcuMc=";
|
||||
npmDepsHash = "sha256-1+RjSr5FSaQFqkL/yzlAQhm56NVG2kjzZC/DsEi3HJE=";
|
||||
|
||||
patches = [
|
||||
# Adds support for electron versions >=28
|
||||
(fetchpatch {
|
||||
name = "bump-electron-version.patch";
|
||||
url = "https://github.com/Dyalog/ride/commit/de42ebbd5036cfe0c7e6604296e87cc57ac9d365.patch";
|
||||
hash = "sha256-5iKSNcxOOo2fKNvy3Rv+AlH3psYhLWLWUY0l8M6mAD4=";
|
||||
})
|
||||
|
||||
# Fix info in the "about" page, enable asar, add option to build for the detected system
|
||||
(replaceVars ./mk.patch {
|
||||
inherit version;
|
||||
@@ -90,7 +83,7 @@ buildNpmPackage rec {
|
||||
rm -r electron-dist
|
||||
|
||||
# force electron-packager to use our electron instead of downloading it, even if it is a different version
|
||||
substituteInPlace node_modules/electron-packager/src/index.js \
|
||||
substituteInPlace node_modules/@electron/packager/dist/packager.js \
|
||||
--replace-fail 'await this.getElectronZipPath(downloadOpts)' '"electron.zip"'
|
||||
'';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user