Zergling_man/thedesk
Zergling_man/thedesk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build

Browse Source
This commit is contained in:
cutls 2021-04-15 14:50:54 +09:00
parent f570ed36e8
commit ef1a16516f
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/build.js
View File

@ -11,6 +11,7 @@ const construct = require('./view/make/make.js')
const { platform, arch } = process const { platform, arch } = process
const Platform = builder.Platform const Platform = builder.Platform
const Arch = builder.Arch const Arch = builder.Arch
const artifactName = 'TheDesk-setup-${arch}.${ext}'
const config = { const config = {
productName: 'TheDesk', productName: 'TheDesk',
appId: 'top.thedesk', appId: 'top.thedesk',
@ -71,6 +72,7 @@ async function cmd(options) {
construct(ver, basefile, false, true) construct(ver, basefile, false, true)
if ((platform == 'win32' && !isTrue(options, 'skiWindows')) || isTrue(options, 'windows', 'w')) { if ((platform == 'win32' && !isTrue(options, 'skiWindows')) || isTrue(options, 'windows', 'w')) {
if ((isTrue(options, 'withIa32') && arch == 'x64') || arch == 'ia32') { if ((isTrue(options, 'withIa32') && arch == 'x64') || arch == 'ia32') {
config.nsis.artifactName = artifactName.replace('${arch}', 'ia32')
await build(Platform.WINDOWS, Arch.ia32, config) await build(Platform.WINDOWS, Arch.ia32, config)
fs.renameSync( fs.renameSync(
`../build/TheDesk ${version}.exe`, `../build/TheDesk ${version}.exe`,
@ -82,6 +84,7 @@ async function cmd(options) {
) )
} }
if (arch == 'x64') { if (arch == 'x64') {
config.nsis.artifactName = artifactName.replace('${arch}', 'x64')
await build(Platform.WINDOWS, Arch.x64, config) await build(Platform.WINDOWS, Arch.x64, config)
fs.renameSync( fs.renameSync(
`../build/TheDesk ${version}.exe`, `../build/TheDesk ${version}.exe`,
@ -116,6 +119,7 @@ async function cmd(options) {
construct(ver, basefile, false, false) construct(ver, basefile, false, false)
if ((platform == 'win32' && !isTrue(options, 'skiWindows')) || isTrue(options, 'windows', 'w')) { if ((platform == 'win32' && !isTrue(options, 'skiWindows')) || isTrue(options, 'windows', 'w')) {
if ((isTrue(options, 'withIa32') && arch == 'x64') || arch == 'ia32') { if ((isTrue(options, 'withIa32') && arch == 'x64') || arch == 'ia32') {
config.nsis.artifactName = artifactName.replace('${arch}', 'ia32')
await build(Platform.WINDOWS, Arch.ia32, config) await build(Platform.WINDOWS, Arch.ia32, config)
fs.renameSync( fs.renameSync(
`../build/TheDesk ${version}.exe`, `../build/TheDesk ${version}.exe`,
@ -123,6 +127,7 @@ async function cmd(options) {
) )
} }
if (arch == 'x64') { if (arch == 'x64') {
config.nsis.artifactName = artifactName.replace('${arch}', 'x64')
await build(Platform.WINDOWS, Arch.x64, config) await build(Platform.WINDOWS, Arch.x64, config)
fs.renameSync( fs.renameSync(
`../build/TheDesk ${version}.exe`, `../build/TheDesk ${version}.exe`,

2
app/view/pl-PL/index.html
View File

@ -27,7 +27,7 @@
<body class=""> <body class="">
<script> <script>
var ver = '22.2.0 (Koume)' var ver = '22.2.0 (Koume)'
var gitHash = 'a7349d574d803f034cf418d6b3f2264643dff1f5' var gitHash = 'f570ed36e876bfe2f9d21a6350c1f22f22980c89'
//betaを入れるとバージョンチェックしない //betaを入れるとバージョンチェックしない
//var ver="beta"; //var ver="beta";
var acct_id = 0 var acct_id = 0

4
app/view/pl-PL/setting.html
View File

@ -690,7 +690,7 @@
style="width:100%; max-width:40rem;"><img src="../../img/desk_full.svg" class="left" width="25" style="width:100%; max-width:40rem;"><img src="../../img/desk_full.svg" class="left" width="25"
style="padding-top:5px;">Main author: Cutls@cutls.com</a> style="padding-top:5px;">Main author: Cutls@cutls.com</a>
<br> <br>
TheDesk @ <a href="https://github.com/cutls/TheDesk/commits/a7349d574d803f034cf418d6b3f2264643dff1f5">a7349d574d803f034cf418d6b3f2264643dff1f5</a> - <a TheDesk @ <a href="https://github.com/cutls/TheDesk/commits/f570ed36e876bfe2f9d21a6350c1f22f22980c89">f570ed36e876bfe2f9d21a6350c1f22f22980c89</a> - <a
onclick="checkupd(); return localStorage.removeItem('new-ver-skip'); location.href='index.html';" onclick="checkupd(); return localStorage.removeItem('new-ver-skip'); location.href='index.html';"
class="pointer pwa">Sprawdź aktualizacje</a><br> class="pointer pwa">Sprawdź aktualizacje</a><br>
<br> <br>
@ -700,7 +700,7 @@
<img src="https://status.cutls.com/badge-service?site=thedesk.top"> <img src="https://status.cutls.com/badge-service?site=thedesk.top">
</a><br> </a><br>
<h5>OSS License</h5> <h5>OSS License</h5>
<a href="https://app.fossa.com/projects/git%2Bgithub.com%2Fcutls%2FTheDesk/refs/branch/master/a7349d574d803f034cf418d6b3f2264643dff1f5" <a href="https://app.fossa.com/projects/git%2Bgithub.com%2Fcutls%2FTheDesk/refs/branch/master/f570ed36e876bfe2f9d21a6350c1f22f22980c89"
alt="FOSSA Status"><img alt="FOSSA Status"><img
src="https://app.fossa.com/api/projects/git%2Bgithub.com%2Fcutls%2FTheDesk.svg?type=small" /></a> src="https://app.fossa.com/api/projects/git%2Bgithub.com%2Fcutls%2FTheDesk.svg?type=small" /></a>
<br> <br>