From: nishi <nishi@d4a5a174-5a4a-5b4b-b672-37683c10d7d5>
Date: Thu, 20 Jun 2024 04:01:38 +0000 (+0000)
Subject: add japanese installer
X-Git-Url: http://10.11.0.4:5575/?a=commitdiff_plain;h=f2afeee52e623b83fb7ecd67c28535fb0dc988da;p=dataworks.git
add japanese installer
git-svn-id: file:///raid/svn-main/nishi-dataworks/trunk@396 d4a5a174-5a4a-5b4b-b672-37683c10d7d5
---
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4939164..5634154 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -149,11 +149,13 @@ jobs:
- name: Make for Windows 64-bit
run: make YACC=byacc PLATFORM=win64 -j3 archive
- name: Make installer
- run: make YACC=byacc PLATFORM=win32 install.exe
+ run: make YACC=byacc PLATFORM=win32 install.exe && mv install.exe install-win64.exe
+ - name: Make Japanese installer
+ run: make YACC=byacc PLATFORM=win32 INSTALLER_LANGUAGE=Japanese install.exe && mv install.exe install-win64jp.exe
- name: Rename to -win64
- run: mv dataworks.zip dataworks-win64.zip && mv dataworks.tar.gz dataworks-win64.tar.gz && mv Client/dataworks.exe dataworks-win64.exe && mv Server/dataworks_server.exe dataworks-server-win64.exe && mv RemoteClient/dataworks_remote_client.exe dataworks-remote-client-win64.exe && mv install.exe install-win64.exe
+ run: mv dataworks.zip dataworks-win64.zip && mv dataworks.tar.gz dataworks-win64.tar.gz && mv Client/dataworks.exe dataworks-win64.exe && mv Server/dataworks_server.exe dataworks-server-win64.exe && mv RemoteClient/dataworks_remote_client.exe dataworks-remote-client-win64.exe
- name: Create artifact
- run: zip -rv build-win64.zip dataworks-win64.tar.gz dataworks-win64.zip dataworks-server-win64.exe dataworks-win64.exe dataworks-remote-client-win64.exe install-win64.exe
+ run: zip -rv build-win64.zip dataworks-win64.tar.gz dataworks-win64.zip dataworks-server-win64.exe dataworks-win64.exe dataworks-remote-client-win64.exe install-win64.exe install-win64jp.exe
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
@@ -179,11 +181,13 @@ jobs:
- name: Make for Windows 32-bit
run: make YACC=byacc PLATFORM=win32 -j3 archive
- name: Make installer
- run: make YACC=byacc PLATFORM=win32 install.exe
+ run: make YACC=byacc PLATFORM=win32 install.exe && mv install.exe install-win32.exe
+ - name: Make Japanese installer
+ run: make YACC=byacc PLATFORM=win32 INSTALLER_LANGUAGE=Japanese install.exe && mv install.exe install-win32jp.exe
- name: Rename to -win32
- run: mv dataworks.zip dataworks-win32.zip && mv dataworks.tar.gz dataworks-win32.tar.gz && mv Client/dataworks.exe dataworks-win32.exe && mv Server/dataworks_server.exe dataworks-server-win32.exe && mv RemoteClient/dataworks_remote_client.exe dataworks-remote-client-win32.exe && mv install.exe install-win32.exe
+ run: mv dataworks.zip dataworks-win32.zip && mv dataworks.tar.gz dataworks-win32.tar.gz && mv Client/dataworks.exe dataworks-win32.exe && mv Server/dataworks_server.exe dataworks-server-win32.exe && mv RemoteClient/dataworks_remote_client.exe dataworks-remote-client-win32.exe
- name: Create artifact
- run: zip -rv build-win32.zip dataworks-win32.tar.gz dataworks-win32.zip dataworks-server-win32.exe dataworks-win32.exe dataworks-remote-client-win32.exe install-win32.exe
+ run: zip -rv build-win32.zip dataworks-win32.tar.gz dataworks-win32.zip dataworks-server-win32.exe dataworks-win32.exe dataworks-remote-client-win32.exe install-win32.exe install-win32jp.exe
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
@@ -495,6 +499,6 @@ jobs:
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Release
- run: gh release create -t "v$(make get-version)" "$(make get-version)" dataworks-dos.{tar.gz,zip} dataworks-macos-arm64.{tar.gz,zip} dataworks-dos4g.{tar.gz,zip} dataworks-win32.{tar.gz,zip} dataworks-win64.{tar.gz,zip} dataworks-linux64.{tar.gz,zip} dataworks-amiga.{tar.gz,zip} dataworks-{dos.exe,dos4g.exe,macos-arm64,win32.exe,win64.exe,linux64,amiga} dataworks-server-{dos.exe,dos4g.exe,macos-arm64,win32.exe,win64.exe,linux64} dataworks-remote-client-{dos.exe,dos4g.exe,macos-arm64,win32.exe,win64.exe,linux64} install1200.img install1440.img dataworks-amd64-ubuntu.deb install-win{32,64}.exe -n "Version \`$(make get-version)\` was built in this release"
+ run: gh release create -t "v$(make get-version)" "$(make get-version)" dataworks-dos.{tar.gz,zip} dataworks-macos-arm64.{tar.gz,zip} dataworks-dos4g.{tar.gz,zip} dataworks-win32.{tar.gz,zip} dataworks-win64.{tar.gz,zip} dataworks-linux64.{tar.gz,zip} dataworks-amiga.{tar.gz,zip} dataworks-{dos.exe,dos4g.exe,macos-arm64,win32.exe,win64.exe,linux64,amiga} dataworks-server-{dos.exe,dos4g.exe,macos-arm64,win32.exe,win64.exe,linux64} dataworks-remote-client-{dos.exe,dos4g.exe,macos-arm64,win32.exe,win64.exe,linux64} install1200.img install1440.img dataworks-amd64-ubuntu.deb install-win{32,64}.exe install-win{32,64}jp.exe -n "Version \`$(make get-version)\` was built in this release"
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Binary/nsis.bmp b/Binary/nsis.bmp
new file mode 100644
index 0000000..0449de7
Binary files /dev/null and b/Binary/nsis.bmp differ
diff --git a/Makefiles/common-decl.mk b/Makefiles/common-decl.mk
index d3f737c..7b3f494 100644
--- a/Makefiles/common-decl.mk
+++ b/Makefiles/common-decl.mk
@@ -15,6 +15,7 @@ YFLAGS = -d -t -y
LFLAGS = --nounistd
LIBS =
PIC = -fPIC
+INSTALLER_LANGUAGE = English
LIB_PREFIX = lib
LIB_SUFFIX = .so
STATICLIB_PREFIX = lib
diff --git a/Makefiles/installer.mk b/Makefiles/installer.mk
index efa5e3e..513d7d0 100644
--- a/Makefiles/installer.mk
+++ b/Makefiles/installer.mk
@@ -54,6 +54,7 @@ dos-installer:
echo "!define MUI_HEADERIMAGE" >> install.nsi
echo "!define MUI_HEADERIMAGE_BITMAP \"dataworks.bmp\"" >> install.nsi
echo "!define MUI_HEADERIMAGE_RIGHT" >> install.nsi
+ echo "!define MUI_WELCOMEFINISHPAGE_BITMAP Binary/nsis.bmp" >> install.nsi
echo "!include nsDialogs.nsh" >> install.nsi
echo "!include LogicLib.nsh" >> install.nsi
echo "!include x64.nsh" >> install.nsi
@@ -73,7 +74,7 @@ dos-installer:
echo "!insertmacro MUI_UNPAGE_CONFIRM" >> install.nsi
echo "!insertmacro MUI_UNPAGE_INSTFILES" >> install.nsi
echo "!insertmacro MUI_UNPAGE_FINISH" >> install.nsi
- echo "!insertmacro MUI_LANGUAGE \"English\"" >> install.nsi
+ echo "!insertmacro MUI_LANGUAGE \"$(INSTALLER_LANGUAGE)\"" >> install.nsi
echo "Function .onInit" >> install.nsi
echo " UserInfo::GetAccountType" >> install.nsi
echo " pop \$$0" >> install.nsi