Bump vc2013 to rc
This commit is contained in:
Mario Fetka
parent
62dd89fd22
commit
08f60b1c0b
@ -38,40 +38,54 @@ DL_ARCH[3]="x64"
|
|||||||
DL_EXTRACT_FORMAT[3]="7zip"
|
DL_EXTRACT_FORMAT[3]="7zip"
|
||||||
DL_EXTRACT_TO[3]="2008"
|
DL_EXTRACT_TO[3]="2008"
|
||||||
|
|
||||||
DL_FILE[4]="vcredist2010_x86.exe"
|
# the msi needs the install.* eula.* files that are also in the 2008 msvc so extract it first to the 2010 msvc
|
||||||
DL_SOURCE[4]="http://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x86.exe"
|
DL_FILE[4]="vcredist2008_x86.exe"
|
||||||
|
DL_SOURCE[4]="http://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x86.exe"
|
||||||
DL_ARCH[4]="x86"
|
DL_ARCH[4]="x86"
|
||||||
DL_EXTRACT_FORMAT[4]="7zip"
|
DL_EXTRACT_FORMAT[4]="7zip"
|
||||||
DL_EXTRACT_TO[4]="2010"
|
DL_EXTRACT_TO[4]="2010"
|
||||||
|
|
||||||
DL_FILE[5]="vcredist2010_x64.exe"
|
DL_FILE[5]="vcredist2010_x86.exe"
|
||||||
DL_SOURCE[5]="http://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x64.exe"
|
DL_SOURCE[5]="http://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x86.exe"
|
||||||
DL_ARCH[5]="x64"
|
DL_ARCH[5]="x86"
|
||||||
DL_EXTRACT_FORMAT[5]="7zip"
|
DL_EXTRACT_FORMAT[5]="7zip"
|
||||||
DL_EXTRACT_TO[5]="2010"
|
DL_EXTRACT_TO[5]="2010"
|
||||||
|
|
||||||
DL_FILE[6]="vcredist2012_x86.exe"
|
# the msi needs the install.* eula.* files that are also in the 2008 msvc so extract it first to the 2010 msvc
|
||||||
DL_SOURCE[6]="http://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU3/vcredist_x86.exe"
|
DL_FILE[6]="vcredist2008_x64.exe"
|
||||||
DL_ARCH[6]="x86"
|
DL_SOURCE[6]="http://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x64.exe"
|
||||||
DL_EXTRACT_FORMAT[6]="cp"
|
DL_ARCH[6]="x64"
|
||||||
DL_EXTRACT_TO[6]="2012"
|
DL_EXTRACT_FORMAT[6]="7zip"
|
||||||
|
DL_EXTRACT_TO[6]="2010"
|
||||||
|
|
||||||
DL_FILE[7]="vcredist2012_x64.exe"
|
DL_FILE[7]="vcredist2010_x64.exe"
|
||||||
DL_SOURCE[7]="http://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU3/vcredist_x64.exe"
|
DL_SOURCE[7]="http://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x64.exe"
|
||||||
DL_ARCH[7]="x64"
|
DL_ARCH[7]="x64"
|
||||||
DL_EXTRACT_FORMAT[7]="cp"
|
DL_EXTRACT_FORMAT[7]="7zip"
|
||||||
DL_EXTRACT_TO[7]="2012"
|
DL_EXTRACT_TO[7]="2010"
|
||||||
|
|
||||||
DL_FILE[8]="vcredist2013_x86.exe"
|
DL_FILE[8]="vcredist2012_x86.exe"
|
||||||
DL_SOURCE[8]="http://download.microsoft.com/download/8/7/E/87E991E6-BA48-43C3-8317-04AC4D35DF6A/vcredist_x86.exe"
|
DL_SOURCE[8]="http://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU3/vcredist_x86.exe"
|
||||||
DL_ARCH[8]="x86"
|
DL_ARCH[8]="x86"
|
||||||
DL_EXTRACT_FORMAT[8]="cp"
|
DL_EXTRACT_FORMAT[8]="cp"
|
||||||
DL_EXTRACT_TO[8]="2013"
|
DL_EXTRACT_TO[8]="2012"
|
||||||
|
|
||||||
DL_FILE[9]="vcredist2013_x64.exe"
|
DL_FILE[9]="vcredist2012_x64.exe"
|
||||||
DL_SOURCE[9]="http://download.microsoft.com/download/8/7/E/87E991E6-BA48-43C3-8317-04AC4D35DF6A/vcredist_x64.exe"
|
DL_SOURCE[9]="http://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU3/vcredist_x64.exe"
|
||||||
DL_ARCH[9]="x64"
|
DL_ARCH[9]="x64"
|
||||||
DL_EXTRACT_FORMAT[9]="cp"
|
DL_EXTRACT_FORMAT[9]="cp"
|
||||||
DL_EXTRACT_TO[9]="2013"
|
DL_EXTRACT_TO[9]="2012"
|
||||||
|
|
||||||
|
DL_FILE[10]="vcredist2013_x86.exe"
|
||||||
|
DL_SOURCE[10]="http://download.microsoft.com/download/2/B/8/2B8FB587-809E-4C08-A6AB-D12CE5EBA0BC/vcredist_x86.exe"
|
||||||
|
DL_ARCH[10]="x86"
|
||||||
|
DL_EXTRACT_FORMAT[10]="cp"
|
||||||
|
DL_EXTRACT_TO[10]="2013"
|
||||||
|
|
||||||
|
DL_FILE[11]="vcredist2013_x64.exe"
|
||||||
|
DL_SOURCE[11]="http://download.microsoft.com/download/2/B/8/2B8FB587-809E-4C08-A6AB-D12CE5EBA0BC/vcredist_x64.exe"
|
||||||
|
DL_ARCH[11]="x64"
|
||||||
|
DL_EXTRACT_FORMAT[11]="cp"
|
||||||
|
DL_EXTRACT_TO[11]="2013"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -101,24 +101,24 @@ function create() {
|
|||||||
# VC 2010
|
# VC 2010
|
||||||
###################################################
|
###################################################
|
||||||
|
|
||||||
cp $PRODUCT_DIR/cscripts/vc2k10_slim.vbs $INST_DIR/Temp/x86/2010/
|
# cp $PRODUCT_DIR/cscripts/vc2k10_slim.vbs $INST_DIR/Temp/x86/2010/
|
||||||
pushd $INST_DIR/Temp/x86/2010/
|
# pushd $INST_DIR/Temp/x86/2010/
|
||||||
cscript vc2k10_slim.vbs
|
# cscript vc2k10_slim.vbs
|
||||||
popd
|
# popd
|
||||||
extract_file msi-a $INST_DIR/Temp/x86/2010/vc_red.msi $INST_DIR/x86/2010
|
extract_file msi-a $INST_DIR/Temp/x86/2010/vc_red.msi $INST_DIR/x86/2010
|
||||||
rm -f $INST_DIR/x86/2010/*.cab
|
rm -f $INST_DIR/x86/2010/*.cab
|
||||||
mv $INST_DIR/x86/2010/VC_RED.MSI $INST_DIR/x86/2010/vc_red.msi
|
mv $INST_DIR/x86/2010/VC_RED.MSI $INST_DIR/x86/2010/vc_red.msi
|
||||||
#rm -f $INST_DIR/Temp/x86/2010/*{msi,cab,msp}
|
# rm -f $INST_DIR/Temp/x86/2010/*{msi,cab,msp}
|
||||||
mv -f $INST_DIR/Temp/x86/2010/* $INST_DIR/x86/2010
|
mv -f $INST_DIR/Temp/x86/2010/* $INST_DIR/x86/2010
|
||||||
|
|
||||||
cp $PRODUCT_DIR/cscripts/vc2k10_slim.vbs $INST_DIR/Temp/x64/2010/
|
# cp $PRODUCT_DIR/cscripts/vc2k10_slim.vbs $INST_DIR/Temp/x64/2010/
|
||||||
pushd $INST_DIR/Temp/x64/2010/
|
# pushd $INST_DIR/Temp/x64/2010/
|
||||||
cscript vc2k10_slim.vbs
|
# cscript vc2k10_slim.vbs
|
||||||
popd
|
# popd
|
||||||
extract_file msi-a $INST_DIR/Temp/x64/2010/vc_red.msi $INST_DIR/x64/2010
|
extract_file msi-a $INST_DIR/Temp/x64/2010/vc_red.msi $INST_DIR/x64/2010
|
||||||
rm -f $INST_DIR/x64/2010/*.cab
|
rm -f $INST_DIR/x64/2010/*.cab
|
||||||
mv $INST_DIR/x64/2010/VC_RED.MSI $INST_DIR/x64/2010/vc_red.msi
|
mv $INST_DIR/x64/2010/VC_RED.MSI $INST_DIR/x64/2010/vc_red.msi
|
||||||
#rm -f $INST_DIR/Temp/x64/2010/*{msi,cab,msp}
|
# rm -f $INST_DIR/Temp/x64/2010/*{msi,cab,msp}
|
||||||
mv -f $INST_DIR/Temp/x64/2010/* $INST_DIR/x64/2010
|
mv -f $INST_DIR/Temp/x64/2010/* $INST_DIR/x64/2010
|
||||||
|
|
||||||
# Space in filepath not handled correctly by cygpath so copy th a dir witout spaces
|
# Space in filepath not handled correctly by cygpath so copy th a dir witout spaces
|
||||||
@ -139,7 +139,6 @@ function create() {
|
|||||||
echo "<check type=\"file\" condition=\"<\" path=\"%programfiles%\Common Files\Microsoft Shared\VC\msdia100.dll\" value=\"$vc2010ver_x86\" />" >> $INST_DIR/package.old
|
echo "<check type=\"file\" condition=\"<\" path=\"%programfiles%\Common Files\Microsoft Shared\VC\msdia100.dll\" value=\"$vc2010ver_x86\" />" >> $INST_DIR/package.old
|
||||||
echo "</cmd>" >> $INST_DIR/package.old
|
echo "</cmd>" >> $INST_DIR/package.old
|
||||||
|
|
||||||
|
|
||||||
###################################################
|
###################################################
|
||||||
# VC 2012
|
# VC 2012
|
||||||
###################################################
|
###################################################
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
6b4835178f757a443e8afd596b241013c823c60e */home/mario/.aio-dist-cache/microsoft-msvc-2013.09.10/x64/vcredist2013_x64.exe
|
4aae7a6ef2fd9cead513c17cce1566945fb4b2fb */home/mario/.aio-dist-cache/microsoft-msvc-2013.09.16/x64/vcredist2013_x64.exe
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
a5ccb86bdcf88992859e9dcc2c2cb5ab5e1c949f */home/mario/.aio-dist-cache/microsoft-msvc-2013.09.10/x86/vcredist2013_x86.exe
|
f83ded65e8ff6295bc84181c2a7402279818d6ac */home/mario/.aio-dist-cache/microsoft-msvc-2013.09.16/x86/vcredist2013_x86.exe
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user