TagSpaces is an offline, open source, document manager with tagging support
fix: various issue packaging issues for windows and linux
Ilian Sapundshiev35ee8907fa65
diff --git a/.gitignore b/.gitignoreindex cfd3265d4..bb58acf52 100644--- a/.gitignore+++ b/.gitignore@@ -84,6 +84,10 @@ web/third-party.txtweb/sw-config.jsweb/EULA.txt+# Generated by scripts/build-licenses.js on every prebuild+assets/license_en.rtf+tagspacespro/EULA.rtf+.envsrc/.envsrc/main/configdiff --git a/package.json b/package.jsonindex 2d8dd7ea8..d2a162205 100644--- a/package.json+++ b/package.json@@ -62,6 +62,7 @@"gen-third-party-extensions": "node -r ts-node/register scripts/generateExtensionsConfig.ts ./web/third-party/extensions","generate-extensions": "node -r ts-node/register scripts/generateExtensionsConfig.ts","generate-jwt": "node scripts/jwt_generate.js",+ "gen-licenses": "node scripts/build-licenses.js","install-ext-node": "rimraf release/app/node_modules && cd ./release/app && npm install && cd ../.. && npm run generate-extensions","install-ext-node-check": "npx cross-env PD_PLATFORM=node node scripts/checkWSinstalled.js","install-ext-web": "rimraf release/app/node_modules && cd ./release/app && npm install && cd ../..",@@ -79,8 +80,8 @@"package-linux-arm64": "npm run install-ext-node && npm run clean-pro-ext && npm run generate-extensions && ts-node ./.erb/scripts/clean.js && npm run build && npm run clean-maps && electron-builder --linux --arm64 --config resources/builder.json","package-linux-pro": "npm run install-ext-node && npm run generate-extensions && ts-node ./.erb/scripts/clean.js && npm run build && npm run clean-maps && electron-builder --linux --config node_modules/@tagspacespro/tagspacespro/resources/builder-pro.json","package-linux-arm64-pro": "npm run install-ext-node && npm run generate-extensions && ts-node ./.erb/scripts/clean.js && npm run build && npm run clean-maps && electron-builder --linux --arm64 --config node_modules/@tagspacespro/tagspacespro/resources/builder-pro.json",- "package-all-lite": "npm run install-ext-node && npm run clean-pro-ext && npm run generate-extensions && ts-node ./.erb/scripts/clean.js && npm run build && npm run clean-maps && electron-builder --linux --mac --x64 --arm64 --config resources/builder.json",- "package-all-pro": "npm run install-ext-node && npm run generate-extensions && ts-node ./.erb/scripts/clean.js && npm run build && npm run clean-maps && electron-builder --linux --mac --x64 --arm64 --config node_modules/@tagspacespro/tagspacespro/resources/builder-pro.json",+ "package-all-lite": "npm run install-ext-node && npm run clean-pro-ext && npm run generate-extensions && ts-node ./.erb/scripts/clean.js && npm run build && npm run clean-maps && electron-builder --linux --mac --win --x64 --arm64 --config resources/builder.json",+ "package-all-pro": "npm run install-ext-node && npm run generate-extensions && ts-node ./.erb/scripts/clean.js && npm run build && npm run clean-maps && electron-builder --linux --mac --win --x64 --arm64 --config node_modules/@tagspacespro/tagspacespro/resources/builder-pro.json","package-mac": "npm run install-ext-node && npm run clean-pro-ext && npm run generate-extensions && ts-node ./.erb/scripts/clean.js && npm run build && npm run clean-maps && electron-builder --mac --x64 --config resources/builder.json","package-mac-arm64": "npm run install-ext-node && npm run clean-pro-ext && npm run generate-extensions && ts-node ./.erb/scripts/clean.js && npm run build && npm run clean-maps && electron-builder --mac --arm64 --config resources/builder.json","package-mac-arm64-pro": "npm run install-ext-node && npm run generate-extensions && ts-node ./.erb/scripts/clean.js && npm run build && npm run clean-maps && electron-builder --mac --arm64 --config node_modules/@tagspacespro/tagspacespro/resources/builder-pro.json",@@ -100,7 +101,7 @@"postinstall": "ts-node .erb/scripts/check-native-dep.js && electron-builder install-app-deps && npm run prepare-node && node -r ts-node/register ./.erb/scripts/link-modules.ts && npm run build:dll","postlint-fix": "prettier --ignore-path .eslintignore --single-quote --write '**/*.{*{js,jsx,json},babelrc,eslintrc,prettierrc,stylelintrc}'","postlint-styles-fix": "prettier --ignore-path .eslintignore --single-quote --write '**/*.{css,scss}'",- "prebuild": "rimraf release/app/dist && npm run prepare-node && npm run generate-extensions",+ "prebuild": "rimraf release/app/dist && npm run prepare-node && npm run generate-extensions && npm run gen-licenses","prestart": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.main.dev.ts","prepare": "husky install","prepare-capacitor": "npm run install-ext-web-check && rimraf capacitor/www/dist && rimraf capacitor/www/node_modules && shx cp -rL release/app/node_modules capacitor/www && shx cp LICENSE.txt capacitor/www",@@ -241,7 +242,7 @@"zod-to-json-schema": "3.25.1"},"optionalDependencies": {- "@tagspacespro/tagspacespro": "5.0.232"+ "@tagspacespro/tagspacespro": "5.0.233"},"devDependencies": {"@electron/rebuild": "4.0.3",diff --git a/release/app/package-lock.json b/release/app/package-lock.jsonindex 8495bc349..28410eec4 100644--- a/release/app/package-lock.json+++ b/release/app/package-lock.json@@ -10,7 +10,7 @@"hasInstallScript": true,"license": "AGPL-3.0","dependencies": {- "@tagspaces/extensions": "1.0.244",+ "@tagspaces/extensions": "1.0.245","@tagspaces/tagspaces-common-node": "4.7.2","@tagspaces/tagspaces-ws": "4.8.1","wasm-vips": "0.0.17",@@ -286,9 +286,9 @@}},"node_modules/@tagspaces/extensions": {- "version": "1.0.244",- "resolved": "https://registry.npmjs.org/@tagspaces/extensions/-/extensions-1.0.244.tgz",- "integrity": "sha512-OjWQpsfwQfpBAegQg0MEoxOdf94dNo1Z6RLCRPhvfmYOiy/1iI6/9UfsYLw/R5DKlwfD4O5TXv1Op2ozp3PVyA==",+ "version": "1.0.245",+ "resolved": "https://registry.npmjs.org/@tagspaces/extensions/-/extensions-1.0.245.tgz",+ "integrity": "sha512-WLrdekmc9PsCc813SWI43mcS0luaVTz04cvtB0RoDZpVgQ9PDlP5sMZC62l+ZG/yIDOwGzNO60/RAERRp4JB0w==","license": "MIT","engines": {"npm": ">= 6.14.15",@@ -872,9 +872,9 @@"optional": true},"@tagspaces/extensions": {- "version": "1.0.244",- "resolved": "https://registry.npmjs.org/@tagspaces/extensions/-/extensions-1.0.244.tgz",- "integrity": "sha512-OjWQpsfwQfpBAegQg0MEoxOdf94dNo1Z6RLCRPhvfmYOiy/1iI6/9UfsYLw/R5DKlwfD4O5TXv1Op2ozp3PVyA=="+ "version": "1.0.245",+ "resolved": "https://registry.npmjs.org/@tagspaces/extensions/-/extensions-1.0.245.tgz",+ "integrity": "sha512-WLrdekmc9PsCc813SWI43mcS0luaVTz04cvtB0RoDZpVgQ9PDlP5sMZC62l+ZG/yIDOwGzNO60/RAERRp4JB0w=="},"@tagspaces/tagspaces-common": {"version": "4.7.2",diff --git a/resources/builder.json b/resources/builder.jsonindex d6d7b7dd0..ca4bc6900 100644--- a/resources/builder.json+++ b/resources/builder.json@@ -61,7 +61,7 @@"oneClick": false,"allowToChangeInstallationDirectory": true,"include": "resources/installer.nsh",- "license": null+ "license": "assets/license_en.rtf"},"mac": {"target": ["pkg", "dmg"],@@ -75,13 +75,30 @@"sign": false},"pkg": {- "license": "assets/license_en.txt"+ "license": "assets/license_en.rtf"},"linux": {- "target": ["deb", "tar.gz", "appImage"],+ "target": [+ { "target": "deb", "arch": ["x64", "arm64"] },+ { "target": "tar.gz", "arch": ["x64", "arm64"] },+ { "target": "appImage", "arch": ["x64"] }+ ],"category": "Office","icon": "assets/icon.icns"},+ "deb": {+ "depends": [+ "libgtk-3-0 | libgtk-4-1",+ "libnotify4",+ "libnss3",+ "libxss1",+ "libxtst6",+ "xdg-utils",+ "libatspi2.0-0",+ "libsecret-1-0",+ "libuuid1"+ ]+ },"appImage": {"license": "assets/license_en.txt"},diff --git a/scripts/build-licenses.js b/scripts/build-licenses.jsnew file mode 100644index 000000000..b1d396c2d--- /dev/null+++ b/scripts/build-licenses.js@@ -0,0 +1,61 @@+/* Regenerate .rtf license files from the .txt sources.+ *+ * Why: NSIS (Windows installer) truncates UTF-8-with-BOM .txt files and+ * can't handle very long lines. RTF sidesteps both. macOS pkg also+ * renders RTF natively. Runs as part of `prebuild` so every packaging+ * run picks up the latest source text.+ */+const fs = require('fs');+const path = require('path');++const root = path.resolve(__dirname, '..');++const jobs = [+ { src: 'assets/license_en.txt', dst: 'assets/license_en.rtf' },+ { src: 'tagspacespro/EULA.txt', dst: 'tagspacespro/EULA.rtf' },+];++function escapeRtf(text) {+ let out = '';+ for (let i = 0; i < text.length; i++) {+ const ch = text[i];+ const code = text.charCodeAt(i);+ if (ch === '\\') out += '\\\\';+ else if (ch === '{') out += '\\{';+ else if (ch === '}') out += '\\}';+ else if (ch === '\n') out += '\\par\n';+ else if (ch === '\r') continue;+ else if (code > 127) {+ const signed = code > 0x7fff ? code - 0x10000 : code;+ out += `\\u${signed}?`;+ } else out += ch;+ }+ return out;+}++function txtToRtf(text) {+ if (text.charCodeAt(0) === 0xfeff) text = text.slice(1);+ text = text.replace(/\r\n/g, '\n').replace(/\r/g, '\n');+ return (+ '{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat' ++ '{\\fonttbl{\\f0\\fnil\\fcharset0 Segoe UI;}}\n' ++ '\\fs18\n' ++ escapeRtf(text) ++ '\n}'+ );+}++let generated = 0;+for (const job of jobs) {+ const src = path.join(root, job.src);+ const dst = path.join(root, job.dst);+ if (!fs.existsSync(src)) {+ console.log(`[build-licenses] skipping (missing source): ${job.src}`);+ continue;+ }+ fs.writeFileSync(dst, txtToRtf(fs.readFileSync(src, 'utf8')), 'utf8');+ console.log(`[build-licenses] ${job.src} -> ${job.dst}`);+ generated++;+}++if (generated === 0) console.log('[build-licenses] no licenses generated');