Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-27 17:34:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2024-05-29 10:53:51 +08:00
commit efea27940e
10 changed files with 189 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

75
app/electron-builder-arm64.yml Normal file
View file

@ -0,0 +1,75 @@
productName: "SiYuan"
appId: "org.b3log.siyuan"
asar: false
compression: "store"
copyright: "© 2024 Yunnan Liandi Technology Co., Ltd."
artifactName: "siyuan-${version}-${os}-arm64.${ext}"
extraMetadata:
main: "electron/main.js"
directories:
output: "build"
files:
- "electron"
extraFiles:
- from: "../LICENSE"
to: "LICENSE"
win:
icon: "src/assets/icon.ico"
extraResources:
- from: "kernel-arm64"
to: "kernel"
requestedExecutionLevel: "asInvoker"
# certificateSubjectName: "Yunnan Liandi Technology Co., Ltd."
signingHashAlgorithms: [ 'sha256' ]
#rfc3161TimeStampServer: "http://sha256timestamp.ws.symantec.com/sha256/timestamp"
#rfc3161TimeStampServer: "http://time.certum.pl"
rfc3161TimeStampServer: "http://timestamp.entrust.net/TSS/RFC3161sha2TS"
target:
- target: "nsis"
arch: "arm64"
nsis:
oneClick: false
perMachine: false
allowToChangeInstallationDirectory: true
allowElevation: true
deleteAppDataOnUninstall: true
createDesktopShortcut: true
createStartMenuShortcut: true
shortcutName: "SiYuan"
license: "../LICENSE"
include: "nsis/installer.nsh"
warningsAsErrors: false
installerSidebar: "nsis/installerSidebar.bmp"
uninstallerSidebar: "nsis/uninstallerSidebar.bmp"
extraResources:
- from: "changelogs"
to: "changelogs"
- from: "stage"
to: "stage"
- from: "guide"
to: "guide"
filter: "!**/{.DS_Store,.git,.gitignore,.idea}"
- from: "appearance/boot"
to: "appearance/boot"
filter: "!**/{.DS_Store}"
- from: "appearance/icons"
to: "appearance/icons"
filter: "!**/{.DS_Store}"
- from: "appearance/langs"
to: "appearance/langs"
filter: "!**/{.DS_Store}"
- from: "appearance/emojis"
to: "appearance/emojis"
filter: "!**/{.DS_Store}"
- from: "appearance/themes/midnight"
to: "appearance/themes/midnight"
filter: "!**/{.DS_Store,custom.css}"
- from: "appearance/themes/daylight"
to: "appearance/themes/daylight"
filter: "!**/{.DS_Store,custom.css}"
- from: "src/assets/fonts"
to: "appearance/fonts"
filter: "!**/{.DS_Store}"
- from: "pandoc/pandoc-windows-amd64.zip"
to: "pandoc.zip"

59
app/electron-builder-linux-arm64.yml Normal file
View file

@ -0,0 +1,59 @@
productName: "SiYuan"
appId: "org.b3log.siyuan"
asar: false
compression: "store"
copyright: "© 2024 Yunnan Liandi Technology Co., Ltd."
artifactName: "siyuan-${version}-${os}-arm64.${ext}"
extraMetadata:
main: "electron/main.js"
directories:
output: "build"
files:
- "electron"
extraFiles:
- from: "../LICENSE"
to: "LICENSE"
linux:
icon: "src/assets/icon.png"
category: "Utility"
extraResources:
- from: "kernel-linux-arm64"
to: "kernel"
target:
- target: "tar.gz"
arch: "arm64"
- target: "AppImage"
arch: "arm64"
extraResources:
- from: "changelogs"
to: "changelogs"
- from: "stage"
to: "stage"
- from: "guide"
to: "guide"
filter: "!**/{.DS_Store,.git,.gitignore,.idea}"
- from: "appearance/boot"
to: "appearance/boot"
filter: "!**/{.DS_Store}"
- from: "appearance/icons"
to: "appearance/icons"
filter: "!**/{.DS_Store}"
- from: "appearance/langs"
to: "appearance/langs"
filter: "!**/{.DS_Store}"
- from: "appearance/emojis"
to: "appearance/emojis"
filter: "!**/{.DS_Store}"
- from: "appearance/themes/midnight"
to: "appearance/themes/midnight"
filter: "!**/{.DS_Store,custom.css}"
- from: "appearance/themes/daylight"
to: "appearance/themes/daylight"
filter: "!**/{.DS_Store,custom.css}"
- from: "src/assets/fonts"
to: "appearance/fonts"
filter: "!**/{.DS_Store}"
- from: "pandoc/pandoc-linux-amd64.zip"
to: "pandoc.zip"

2
app/electron-builder-linux.yml
View file

@ -1,7 +1,7 @@
productName: "SiYuan"
appId: "org.b3log.siyuan"
asar: false
compression: "normal"
compression: "store"
copyright: "© 2024 Yunnan Liandi Technology Co., Ltd."
artifactName: "siyuan-${version}-${os}.${ext}"
extraMetadata:

2
app/electron-builder.yml
View file

@ -1,7 +1,7 @@
productName: "SiYuan"
appId: "org.b3log.siyuan"
asar: false
compression: "normal"
compression: "store"
copyright: "© 2024 Yunnan Liandi Technology Co., Ltd."
artifactName: "siyuan-${version}-${os}.${ext}"
extraMetadata:

4
app/package.json
View file

@ -19,9 +19,11 @@
"start": "NODE_ENV=development electron ./electron/main.js",
"dist-appx": "ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ electron-builder --config electron-appx-builder.yml",
"dist": "ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ electron-builder --config electron-builder.yml --publish=never",
"dist-arm64": "ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ electron-builder --arm64 --config electron-builder-arm64.yml --publish=never",
"dist-darwin": "ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ electron-builder --mac --config electron-builder-darwin.yml --publish=never",
"dist-darwin-arm64": "ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ electron-builder --arm64 --mac --config electron-builder-darwin-arm64.yml --publish=never",
"dist-linux": "ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ electron-builder --linux --config electron-builder-linux.yml --publish=never"
"dist-linux": "ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ electron-builder --linux --config electron-builder-linux.yml --publish=never",
"dist-linux-arm64": "ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ electron-builder --arm64 --linux --config electron-builder-linux-arm64.yml --publish=never"
},
"keywords": [
"markdown",