diff --git a/README.md b/README.md index 750257a2..6b41afde 100644 --- a/README.md +++ b/README.md @@ -747,7 +747,7 @@ Windows 10 (Ver.1709 から) の場合 ### 開発環境 -Visual Studio Community 2019 16.5.2 +Visual Studio Community 2019 16.5.4 * Desktop development with C++ * MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.25) diff --git a/installer/_build_bundle.cmd b/installer/_build_bundle.cmd index 23ea025f..1972a33d 100644 --- a/installer/_build_bundle.cmd +++ b/installer/_build_bundle.cmd @@ -7,11 +7,25 @@ call _vsdev.cmd call _version.cmd -"%WIX%bin\candle.exe" installer-bundle.wxs -nologo -out "%TARGETDIR%\corvusskk-%VERSION%.wixobj" -ext WixBalExtension -ext WixUtilExtension -"%WIX%bin\light.exe" "%TARGETDIR%\corvusskk-%VERSION%.wixobj" -nologo -out "%TARGETDIR%\corvusskk-%VERSION%.exe" -ext WixBalExtension -ext WixUtilExtension +rem x86/x64 -"%WIX%bin\candle.exe" installer-bundle-arm.wxs -nologo -out "%TARGETDIR%\corvusskk-%VERSION%-arm.wixobj" -ext WixBalExtension -ext WixUtilExtension -"%WIX%bin\light.exe" "%TARGETDIR%\corvusskk-%VERSION%-arm.wixobj" -nologo -out "%TARGETDIR%\corvusskk-%VERSION%-arm.exe" -ext WixBalExtension -ext WixUtilExtension +"%WIX%bin\candle.exe" installer-bundle.wxs ^ +-nologo -out "%TARGETDIR%\corvusskk-%VERSION%.wixobj" ^ +-ext WixBalExtension -ext WixUtilExtension + +"%WIX%bin\light.exe" "%TARGETDIR%\corvusskk-%VERSION%.wixobj" ^ +-nologo -out "%TARGETDIR%\corvusskk-%VERSION%.exe" ^ +-ext WixBalExtension -ext WixUtilExtension + +rem ARM + +"%WIX%bin\candle.exe" installer-bundle-arm.wxs ^ +-nologo -out "%TARGETDIR%\corvusskk-%VERSION%-arm.wixobj" ^ +-ext WixBalExtension -ext WixUtilExtension + +"%WIX%bin\light.exe" "%TARGETDIR%\corvusskk-%VERSION%-arm.wixobj" ^ +-nologo -out "%TARGETDIR%\corvusskk-%VERSION%-arm.exe" ^ +-ext WixBalExtension -ext WixUtilExtension popd diff --git a/installer/_build_msi.cmd b/installer/_build_msi.cmd index f0c15782..a24e8bbf 100644 --- a/installer/_build_msi.cmd +++ b/installer/_build_msi.cmd @@ -9,14 +9,30 @@ call _version.cmd call _build_sub.cmd -"%WIX%bin\candle.exe" installer-x86.wxs -nologo -out "%TARGETDIR%\x86.wixobj" -"%WIX%bin\light.exe" "%TARGETDIR%\x86.wixobj" -nologo -out "%TARGETDIR%\x86.msi" -ext WixUIExtension -sw1076 +rem x86 -"%WIX%bin\candle.exe" installer-x64.wxs -nologo -out "%TARGETDIR%\x64.wixobj" -"%WIX%bin\light.exe" "%TARGETDIR%\x64.wixobj" -nologo -out "%TARGETDIR%\x64.msi" -ext WixUIExtension -sw1076 +"%WIX%bin\candle.exe" installer-x86.wxs ^ +-nologo -out "%TARGETDIR%\x86.wixobj" + +"%WIX%bin\light.exe" "%TARGETDIR%\x86.wixobj" ^ +-nologo -out "%TARGETDIR%\x86.msi" -ext WixUIExtension -sw1076 + +rem x64 + +"%WIX%bin\candle.exe" installer-x64.wxs ^ +-nologo -out "%TARGETDIR%\x64.wixobj" + +"%WIX%bin\light.exe" "%TARGETDIR%\x64.wixobj" ^ +-nologo -out "%TARGETDIR%\x64.msi" -ext WixUIExtension -sw1076 + +rem ARM + +"%WIX%bin\candle.exe" installer-arm.wxs ^ +-nologo -out "%TARGETDIR%\arm.wixobj" + +"%WIX%bin\light.exe" "%TARGETDIR%\arm.wixobj" ^ +-nologo -out "%TARGETDIR%\arm.msi" -ext WixUIExtension -sw1076 -"%WIX%bin\candle.exe" installer-arm.wxs -nologo -out "%TARGETDIR%\arm.wixobj" -"%WIX%bin\light.exe" "%TARGETDIR%\arm.wixobj" -nologo -out "%TARGETDIR%\arm.msi" -ext WixUIExtension -sw1076 msiinfo "%TARGETDIR%\arm.msi" /p Arm64;1033 /nologo popd diff --git a/installer/_build_sub.cmd b/installer/_build_sub.cmd index 03c2895c..43fab202 100644 --- a/installer/_build_sub.cmd +++ b/installer/_build_sub.cmd @@ -13,7 +13,19 @@ set PATH=%PATH%;%LocalAppData%\Pandoc;%ProgramFiles%\Pandoc;%ProgramFiles(x86)%\ set DESCRIPTION=CorvusSKK -pandoc.exe -s -f gfm-ascii_identifiers -t html5 -V lang:"ja" -V title-prefix:"%DESCRIPTION%" -V pagetitle:"Manual" -V title:"%DESCRIPTION% Manual" --self-contained -c "installer\resource-md\markdown.css" --toc -o "installer\%TARGETDIR%\README.html" README.md +pandoc.exe ^ +-s ^ +-f gfm-ascii_identifiers ^ +-t html5 ^ +-V lang:"ja" ^ +-V title-prefix:"%DESCRIPTION%" ^ +-V pagetitle:"Manual" ^ +-V title:"%DESCRIPTION% Manual" ^ +--self-contained ^ +-c "installer\resource-md\markdown.css" ^ +--toc ^ +-o "installer\%TARGETDIR%\README.html" ^ +README.md popd diff --git a/installer/_sign.cmd b/installer/_sign.cmd index bc9236e5..12ba9306 100644 --- a/installer/_sign.cmd +++ b/installer/_sign.cmd @@ -9,27 +9,36 @@ call _version.cmd -rem > _sign.cmd +rem > _sign.cmd rem * : SHA-1 hash of certificate for SHA-256 file digest algorithm rem * : SHA-256 RFC-3161 timestamp server - - set DESCRIPTION="CorvusSKK" -rem option "/fd sha256 /tr /td sha256" set SHA1HASH=%1 set TIMESTAMPSERVER=%2 -set BINFILES="..\Win32\Release\*.dll" "..\Win32\Release\*.exe" "..\x64\Release\*.dll" "..\x64\Release\*.exe" -set BINFILES=%BINFILES% "..\ARM\Release\*.dll" "..\ARM64\Release\*.dll" "..\ARM64\Release\*.exe" - -set MSIFILES="%TARGETDIR%\x86.msi" "%TARGETDIR%\x64.msi" +rem x86 +set BINFILES="..\Win32\Release\*.dll" "..\Win32\Release\*.exe" +rem x64 +set BINFILES=%BINFILES% "..\x64\Release\*.dll" "..\x64\Release\*.exe" +rem ARM32 TIP only +set BINFILES=%BINFILES% "..\ARM\Release\*.dll" +rem ARM64 +set BINFILES=%BINFILES% "..\ARM64\Release\*.dll" "..\ARM64\Release\*.exe" + +rem x86 +set MSIFILES="%TARGETDIR%\x86.msi" +rem x64 +set MSIFILES=%MSIFILES% "%TARGETDIR%\x64.msi" +rem ARM set MSIFILES=%MSIFILES% "%TARGETDIR%\arm.msi" +rem x86/x64 set BEFILE="%TARGETDIR%\engine.exe" set BSFILE="%TARGETDIR%\corvusskk-%VERSION%.exe" +rem ARM set ARMBEFILE="%TARGETDIR%\engine-arm.exe" set ARMBSFILE="%TARGETDIR%\corvusskk-%VERSION%-arm.exe" @@ -47,14 +56,18 @@ call _build_msi.cmd call _build_bundle.cmd +rem x86/x64 "%WIX%\bin\insignia.exe" -nologo -ib %BSFILE% -o %BEFILE% +rem ARM "%WIX%\bin\insignia.exe" -nologo -ib %ARMBSFILE% -o %ARMBEFILE% %SIGNCOMMAND% %BEFILE% %ARMBEFILE% +rem x86/x64 "%WIX%\bin\insignia.exe" -nologo -ab %BEFILE% %BSFILE% -o %BSFILE% +rem ARM "%WIX%\bin\insignia.exe" -nologo -ab %ARMBEFILE% %ARMBSFILE% -o %ARMBSFILE% %SIGNCOMMAND% %BSFILE% %ARMBSFILE% diff --git a/installer/_solution_build.cmd b/installer/_solution_build.cmd index 08f74ded..185b4985 100644 --- a/installer/_solution_build.cmd +++ b/installer/_solution_build.cmd @@ -7,11 +7,29 @@ call _vsdev.cmd call _version.cmd -msbuild "..\imcrvskk.sln" /nologo /maxcpucount /verbosity:normal /target:Build /property:Configuration=Release,Platform=x86 -msbuild "..\imcrvskk.sln" /nologo /maxcpucount /verbosity:normal /target:Build /property:Configuration=Release,Platform=x64 +rem x86 -msbuild "..\imcrvskk.sln" /nologo /maxcpucount /verbosity:normal /target:Build /property:Configuration=Release,Platform=ARM -msbuild "..\imcrvskk.sln" /nologo /maxcpucount /verbosity:normal /target:Build /property:Configuration=Release,Platform=ARM64 +msbuild "..\imcrvskk.sln" ^ +/nologo /maxcpucount /verbosity:normal /target:Build ^ +/property:Configuration=Release,Platform=x86 + +rem x64 + +msbuild "..\imcrvskk.sln" ^ +/nologo /maxcpucount /verbosity:normal /target:Build ^ +/property:Configuration=Release,Platform=x64 + +rem ARM32 + +msbuild "..\imcrvskk.sln" ^ +/nologo /maxcpucount /verbosity:normal /target:Build ^ +/property:Configuration=Release,Platform=ARM + +rem ARM64 + +msbuild "..\imcrvskk.sln" ^ +/nologo /maxcpucount /verbosity:normal /target:Build ^ +/property:Configuration=Release,Platform=ARM64 popd diff --git a/installer/_solution_build_debug.cmd b/installer/_solution_build_debug.cmd index a37465f8..e11c6a5c 100644 --- a/installer/_solution_build_debug.cmd +++ b/installer/_solution_build_debug.cmd @@ -7,11 +7,29 @@ call _vsdev.cmd call _version.cmd -msbuild "..\imcrvskk.sln" /nologo /maxcpucount /verbosity:normal /target:Build /property:Configuration=Debug,Platform=x86 -msbuild "..\imcrvskk.sln" /nologo /maxcpucount /verbosity:normal /target:Build /property:Configuration=Debug,Platform=x64 +rem x86 -msbuild "..\imcrvskk.sln" /nologo /maxcpucount /verbosity:normal /target:Build /property:Configuration=Debug,Platform=ARM -msbuild "..\imcrvskk.sln" /nologo /maxcpucount /verbosity:normal /target:Build /property:Configuration=Debug,Platform=ARM64 +msbuild "..\imcrvskk.sln" ^ +/nologo /maxcpucount /verbosity:normal /target:Build ^ +/property:Configuration=Debug,Platform=x86 + +rem x64 + +msbuild "..\imcrvskk.sln" ^ +/nologo /maxcpucount /verbosity:normal /target:Build ^ +/property:Configuration=Debug,Platform=x64 + +rem ARM32 + +msbuild "..\imcrvskk.sln" ^ +/nologo /maxcpucount /verbosity:normal /target:Build ^ +/property:Configuration=Debug,Platform=ARM + +rem ARM64 + +msbuild "..\imcrvskk.sln" ^ +/nologo /maxcpucount /verbosity:normal /target:Build ^ +/property:Configuration=Debug,Platform=ARM64 popd diff --git a/installer/_solution_clean.cmd b/installer/_solution_clean.cmd index 0c5dd82b..98333fda 100644 --- a/installer/_solution_clean.cmd +++ b/installer/_solution_clean.cmd @@ -7,11 +7,29 @@ call _vsdev.cmd call _version.cmd -msbuild "..\imcrvskk.sln" /nologo /maxcpucount /verbosity:normal /target:Clean /property:Configuration=Release,Platform=x86 -msbuild "..\imcrvskk.sln" /nologo /maxcpucount /verbosity:normal /target:Clean /property:Configuration=Release,Platform=x64 +rem x86 -msbuild "..\imcrvskk.sln" /nologo /maxcpucount /verbosity:normal /target:Clean /property:Configuration=Release,Platform=ARM -msbuild "..\imcrvskk.sln" /nologo /maxcpucount /verbosity:normal /target:Clean /property:Configuration=Release,Platform=ARM64 +msbuild "..\imcrvskk.sln" ^ +/nologo /maxcpucount /verbosity:normal /target:Clean ^ +/property:Configuration=Release,Platform=x86 + +rem x64 + +msbuild "..\imcrvskk.sln" ^ +/nologo /maxcpucount /verbosity:normal /target:Clean ^ +/property:Configuration=Release,Platform=x64 + +rem ARM32 + +msbuild "..\imcrvskk.sln" ^ +/nologo /maxcpucount /verbosity:normal /target:Clean ^ +/property:Configuration=Release,Platform=ARM + +rem ARM64 + +msbuild "..\imcrvskk.sln" ^ +/nologo /maxcpucount /verbosity:normal /target:Clean ^ +/property:Configuration=Release,Platform=ARM64 popd diff --git a/installer/_solution_clean_debug.cmd b/installer/_solution_clean_debug.cmd index ca423218..6e932d2b 100644 --- a/installer/_solution_clean_debug.cmd +++ b/installer/_solution_clean_debug.cmd @@ -7,11 +7,29 @@ call _vsdev.cmd call _version.cmd -msbuild "..\imcrvskk.sln" /nologo /maxcpucount /verbosity:normal /target:Clean /property:Configuration=Debug,Platform=x86 -msbuild "..\imcrvskk.sln" /nologo /maxcpucount /verbosity:normal /target:Clean /property:Configuration=Debug,Platform=x64 +rem x86 -msbuild "..\imcrvskk.sln" /nologo /maxcpucount /verbosity:normal /target:Clean /property:Configuration=Debug,Platform=ARM -msbuild "..\imcrvskk.sln" /nologo /maxcpucount /verbosity:normal /target:Clean /property:Configuration=Debug,Platform=ARM64 +msbuild "..\imcrvskk.sln" ^ +/nologo /maxcpucount /verbosity:normal /target:Clean ^ +/property:Configuration=Debug,Platform=x86 + +rem x64 + +msbuild "..\imcrvskk.sln" ^ +/nologo /maxcpucount /verbosity:normal /target:Clean ^ +/property:Configuration=Debug,Platform=x64 + +rem ARM32 + +msbuild "..\imcrvskk.sln" ^ +/nologo /maxcpucount /verbosity:normal /target:Clean ^ +/property:Configuration=Debug,Platform=ARM + +rem ARM64 + +msbuild "..\imcrvskk.sln" ^ +/nologo /maxcpucount /verbosity:normal /target:Clean ^ +/property:Configuration=Debug,Platform=ARM64 popd diff --git a/installer/_verify.cmd b/installer/_verify.cmd index 4ca164c6..c91fb23b 100644 --- a/installer/_verify.cmd +++ b/installer/_verify.cmd @@ -9,15 +9,27 @@ call _version.cmd -set BINFILES="..\Win32\Release\*.dll" "..\Win32\Release\*.exe" "..\x64\Release\*.dll" "..\x64\Release\*.exe" -set BINFILES=%BINFILES% "..\ARM\Release\*.dll" "..\ARM64\Release\*.dll" "..\ARM64\Release\*.exe" - -set MSIFILES="%TARGETDIR%\x86.msi" "%TARGETDIR%\x64.msi" +rem x86 +set BINFILES="..\Win32\Release\*.dll" "..\Win32\Release\*.exe" +rem x64 +set BINFILES=%BINFILES% "..\x64\Release\*.dll" "..\x64\Release\*.exe" +rem ARM32 TIP only +set BINFILES=%BINFILES% "..\ARM\Release\*.dll" +rem ARM64 +set BINFILES=%BINFILES% "..\ARM64\Release\*.dll" "..\ARM64\Release\*.exe" + +rem x86 +set MSIFILES="%TARGETDIR%\x86.msi" +rem x64 +set MSIFILES=%MSIFILES% "%TARGETDIR%\x64.msi" +rem ARM set MSIFILES=%MSIFILES% "%TARGETDIR%\arm.msi" +rem x86/x64 set BEFILE="%TARGETDIR%\engine.exe" set BSFILE="%TARGETDIR%\corvusskk-%VERSION%.exe" +rem ARM set ARMBEFILE="%TARGETDIR%\engine-arm.exe" set ARMBSFILE="%TARGETDIR%\corvusskk-%VERSION%-arm.exe" diff --git a/installer/_vsdev.cmd b/installer/_vsdev.cmd index ff9ff25a..127a9ce8 100644 --- a/installer/_vsdev.cmd +++ b/installer/_vsdev.cmd @@ -1,6 +1,9 @@ @echo off -for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version ^[16.0^,17.0^) -requires Microsoft.Component.MSBuild -property installationPath`) do ( +set VSWHERE="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" +set VSWHEREOPT=-version ^^^[16.0^^^,17.0^^^) -requires Microsoft.Component.MSBuild -property installationPath + +for /f "usebackq tokens=*" %%i in (`%VSWHERE% %VSWHEREOPT%`) do ( if exist "%%i" ( set VS2019InstallDir=%%i ) @@ -8,4 +11,4 @@ for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio if not exist "%VS2019InstallDir%\Common7\Tools\VsDevCmd.bat" exit /B 1 -call "%VS2019InstallDir%\Common7\Tools\VsDevCmd.bat" +call "%VS2019InstallDir%\Common7\Tools\VsDevCmd.bat" > nul diff --git a/installer/installer-arm.wxs b/installer/installer-arm.wxs index e2833ce2..45e09716 100644 --- a/installer/installer-arm.wxs +++ b/installer/installer-arm.wxs @@ -5,7 +5,7 @@ + diff --git a/installer/installer-bundle-arm.wxs b/installer/installer-bundle-arm.wxs index 74cb1c85..fd96bd64 100644 --- a/installer/installer-bundle-arm.wxs +++ b/installer/installer-bundle-arm.wxs @@ -33,6 +33,7 @@ ForcePerMachine="yes" Compressed="yes" InstallCondition="VersionNT"> + diff --git a/installer/installer-bundle.wxs b/installer/installer-bundle.wxs index ffaa937b..a9a930c5 100644 --- a/installer/installer-bundle.wxs +++ b/installer/installer-bundle.wxs @@ -87,6 +87,7 @@ ForcePerMachine="yes" Compressed="yes" InstallCondition="VersionNT"> + diff --git a/installer/installer-x64.wxs b/installer/installer-x64.wxs index 9fc2aa75..8533eda1 100644 --- a/installer/installer-x64.wxs +++ b/installer/installer-x64.wxs @@ -40,6 +40,7 @@ + diff --git a/installer/installer-x86.wxs b/installer/installer-x86.wxs index 7899d135..81b99448 100644 --- a/installer/installer-x86.wxs +++ b/installer/installer-x86.wxs @@ -108,6 +108,7 @@ +