aio/microsoft-msvc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

msvc 2010 is not working without the big mods

Browse Source
This commit is contained in:
Mario Fetka 2013-09-16 20:06:04 +02:00
parent b8edf0555a
commit 62dd89fd22
1 changed files with 55 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
builder-targets-cb.sh
View File

@ -32,9 +32,9 @@ function create() {
echo "<variable name=\"NAME\" value=\"Visual C++\" />" >> $INST_DIR/package.old echo "<variable name=\"NAME\" value=\"Visual C++\" />" >> $INST_DIR/package.old
echo "<install>" >> $INST_DIR/package.old echo "<install>" >> $INST_DIR/package.old
################################################### ###################################################
# VC 2005 # VC 2005
################################################### ###################################################
extract_file msi-a $INST_DIR/Temp/x86/2005/vcredist.msi $INST_DIR/x86/2005 extract_file msi-a $INST_DIR/Temp/x86/2005/vcredist.msi $INST_DIR/x86/2005
extract_file msi-a $INST_DIR/Temp/x64/2005/vcredist.msi $INST_DIR/x64/2005 extract_file msi-a $INST_DIR/Temp/x64/2005/vcredist.msi $INST_DIR/x64/2005
@ -56,9 +56,9 @@ function create() {
echo "</cmd>" >> $INST_DIR/package.old echo "</cmd>" >> $INST_DIR/package.old
################################################### ###################################################
# VC 2008 # VC 2008
################################################### ###################################################
cp $PRODUCT_DIR/cscripts/vc2k8_slim.vbs $INST_DIR/Temp/x86/2008/ cp $PRODUCT_DIR/cscripts/vc2k8_slim.vbs $INST_DIR/Temp/x86/2008/
pushd $INST_DIR/Temp/x86/2008/ pushd $INST_DIR/Temp/x86/2008/
@ -97,9 +97,9 @@ function create() {
echo "</cmd>" >> $INST_DIR/package.old echo "</cmd>" >> $INST_DIR/package.old
################################################### ###################################################
# 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/
@ -108,8 +108,8 @@ function create() {
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 $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/
@ -118,14 +118,16 @@ function create() {
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 $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
cp $INST_DIR/x86/2010/Program\ Files/Microsoft\ Visual\ Studio\ 10.0/Common\ Files/Microsoft\ Shared/VC/msdia100.dll $INST_DIR/Temp/msdia100_x86.dll cp $INST_DIR/x86/2010/Program\ Files/Microsoft\ Visual\ Studio\ 10.0/Common\ Files/Microsoft\ Shared/VC/msdia100.dll $INST_DIR/Temp/msdia100_x86.dll
get_file_ver vc2010ver_x86 $INST_DIR/Temp/msdia100_x86.dll get_file_ver vc2010ver_x86 $INST_DIR/Temp/msdia100_x86.dll
cp $INST_DIR/x64/2010/Program\ Files\(64\)/Microsoft\ Visual\ Studio\ 10.0/Common\ Files/Microsoft\ Shared/VC/msdia100.dll $INST_DIR/Temp/msdia100_x64.dll cp $INST_DIR/x64/2010/Program\ Files\(64\)/Microsoft\ Visual\ Studio\ 10.0/Common\ Files/Microsoft\ Shared/VC/msdia100.dll $INST_DIR/Temp/msdia100_x64.dll
get_file_ver vc2010ver_x64 $INST_DIR/Temp/msdia100_x64.dll get_file_ver vc2010ver_x64 $INST_DIR/Temp/msdia100_x64.dll
rm -rf $INST_DIR/x86/2010/{Program*,Win}
rm -rf $INST_DIR/x64/2010/{Program*,Win}
echo "msvc 2010 x86 $vc2010ver_x86" echo "msvc 2010 x86 $vc2010ver_x86"
echo "msvc 2010 x64 $vc2010ver_x64" echo "msvc 2010 x64 $vc2010ver_x64"
@ -138,9 +140,9 @@ function create() {
echo "</cmd>" >> $INST_DIR/package.old echo "</cmd>" >> $INST_DIR/package.old
################################################### ###################################################
# VC 2012 # VC 2012
################################################### ###################################################
extract_file cab-sfx $INST_DIR/Temp/x86/2012/vcredist2012_x86.exe $INST_DIR/Temp/x86/2012/ extract_file cab-sfx $INST_DIR/Temp/x86/2012/vcredist2012_x86.exe $INST_DIR/Temp/x86/2012/
extract_file cab-sfx $INST_DIR/Temp/x64/2012/vcredist2012_x64.exe $INST_DIR/Temp/x64/2012/ extract_file cab-sfx $INST_DIR/Temp/x64/2012/vcredist2012_x64.exe $INST_DIR/Temp/x64/2012/
@ -159,29 +161,29 @@ function create() {
echo "msvc 2012 Additional x86 $vc2010ver_mfc_x86" echo "msvc 2012 Additional x86 $vc2010ver_mfc_x86"
echo "msvc 2012 Additional x64 $vc2010ver_mfc_x64" echo "msvc 2012 Additional x64 $vc2010ver_mfc_x64"
echo "<cmd name=\"%NAME% 2012 Minimum\" path=\"x86\2012\vc_runtimeMinimum_x86.msi\" param=\"/q /norestart\">" >> $INST_DIR/package.old echo "<cmd name=\"%NAME% 2012 Minimum\" path=\"x86\2012\vc_runtimeMinimum_x86.msi\" param=\"/q /norestart ADDEPLOY=1\">" >> $INST_DIR/package.old
echo "<check type=\"os\" condition=\">\" value=\"6.0.6002.0\" />" >> $INST_DIR/package.old echo "<check type=\"os\" condition=\">\" value=\"6.0.6002.0\" />" >> $INST_DIR/package.old
echo "<check type=\"file\" condition=\"<\" path=\"%windir%\system32\atl110.dll\" value=\"$vc2010ver_atl_x86\" arch=\"x86\" />" >> $INST_DIR/package.old echo "<check type=\"file\" condition=\"<\" path=\"%windir%\system32\atl110.dll\" value=\"$vc2012ver_atl_x86\" arch=\"x86\" />" >> $INST_DIR/package.old
echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\atl110.dll\" value=\"$vc2010ver_atl_x86\" arch=\"x64\" />" >> $INST_DIR/package.old echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\atl110.dll\" value=\"$vc2012ver_atl_x86\" arch=\"x64\" />" >> $INST_DIR/package.old
echo "</cmd>" >> $INST_DIR/package.old echo "</cmd>" >> $INST_DIR/package.old
echo "<cmd name=\"%NAME% 2012 Additional\" path=\"x86\2012\vc_runtimeAdditional_x86.msi\" param=\"/q /norestart\">" >> $INST_DIR/package.old echo "<cmd name=\"%NAME% 2012 Additional\" path=\"x86\2012\vc_runtimeAdditional_x86.msi\" param=\"/q /norestart ADDEPLOY=1\">" >> $INST_DIR/package.old
echo "<check type=\"os\" condition=\">\" value=\"6.0.6002.0\" />" >> $INST_DIR/package.old echo "<check type=\"os\" condition=\">\" value=\"6.0.6002.0\" />" >> $INST_DIR/package.old
echo "<check type=\"file\" condition=\"<\" path=\"%windir%\system32\mfc110.dll\" value=\"$vc2010ver_mfc_x86\" arch=\"x86\" />" >> $INST_DIR/package.old echo "<check type=\"file\" condition=\"<\" path=\"%windir%\system32\mfc110.dll\" value=\"$vc2012ver_mfc_x86\" arch=\"x86\" />" >> $INST_DIR/package.old
echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\mfc110.dll\" value=\"$vc2010ver_mfc_x86\" arch=\"x64\" />" >> $INST_DIR/package.old echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\mfc110.dll\" value=\"$vc2012ver_mfc_x86\" arch=\"x64\" />" >> $INST_DIR/package.old
echo "</cmd>" >> $INST_DIR/package.old echo "</cmd>" >> $INST_DIR/package.old
echo "<cmd arch=\"x64\" name=\"%NAME% 2012 Minimum x64\" path=\"x64\2012\vc_runtimeMinimum_x64.msi\" param=\"/q /norestart\">" >> $INST_DIR/package.old echo "<cmd arch=\"x64\" name=\"%NAME% 2012 Minimum x64\" path=\"x64\2012\vc_runtimeMinimum_x64.msi\" param=\"/q /norestart ADDEPLOY=1\">" >> $INST_DIR/package.old
echo "<check type=\"os\" condition=\">\" value=\"6.0.6002.0\" />" >> $INST_DIR/package.old echo "<check type=\"os\" condition=\">\" value=\"6.0.6002.0\" />" >> $INST_DIR/package.old
echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\atl110.dll\" value=\"$vc2010ver_atl_x64\"/>" >> $INST_DIR/package.old echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\atl110.dll\" value=\"$vc2012ver_atl_x64\"/>" >> $INST_DIR/package.old
echo "</cmd>" >> $INST_DIR/package.old echo "</cmd>" >> $INST_DIR/package.old
echo "<cmd arch=\"x64\" name=\"%NAME% 2012 Additional x64\" path=\"x64\2012\vc_runtimeAdditional_x64.msi\" param=\"/q /norestart\">" >> $INST_DIR/package.old echo "<cmd arch=\"x64\" name=\"%NAME% 2012 Additional x64\" path=\"x64\2012\vc_runtimeAdditional_x64.msi\" param=\"/q /norestart ADDEPLOY=1\">" >> $INST_DIR/package.old
echo "<check type=\"os\" condition=\">\" value=\"6.0.6002.0\" />" >> $INST_DIR/package.old echo "<check type=\"os\" condition=\">\" value=\"6.0.6002.0\" />" >> $INST_DIR/package.old
echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\mfc110.dll\" value=\"$vc2010ver_mfc_x64\"/>" >> $INST_DIR/package.old echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\mfc110.dll\" value=\"$vc2012ver_mfc_x64\"/>" >> $INST_DIR/package.old
echo "</cmd>" >> $INST_DIR/package.old echo "</cmd>" >> $INST_DIR/package.old
################################################### ###################################################
# VC 2013 # VC 2013
################################################### ###################################################
extract_file cab-sfx $INST_DIR/Temp/x86/2013/vcredist2013_x86.exe $INST_DIR/Temp/x86/2013/ extract_file cab-sfx $INST_DIR/Temp/x86/2013/vcredist2013_x86.exe $INST_DIR/Temp/x86/2013/
extract_file cab-sfx $INST_DIR/Temp/x64/2013/vcredist2013_x64.exe $INST_DIR/Temp/x64/2013/ extract_file cab-sfx $INST_DIR/Temp/x64/2013/vcredist2013_x64.exe $INST_DIR/Temp/x64/2013/
@ -191,39 +193,39 @@ function create() {
extract_file msi-a $INST_DIR/Temp/x64/2013/packages/vcRuntimeMinimum_amd64/vc_runtimeMinimum_x64.msi $INST_DIR/x64/2013 extract_file msi-a $INST_DIR/Temp/x64/2013/packages/vcRuntimeMinimum_amd64/vc_runtimeMinimum_x64.msi $INST_DIR/x64/2013
extract_file msi-a $INST_DIR/Temp/x64/2013/packages/vcRuntimeAdditional_amd64/vc_runtimeAdditional_x64.msi $INST_DIR/x64/2013 extract_file msi-a $INST_DIR/Temp/x64/2013/packages/vcRuntimeAdditional_amd64/vc_runtimeAdditional_x64.msi $INST_DIR/x64/2013
get_file_ver vc2013ver_atl_x86 $INST_DIR/x86/2013/System/msvcp120.dll get_file_ver vc2013ver_msvcp_x86 $INST_DIR/x86/2013/System/msvcp120.dll
get_file_ver vc2013ver_atl_x64 $INST_DIR/x64/2013/System64/msvcp120.dll get_file_ver vc2013ver_msvcp_x64 $INST_DIR/x64/2013/System64/msvcp120.dll
get_file_ver vc2013ver_mfc_x86 $INST_DIR/x86/2013/System/mfc120.dll get_file_ver vc2013ver_mfc_x86 $INST_DIR/x86/2013/System/mfc120.dll
get_file_ver vc2013ver_mfc_x64 $INST_DIR/x64/2013/System64/mfc120.dll get_file_ver vc2013ver_mfc_x64 $INST_DIR/x64/2013/System64/mfc120.dll
echo "msvc 2013 Minimal x86 $vc2010ver_atl_x86" echo "msvc 2013 Minimal x86 $vc2013ver_msvcp_x86"
echo "msvc 2013 Minimal x64 $vc2010ver_atl_x64" echo "msvc 2013 Minimal x64 $vc2013ver_msvcp_x64"
echo "msvc 2013 Additional x86 $vc2010ver_mfc_x86" echo "msvc 2013 Additional x86 $vc2013ver_mfc_x86"
echo "msvc 2013 Additional x64 $vc2010ver_mfc_x64" echo "msvc 2013 Additional x64 $vc2013ver_mfc_x64"
echo "<cmd name=\"%NAME% 2013 Minimum\" path=\"x86\2013\vc_runtimeMinimum_x86.msi\" param=\"/q /norestart\">" >> $INST_DIR/package.old echo "<cmd name=\"%NAME% 2013 Minimum\" path=\"x86\2013\vc_runtimeMinimum_x86.msi\" param=\"/q /norestart ADDEPLOY=1\">" >> $INST_DIR/package.old
echo "<check type=\"os\" condition=\">\" value=\"6.0.6002.0\" />" >> $INST_DIR/package.old echo "<check type=\"os\" condition=\">\" value=\"6.1.7600.0\" />" >> $INST_DIR/package.old
echo "<check type=\"file\" condition=\"<\" path=\"%windir%\system32\msvcp110.dll\" value=\"$vc2010ver_atl_x86\" arch=\"x86\" />" >> $INST_DIR/package.old echo "<check type=\"file\" condition=\"<\" path=\"%windir%\system32\msvcp120.dll\" value=\"$vc2013ver_msvcp_x86\" arch=\"x86\" />" >> $INST_DIR/package.old
echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\msvcp110.dll\" value=\"$vc2010ver_atl_x86\" arch=\"x64\" />" >> $INST_DIR/package.old echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\msvcp120.dll\" value=\"$vc2013ver_msvcp_x86\" arch=\"x64\" />" >> $INST_DIR/package.old
echo "</cmd>" >> $INST_DIR/package.old echo "</cmd>" >> $INST_DIR/package.old
echo "<cmd name=\"%NAME% 2013 Additional\" path=\"x86\2013\vc_runtimeAdditional_x86.msi\" param=\"/q /norestart\">" >> $INST_DIR/package.old echo "<cmd name=\"%NAME% 2013 Additional\" path=\"x86\2013\vc_runtimeAdditional_x86.msi\" param=\"/q /norestart ADDEPLOY=1\">" >> $INST_DIR/package.old
echo "<check type=\"os\" condition=\">\" value=\"6.0.6002.0\" />" >> $INST_DIR/package.old echo "<check type=\"os\" condition=\">\" value=\"6.1.7600.0\" />" >> $INST_DIR/package.old
echo "<check type=\"file\" condition=\"<\" path=\"%windir%\system32\mfc110.dll\" value=\"$vc2010ver_mfc_x86\" arch=\"x86\" />" >> $INST_DIR/package.old echo "<check type=\"file\" condition=\"<\" path=\"%windir%\system32\mfc120.dll\" value=\"$vc2013ver_mfc_x86\" arch=\"x86\" />" >> $INST_DIR/package.old
echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\mfc110.dll\" value=\"$vc2010ver_mfc_x86\" arch=\"x64\" />" >> $INST_DIR/package.old echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\mfc120.dll\" value=\"$vc2013ver_mfc_x86\" arch=\"x64\" />" >> $INST_DIR/package.old
echo "</cmd>" >> $INST_DIR/package.old echo "</cmd>" >> $INST_DIR/package.old
echo "<cmd arch=\"x64\" name=\"%NAME% 2013 Minimum x64\" path=\"x64\2013\vc_runtimeMinimum_x64.msi\" param=\"/q /norestart\">" >> $INST_DIR/package.old echo "<cmd arch=\"x64\" name=\"%NAME% 2013 Minimum x64\" path=\"x64\2013\vc_runtimeMinimum_x64.msi\" param=\"/q /norestart ADDEPLOY=1\">" >> $INST_DIR/package.old
echo "<check type=\"os\" condition=\">\" value=\"6.0.6002.0\" />" >> $INST_DIR/package.old echo "<check type=\"os\" condition=\">\" value=\"6.1.7600.0\" />" >> $INST_DIR/package.old
echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\msvcp110.dll\" value=\"$vc2010ver_atl_x64\"/>" >> $INST_DIR/package.old echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\msvcp120.dll\" value=\"$vc2013ver_msvcp_x64\"/>" >> $INST_DIR/package.old
echo "</cmd>" >> $INST_DIR/package.old echo "</cmd>" >> $INST_DIR/package.old
echo "<cmd arch=\"x64\" name=\"%NAME% 2013 Additional x64\" path=\"x64\2013\vc_runtimeAdditional_x64.msi\" param=\"/q /norestart\">" >> $INST_DIR/package.old echo "<cmd arch=\"x64\" name=\"%NAME% 2013 Additional x64\" path=\"x64\2013\vc_runtimeAdditional_x64.msi\" param=\"/q /norestart ADDEPLOY=1\">" >> $INST_DIR/package.old
echo "<check type=\"os\" condition=\">\" value=\"6.0.6002.0\" />" >> $INST_DIR/package.old echo "<check type=\"os\" condition=\">\" value=\"6.1.7600.0\" />" >> $INST_DIR/package.old
echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\mfc110.dll\" value=\"$vc2010ver_mfc_x64\"/>" >> $INST_DIR/package.old echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\mfc120.dll\" value=\"$vc2013ver_mfc_x64\"/>" >> $INST_DIR/package.old
echo "</cmd>" >> $INST_DIR/package.old echo "</cmd>" >> $INST_DIR/package.old
################################################### ###################################################
# Package.xml end and cleanup # Package.xml end and cleanup
################################################### ###################################################
echo "</install>" >> $INST_DIR/package.old echo "</install>" >> $INST_DIR/package.old
echo "</package>" >> $INST_DIR/package.old echo "</package>" >> $INST_DIR/package.old