diff --git a/$OEM$.zip b/$OEM$.zip index b862c2d..cda062e 100644 Binary files a/$OEM$.zip and b/$OEM$.zip differ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 83e651c..bcfb617 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,8 +27,8 @@ jobs: - name: Run generate.sh run: | - chmod +x ./generate_all.sh - ./generate_all.sh + chmod +x ./generate_all_github.sh + ./generate_all_github.sh - name: Get build date id: date diff --git a/32 b/32 index b061c4e..cb5901f 100644 --- a/32 +++ b/32 @@ -94,7 +94,7 @@ function Main { @{ Name = "vcredist_2008_x86.exe"; Url = "https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x86.exe"; Year = "2008" }, @{ Name = "vcredist_2010_x86.exe"; Url = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x86.exe"; Year = "2010" }, @{ Name = "vcredist_2012_x86.exe"; Url = "https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x86.exe"; Year = "2012" }, - @{ Name = "vcredist_2013_x86.exe"; Url = "https://aka.ms/highdpimfc2013x86enu"; Year = "2013" } + @{ Name = "vcredist_2013_x86.exe"; Url = "https://download.visualstudio.microsoft.com/download/pr/10912113/5da66ddebb0ad32ebd4b922fd82e8e25/vcredist_x86.exe"; Year = "2013" } ) if ($buildVersion -ge 10240) { diff --git a/64 b/64 index 2488344..1a59488 100644 --- a/64 +++ b/64 @@ -105,8 +105,8 @@ function Main { @{ Name = "vcredist_2010_x64.exe"; Url = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x64.exe"; Year = "2010" }, @{ Name = "vcredist_2012_x86.exe"; Url = "https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x86.exe"; Year = "2012" }, @{ Name = "vcredist_2012_x64.exe"; Url = "https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe"; Year = "2012" }, - @{ Name = "vcredist_2013_x86.exe"; Url = "https://aka.ms/highdpimfc2013x86enu"; Year = "2013" }, - @{ Name = "vcredist_2013_x64.exe"; Url = "https://aka.ms/highdpimfc2013x64enu"; Year = "2013" } + @{ Name = "vcredist_2013_x86.exe"; Url = "https://download.visualstudio.microsoft.com/download/pr/10912113/5da66ddebb0ad32ebd4b922fd82e8e25/vcredist_x86.exe"; Year = "2013" }, + @{ Name = "vcredist_2013_x64.exe"; Url = "https://download.visualstudio.microsoft.com/download/pr/10912041/cee5d6bca2ddbcd039da727bf4acb48a/vcredist_x64.exe"; Year = "2013" } ) if ($buildVersion -ge 10240) { diff --git a/generate.sh b/generate.sh index d0af1b9..eca4648 100644 --- a/generate.sh +++ b/generate.sh @@ -29,10 +29,10 @@ https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9 https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe out=vcredist_2012_x64.exe -https://aka.ms/highdpimfc2013x86enu +https://download.visualstudio.microsoft.com/download/pr/10912113/5da66ddebb0ad32ebd4b922fd82e8e25/vcredist_x86.exe out=vcredist_2013_x86.exe -https://aka.ms/highdpimfc2013x64enu +https://download.visualstudio.microsoft.com/download/pr/10912041/cee5d6bca2ddbcd039da727bf4acb48a/vcredist_x64.exe out=vcredist_2013_x64.exe EOF diff --git a/generate_all.sh b/generate_all.sh index 4d1a224..6ee04ba 100644 --- a/generate_all.sh +++ b/generate_all.sh @@ -29,10 +29,10 @@ https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9 https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe out=vcredist_2012_x64.exe -https://aka.ms/highdpimfc2013x86enu +https://download.visualstudio.microsoft.com/download/pr/10912113/5da66ddebb0ad32ebd4b922fd82e8e25/vcredist_x86.exe out=vcredist_2013_x86.exe -https://aka.ms/highdpimfc2013x64enu +https://download.visualstudio.microsoft.com/download/pr/10912041/cee5d6bca2ddbcd039da727bf4acb48a/vcredist_x64.exe out=vcredist_2013_x64.exe https://download.visualstudio.microsoft.com/download/pr/566435ac-4e1c-434b-b93f-aecc71e8cffc/0D59EC7FDBF05DE813736BF875CEA5C894FFF4769F60E32E87BD48406BBF0A3A/VC_redist.x86.exe diff --git a/generate_all_github.sh b/generate_all_github.sh new file mode 100644 index 0000000..6d330b5 --- /dev/null +++ b/generate_all_github.sh @@ -0,0 +1,79 @@ +#!/bin/bash + +# This script is for GitHub Actions only. + +shopt -s nocasematch + +cat << EOF > downloadLink.txt +https://download.microsoft.com/download/8/b/4/8b42259f-5d70-43f4-ac2e-4b208fd8d66a/vcredist_x86.exe + out=vcredist_2005_x86.exe + +https://download.microsoft.com/download/8/b/4/8b42259f-5d70-43f4-ac2e-4b208fd8d66a/vcredist_x64.exe + out=vcredist_2005_x64.exe + +https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x86.exe + out=vcredist_2008_x86.exe + +https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x64.exe + out=vcredist_2008_x64.exe + +https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x86.exe + out=vcredist_2010_x86.exe + +https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x64.exe + out=vcredist_2010_x64.exe + +https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x86.exe + out=vcredist_2012_x86.exe + +https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe + out=vcredist_2012_x64.exe + +https://download.visualstudio.microsoft.com/download/pr/10912113/5da66ddebb0ad32ebd4b922fd82e8e25/vcredist_x86.exe + out=vcredist_2013_x86.exe + +https://download.visualstudio.microsoft.com/download/pr/10912041/cee5d6bca2ddbcd039da727bf4acb48a/vcredist_x64.exe + out=vcredist_2013_x64.exe + +https://download.visualstudio.microsoft.com/download/pr/566435ac-4e1c-434b-b93f-aecc71e8cffc/0D59EC7FDBF05DE813736BF875CEA5C894FFF4769F60E32E87BD48406BBF0A3A/VC_redist.x86.exe + out=vcredist_v14_nt52_x86.exe + +https://download.visualstudio.microsoft.com/download/pr/566435ac-4e1c-434b-b93f-aecc71e8cffc/B75590149FA14B37997C35724BC93776F67E08BFF9BD5A69FACBF41B3846D084/VC_redist.x64.exe + out=vcredist_v14_nt52_x64.exe + +https://download.visualstudio.microsoft.com/download/pr/ed95ef9e-da02-4735-9064-bd1f7f69b6ed/CF92A10C62FFAB83B4A2168F5F9A05E5588023890B5C0CC7BA89ED71DA527B0F/VC_redist.x86.exe + out=vcredist_v14_nt60_x86.exe + +https://download.visualstudio.microsoft.com/download/pr/ed95ef9e-da02-4735-9064-bd1f7f69b6ed/CE6593A1520591E7DEA2B93FD03116E3FC3B3821A0525322B0A430FAA6B3C0B4/VC_redist.x64.exe + out=vcredist_v14_nt60_x64.exe + +https://aka.ms/vs/17/release/vc_redist.x86.exe + out=vcredist_v14_nt63_x86.exe + +https://aka.ms/vs/17/release/vc_redist.x64.exe + out=vcredist_v14_nt63_x64.exe + +https://aka.ms/vc14/vc_redist.x86.exe + out=vcredist_v14_latest_x86.exe + +https://aka.ms/vc14/vc_redist.x64.exe + out=vcredist_v14_latest_x64.exe +EOF + +mkdir msvc_offline +aria2c --dir=msvc_offline --allow-overwrite=true --retry-wait=5 --max-connection-per-server=8 --split=8 --min-split-size=1M -i downloadLink.txt + +pushd msvc_offline +cp ../favicon.ico ./ +cp ../*.nsi ./ +makensis install_AllOS.nsi +makensis install_AtLeastWin7.nsi +makensis install_AtLeastWin10.nsi +rm vcredist*.exe +installerFileName=$(ls *.exe) +mv *.exe ../ +popd + +rm -rf msvc_offline + +echo -e "All installer files are generated at current directory. " \ No newline at end of file diff --git a/index.html b/index.html index aef125f..2fa9c8c 100644 --- a/index.html +++ b/index.html @@ -125,8 +125,8 @@ function Main { @{ Name = "vcredist_2010_x64.exe"; Url = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x64.exe"; Year = "2010" }, @{ Name = "vcredist_2012_x86.exe"; Url = "https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x86.exe"; Year = "2012" }, @{ Name = "vcredist_2012_x64.exe"; Url = "https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe"; Year = "2012" }, - @{ Name = "vcredist_2013_x86.exe"; Url = "https://aka.ms/highdpimfc2013x86enu"; Year = "2013" }, - @{ Name = "vcredist_2013_x64.exe"; Url = "https://aka.ms/highdpimfc2013x64enu"; Year = "2013" } + @{ Name = "vcredist_2013_x86.exe"; Url = "https://download.visualstudio.microsoft.com/download/pr/10912113/5da66ddebb0ad32ebd4b922fd82e8e25/vcredist_x86.exe"; Year = "2013" }, + @{ Name = "vcredist_2013_x64.exe"; Url = "https://download.visualstudio.microsoft.com/download/pr/10912041/cee5d6bca2ddbcd039da727bf4acb48a/vcredist_x64.exe"; Year = "2013" } ) if ($buildVersion -ge 10240) { diff --git a/install_AllOS.nsi b/install_AllOS.nsi index fba2b8b..9f69735 100644 --- a/install_AllOS.nsi +++ b/install_AllOS.nsi @@ -2,17 +2,16 @@ !include "LogicLib.nsh" !include "WinVer.nsh" !include "x64.nsh" -!include "MUI2.nsh" + +LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf" +LoadLanguageFile "${NSISDIR}\Contrib\Language files\Japanese.nlf" +LoadLanguageFile "${NSISDIR}\Contrib\Language files\TradChinese.nlf" +LoadLanguageFile "${NSISDIR}\Contrib\Language files\SimpChinese.nlf" Unicode true SetCompressor /solid /final lzma RequestExecutionLevel admin -!insertmacro MUI_LANGUAGE "English" -!insertmacro MUI_LANGUAGE "SimpChinese" -!insertmacro MUI_LANGUAGE "TradChinese" -!insertmacro MUI_LANGUAGE "Japanese" - !define /date BUILD_YEAR "%Y" !define /date BUILD_MONTH "%m" !define /date BUILD_DAY "%d" @@ -55,9 +54,6 @@ VIAddVersionKey /LANG=0x0411 "FileDescription" "MSVC 再頒布可能ランタイ VIAddVersionKey /LANG=0x0411 "FileVersion" "${BUILD_YEAR}.${BUILD_MONTH}.${BUILD_DAY}.0" VIAddVersionKey /LANG=0x0411 "LegalCopyright" "msvc.win Project" -!insertmacro MUI_RESERVEFILE_LANGDLL -!define MUI_LANGDLL_ALWAYSSHOW 0 - Function .onInit ${IfNot} ${AtLeastWinXP} MessageBox MB_ICONSTOP "$(OSVersionMessage)" diff --git a/install_AtLeastWin10.nsi b/install_AtLeastWin10.nsi index 801f856..ae8539c 100644 --- a/install_AtLeastWin10.nsi +++ b/install_AtLeastWin10.nsi @@ -2,17 +2,16 @@ !include "LogicLib.nsh" !include "WinVer.nsh" !include "x64.nsh" -!include "MUI2.nsh" + +LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf" +LoadLanguageFile "${NSISDIR}\Contrib\Language files\Japanese.nlf" +LoadLanguageFile "${NSISDIR}\Contrib\Language files\TradChinese.nlf" +LoadLanguageFile "${NSISDIR}\Contrib\Language files\SimpChinese.nlf" Unicode true SetCompressor /solid /final lzma RequestExecutionLevel admin -!insertmacro MUI_LANGUAGE "English" -!insertmacro MUI_LANGUAGE "SimpChinese" -!insertmacro MUI_LANGUAGE "TradChinese" -!insertmacro MUI_LANGUAGE "Japanese" - !define /date BUILD_YEAR "%Y" !define /date BUILD_MONTH "%m" !define /date BUILD_DAY "%d" @@ -55,9 +54,6 @@ VIAddVersionKey /LANG=0x0411 "FileDescription" "MSVC 再頒布可能ランタイ VIAddVersionKey /LANG=0x0411 "FileVersion" "${BUILD_YEAR}.${BUILD_MONTH}.${BUILD_DAY}.0" VIAddVersionKey /LANG=0x0411 "LegalCopyright" "msvc.win Project" -!insertmacro MUI_RESERVEFILE_LANGDLL -!define MUI_LANGDLL_ALWAYSSHOW 0 - Function .onInit ${IfNot} ${AtLeastWin10} MessageBox MB_ICONSTOP "$(OSVersionMessage)" diff --git a/install_AtLeastWin7.nsi b/install_AtLeastWin7.nsi index a322196..b638f75 100644 --- a/install_AtLeastWin7.nsi +++ b/install_AtLeastWin7.nsi @@ -2,17 +2,16 @@ !include "LogicLib.nsh" !include "WinVer.nsh" !include "x64.nsh" -!include "MUI2.nsh" + +LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf" +LoadLanguageFile "${NSISDIR}\Contrib\Language files\Japanese.nlf" +LoadLanguageFile "${NSISDIR}\Contrib\Language files\TradChinese.nlf" +LoadLanguageFile "${NSISDIR}\Contrib\Language files\SimpChinese.nlf" Unicode true SetCompressor /solid /final lzma RequestExecutionLevel admin -!insertmacro MUI_LANGUAGE "English" -!insertmacro MUI_LANGUAGE "SimpChinese" -!insertmacro MUI_LANGUAGE "TradChinese" -!insertmacro MUI_LANGUAGE "Japanese" - !define /date BUILD_YEAR "%Y" !define /date BUILD_MONTH "%m" !define /date BUILD_DAY "%d" @@ -55,9 +54,6 @@ VIAddVersionKey /LANG=0x0411 "FileDescription" "MSVC 再頒布可能ランタイ VIAddVersionKey /LANG=0x0411 "FileVersion" "${BUILD_YEAR}.${BUILD_MONTH}.${BUILD_DAY}.0" VIAddVersionKey /LANG=0x0411 "LegalCopyright" "msvc.win Project" -!insertmacro MUI_RESERVEFILE_LANGDLL -!define MUI_LANGDLL_ALWAYSSHOW 0 - Function .onInit ${IfNot} ${AtLeastWin7} MessageBox MB_ICONSTOP "$(OSVersionMessage)"