From f2afeee52e623b83fb7ecd67c28535fb0dc988da Mon Sep 17 00:00:00 2001 From: nishi Date: Thu, 20 Jun 2024 04:01:38 +0000 Subject: [PATCH] add japanese installer git-svn-id: file:///raid/svn-main/nishi-dataworks/trunk@396 d4a5a174-5a4a-5b4b-b672-37683c10d7d5 --- .github/workflows/build.yml | 18 +++++++++++------- Binary/nsis.bmp | Bin 0 -> 154542 bytes Makefiles/common-decl.mk | 1 + Makefiles/installer.mk | 3 ++- 4 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 Binary/nsis.bmp 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 0000000000000000000000000000000000000000..0449de7482e0f86a58861fae01868d713deb91f8 GIT binary patch literal 154542 zcmeI5%XQ>1bA|Og0IwZ_&(YosFTIu{a0&{*DJTzX>lk|B!2DHR^0Ej%)RI~nsi$ye zD4o|Nf7Mhkrc$3$=%b|EB-{{`n#QC!sHm zKqJryGy;u4BhUym0*yc;& zrvs1a#UnJ?rHK-nSmX!F^9*EomdYPvOg@D<2_iLVyIgjy!#OyQs`MuuN4#p=GDDFw zR48FROVvprCu8X)fQ?dtRV-Drc!nzs4r(iYo)?FP&V+i=jZ!&Wb*7(Bubeo2oMK!A z<{JDGRGMb;@)LZ-Ad+-aPpqHMb6uSgK0~gbGbFTCSQgufaJ62$sHgNYa^%v$Q#0aR zI|`U9!yrr3xyDu31?jmUvUL<~p?EVd8phIN#{{@wtU4!`=3EqACQ5k=6$6-8_qSYh&_v9K{MlU zri`NWs*5W=PPipj*W^W^Nol}(N9AZ<6C#lwO>F@2jqV7Hn(JL260u7cvF7@OZMUm> zu3Yc3?GmpEZCCK;6HjuD^Ldwx=!fzqAevl9*+l$xUabw9-Nf|K%r(z76>RwvUdc=F8+N;AZ6Q7%(n#^?G(sHVm`|95 z0_^6wN|;e1A0#`$1tO(vvr}0c5GhVd4NYCcbzq3W^ZF{Ia1Omzd!oc53z89E9JZ9&Irc%v)T|>7 zvD$>AIuNr__~#hlIE`)v3>At7$&ejQG%=9o9JztkJUZp zIzlK%g465pZpgJx3T?$f17-o9y^3r(<5WE|{vr}p46515t$2l6BGO)UI@bwOSdbOl zIsq2uA-PpE^%e4)T;qShl12BcAv=+_yh{)o1H{b}msS?np9mH=Vlu63bw;^%uaOyY zEe1J*gW-IZ;Z&H#6RSzGG#Jk$sYf3oQ2tS;voJ#t3A!JM$K z@>2bIiD8WNMWds3xgJXLI2^Wivt!P8RWy}$ML@vxm}vQtYRZ+BBm7Zb=UUaKTvy8H z>(!ibj_^Jd)MxwwRHmnW_>8Le%AVx9s=9futMZ}#6}iSl&SG@mprGYw4BtR|t7rro zfxiHOo8RcPfZTkGaj#gDh?Kny%RaCxK&Xfe~P z&}b@sjwL*ZO}Iszs-(EWMsnYD#{8-zB%v7JFlX!U)ibF5Ow(yXNgy)=BA0MjgOg-w zcg6U4kSHAa5CCm*4GsFyWA90>N9(dtuFkccv9}&+)ov<`fw!A$6kA-m1{|0*i$`b5 zJB8xWQiVS!(1Qlv0PMo|jkWz;^BvfEYsI-x$mBYbUgmPG6Oo1l;uHUzhKhNO&-x(- zASh4kRh%w0s~~k`MW2mKBMtg)t{tp%9p-ZPUU|_#O_wrN>n~l}RXYP3GBh}*rhS8F z%JtI=u4*f6SL92HiBjBZZMt2#VgA!K4n3RlMLIhJWC2R zD!-2X@B%mA>8~`yZ|3X`1*!YO8G=0iCraq^YiKD~GklxP!D?4!YiNe9^*69|tcVx) zm_yq9n1Hi3m!l4O_AC@-;ZTPUHq5l2`!kNDtl!tyT+_QfTPU1;JfNNj2yOFu5~_fi zN5Uff-CRe9P|X94z$<5V-|q+b$(BNK8NP05I&97k#M<-`HPLM@y$A(WkY+`LCb18c zkohGgQx++5sj+C}YbxnfQl$u=n(OQpd(QnUa*a6zgz$TFt($=CX^d5EL^L#^d?wc# z$;9Y^VbFd>B|RT=%^ZZTWBfiNq;$kc$ooLjBkY=Mnqq_Kig4JS*Ju-)c!pdxFiX!rW(T_OCgT(g?eTt15NzH@yPb<-PxMxYV61_3XS zVv*40t`YD$FqVO3fqmCO|DfPJ*R(bpR-W;!kwuFZE#yeq?!K9sk$^v%^K**U;kE_C zE(8)e5MTDPh82`m>4`hP?GgIXL-AL1gR=V--SwAnt-OlcF^GD;cChA$a`L#r@J3d? zt+nCTHxE%XT7M0wsGia##t9y<`zPXt;FO~D_>Y2$E_|6nY zb0{(vqG(7|igK-yT0OLe8j(PN8K5e?3R17yDjVX}w8v)^hd~30pwirfra8{5Nq2p& ztP1H#>G*wd0Y`qmY{dhJ`Htk?U1!iy3%0afEZ=HqM?1Y${3i8-Tu;AVkEp#LKI}rI zV8BzeBbUx{J#ST+XNaO|tALQK6KABvIdZN=ug#ikn^r8_To2;ua~M%MLT2t?{j~FP zriS)yxenL!PG!%Ch<}V;!;)k9qFD?Z>42j5JK~%fLPxDDqU613rp%P!8tfulwR!sM z6IS9ye`ID`p$^eZ!*o;ejLK%Eg02 z+lF&IN^!B(i985;01tGUk)b(>+umDIw)6T{n!jIyBdK;pb=;U8i7Wj5oiP&fkvPaXapL8MxYUB1R8-xpb=;U8i7VY z2>4CncfPr6@V_4c-Z#Yy(=73gp*~Fb{W&NWd0(uSULfkKSL(}Yfo$uLRS})4l^)`A z5#94zP2SGy9dVkCw}=+0^`kfbXsZr{?D2PU;dHN^sp7I&ZJA$eI%VXOilOjVeF=96 z)|i8$|K`pBDb1SDLBqDo;tZoaOt?sFbDhkq48nb6(VC@^fx5L`#fRQO9L~7&@PEGH zRDOKY!3G9zj)$=Mt8*PF>$GI~wdw;VN61I;A$`f8%cY9zzOmr8nb*FtNFG_R-RgAj zVkVI1BVsDbR~65rgHx|QN~&Y%(NOfMzsip`n#mI5!MU#1e`8(1))Q_6CNz)0CtlqH z^E}qG!nZhR#YD~`4cmD=WetorTAFRcXp{4MzTGm9vo)L4RHbEB>d*VoC#ki=nL zU$5%hIPYm*51?t{n5gFUxsHh(_wChav9@il-SuNDcbw}Vi+MZN2s8qXKqJryGy?aB zfF6^HiznrH63)kA%xGRM+u(j8Uao9oICTy8QvNJkwoyCC^# zUAgwi@iLxtMB?({@f@G!41d7=S4J zwH=pDfqj8qlO>4i%~lky!raZM%r6?UD?S=fDp@Md`!q=AdpK-}!VtdUQ2Mq~yB;dK zpX?4lOBo7N?yTYf>y-RJjL!ABEJ^X*V|NlMiRVhL?5#sZGkRscY=K%~@y)dRsqE&O z*`!%^eVkY38ijD`Q)5^8&2v55iu(ZN+&aBo8i7Wj5oiP&fkvPa__GMGI@JQEJWMSf zX)(hBRlkEV7PndaNTnq%XUs%d_+Qyxi&GPeuK77g8Y*3Nt(>jDHdAyfF+GDLLSI;# zx6!n=3=LWAZB@Y%RJ~q^5=CXWzq%e#iEIB?GUi?r>(j(x`CWEeFazf6OZ>9&mzP(L z-pp*VC7~zcA=gOl!d_7wMAUU81+z1?&9$7Y%6IFsh`2`kF3%kh^C@HXq%lCvyv!Z7 zm;r!cJVWO3nQQ#Hix?%3oU($J{K34R>)4!|O5HcBNDdB&yE4=|*>r;J8$n^cdhYRD zWvOEe{k|hbH1}H$avdQLo6pHP<{CV~2gLa4JuabDa=mD?&J7{5} z>`0q$ytb=~Oq&=(D9hkvWu6#vPKIxMnB>N(c;?<1Z$k;?^GCM2hT%H!-$9cJD?psw zlb`~!_1HLJ{#aK6zLT0=ZM*Y&m$QlQMc}99y88bOzEyKwZv+~FM&OSl(D%JRo`P?4 zpmY6gQ2%j5&NT~Ko>yr4xkC@g_Rx=4EZ5^nDz_!wTPyTxcLJhz9eJ{owopDFM5!XK z$5VVcMUc;N^6>%>y}Ndgp5UyuD<*=lYV< zs>IpEC7$Ee&vV5PB6emOI)}DZyHrJIc0+HOD6eI}5rd;R5Q9`$g3%>Q=Ngvc! z5$fvAbUY#$=JIZ=jkQ5m&A9Wk%l^czCYW=AFEf{6sgDM_G~YYd!tLf)O{EjHHP-{1 zKd%S6oB07fWe{REW3ycYFPcyBq9szCMT4_*Z2)gu`O;kHoV`>N+y^Mr$|7ep&B{RP zJJ+{OacgS?{wf5f^-PJGo6N9wEuA}6KH%a$#hq$?n%H4_i<9y zYd!eq;^!I>rq$-Wxs*AI0b`L_{rGb@cOh+c0pkN9qht=t%Accj;lc-cdBXjMvxOS5 zaz;1CA@ICks{c|)?+w>xIW3kGhTJU^+vz*Y;m^D~WXyRw05qdrb1fVzq%bQ0b@{=> zxz0zA1^=Oj12$Bhsce|r`T)Za8kFi7O`MT(IfH%%@g$h%%~1UK9H+kc?TgjACc>cY zWXPdY<1FXl|l4Sp;)1`O+>JOm1|BXGf%yiSy%koA+nfja*uAF+t4sBS1nFnQ0NcP z>KmMP#Oa$|4c$lD&SzpEz^;2t;rZ8kl;5^3z-2cXV;5z`P{C427&E+%+F|R*-s+im&o%Q$$0b2n^QIQnsqvK zG5>a*-S?`&pCx55&6K)Ax<~U$KJ%ID?~AKg<@6Jy7{Ab z<{x5_c-0^&i@@(X%o4XbHEqb1YEI&GDJUwus6`d7%3Cwr87dT?d(^vii=%=WO00D}Hv+tTM?>wc;x-LK-0RB`qc?Lcoi=0>)w+qQY-6e7)fxC{ z){_HJs<;o93?|eZVsXd{3Osa%6XrTH?F{@f4L{X@FV9ibT+7gVua0qWNqTC4P-rsV z?A2gv=vBz|u))A!)9BGqkI|fmls=H_LHXdDoF6=|&FT!y=ebTFCs#>KIv-!L)m$55 z8GxntJlA18jx$I3+FU>JD>#>fxJPyT*_H~O1B6ZVs!Fm0ykdh$g(H}4_oySL7O#fhRkvNa1h785 zigNIFI1@wU;IeB1+3dXFDx=rmFx8>NL0p^@f2zY1nhHPWHIoGEjJ-W`gKsFP)_2{j zSPkN8+L_vP_*Fd2Wntd!+N!b4foCA|=aj@1?BGl&U!Qx75p!9I?;1TJ9^GoH2mq!( zm3FhbhuOz8f}yawQhZ3(AU-%l^JHFMY4J@q`#(7Irr;+TH2el7Uz+Q|)_a@p!e={o zJ}LfQZ+H3sRIYcOX<{SL2s8qXKqJry{8b1H+deFG{Wv2WawCGruK0qRC?_k!VNor9 zh=z1j9y>cvdD;Kc(C}mjXLvHdyUA60DEDfLUhSON;t-(ee_>^SV*9l_rEkd55m4v3 zj-1XS0+|4^+wio!6sW=Uj{wfHwOD!&B`MRxlf3 z^F+R~IM)!oAsL$yulti)QcT{Qw$?XQYOZzj894MXJ_I=M{8h~@6hK721aHo&_zFKn z-y1)34=>6eQBInL_HMG&#X!O0Zc@;;OE)nFYV5vTO!=ED+gyJJ4Y1wb?LDtQqItcq zJ7|a-#=MFcy40kfzvk7s-Ua98#OdSm=6YLUBhUym0(XjlZkxlC>HWpZGJr_^tbKn0 zz8O(0SMq^0R;Z`zmN!-X3Wivs|K>2+{9(lA>M?)sQyw-LnlNa^>tOTwgG@irrE-)k z9##Cjj1z?T4em-x4H~MW!S9;Nb7l>xUG1HTnk3Co##4cNB){VSqZ89 zyvy4uyG+Y0lgXM3QHaGuW#yJ;%6uzU*W}FnN(DfW#iowE#T};1FPi4JX6G7;d#O~x z%CiWfnO7n6FC+~59I5=Lt0rz}TF+2H=Rl!pD})wFzitTuv$B9Ax`#(lS)_sN&~kJj zpNHHo$~eMMD*xbE4vAO>_~r(}@OujswFm6(y&WWq)TYoc2hjV6?g{mq4uxJJOF5sIT5JRzjqhAsp`eUh5w%?P4vJAk3?Esa&pBXcFRnpdd7v{j%6zKF-856_P* zaS#6vto0}^`6CU1TSge3;L6Kob}yPjfG%MrJbW0t}&-YueE{3khpBZ7G*|hYC=iJ zmu7P9U&5K(v2hk;lmP&RUVch48Irwd!q9*)Y|gdCp=dnVN?rD6ZwxRB&Y+V&^TJo_ zVp30gCSljwh9m-42$sDd7@!!v;_ps1VS2L98u{VMtaH$_RSv~GMkzebJsGZ4Gb2H( z1){A4&hu@s@=&k29=f780=O#Imi4BGeZy_T3!9^`h%1rqgc`fljawCmncm%8TTi+j zxn>vd^@TAO_hf4$9yyu04%{^H$u$$+Xwy5)3+vylNL#2&sHKyZ?J96v-y&agod*sB z`S>5Vs7b9tqg9IlVRXen|0THwZ6z_B=Pxg1gak!J8;R73Mks*{brmNF4N#P$1b>2L zx*z68utA1FN_@AZg3W*{jZ=~S3hZvZdg#p}Ia7z_%AA#JY^?7ga>KFE9JU0j8y-Ip zZM`z^mGu}aal4DLGZd7=kfUg)cVMo~lX;y-kLYAJ6s4kp4_uE!zk*0*$~QLE!%ZD_{j8 literal 0 HcmV?d00001 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 -- 2.43.0