From 4edda7425217ef38f8df8e6035d728c66d6b9fbf Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Mon, 16 Sep 2013 20:07:09 +0200 Subject: [PATCH] small fiexes --- VS7.0sp1-KB837234-X86.exe.sha1sum | 1 - VS7.1sp1-KB918007-X86.exe.sha1sum | 1 - VS7.1sp1-KB927696-X86.exe.sha1sum | 1 - builder-product.cfg | 91 +++++++++++++++---------------- builder-targets-cb.sh | 30 ++++++---- 5 files changed, 62 insertions(+), 62 deletions(-) delete mode 100644 VS7.0sp1-KB837234-X86.exe.sha1sum delete mode 100644 VS7.1sp1-KB918007-X86.exe.sha1sum delete mode 100644 VS7.1sp1-KB927696-X86.exe.sha1sum diff --git a/VS7.0sp1-KB837234-X86.exe.sha1sum b/VS7.0sp1-KB837234-X86.exe.sha1sum deleted file mode 100644 index 0bae9be..0000000 --- a/VS7.0sp1-KB837234-X86.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -7cad96556ca3bdc4b99e89937ea01552f2cb6a32 */home/mario/.aio-dist-cache/general-runtimes-1.1.0.5/x86/VS7.0sp1-KB837234-X86.exe diff --git a/VS7.1sp1-KB918007-X86.exe.sha1sum b/VS7.1sp1-KB918007-X86.exe.sha1sum deleted file mode 100644 index 2b162f2..0000000 --- a/VS7.1sp1-KB918007-X86.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -e8e83d93c690ded045215acaab55947cbf7a4c15 */home/mario/.aio-dist-cache/general-runtimes-1.1.0.5/x86/VS7.1sp1-KB918007-X86.exe diff --git a/VS7.1sp1-KB927696-X86.exe.sha1sum b/VS7.1sp1-KB927696-X86.exe.sha1sum deleted file mode 100644 index 817b1e1..0000000 --- a/VS7.1sp1-KB927696-X86.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -b78242b0e29b2a0b3dc20067b8422b5527077a83 */home/mario/.aio-dist-cache/general-runtimes-1.1.0.5/x86/VS7.1sp1-KB927696-X86.exe diff --git a/builder-product.cfg b/builder-product.cfg index b5cca92..d7569cb 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -24,6 +24,7 @@ VB4VER="400" VB5VER="50" WINCOMPVER="2012.12.23" VB6VER="60sp6" +VBSETVER="1.00" VC1VER="10" VC2002VER="70sp1" VC2003VER="71sp1" @@ -133,23 +134,23 @@ DL_ARCH[15]="x86" DL_EXTRACT_FORMAT[15]="7zip" DL_EXTRACT_TO[15]="vb6/update" -DL_FILE[16]="vcrun${VC2002VER}.zip" -DL_SOURCE[16]="http://spench.net/drupal/files/MFC7.0_Runtime.zip" +DL_FILE[16]="vbcrt-${VBSETVER}.zip" +DL_SOURCE[16]="http://www.vb-paradise.de/downloads/vbcrt/vbcrt.zip" DL_ARCH[16]="x86" DL_EXTRACT_FORMAT[16]="7zip" -DL_EXTRACT_TO[16]="vc70/core" +DL_EXTRACT_TO[16]="vbset" -DL_FILE[17]="Ricks-YumeYao_MicrosoftVC7891012RuntimeLibraries_Addon_${RICKRUN}.7z" -DL_SOURCE[17]="http://brianspcrepair.com/ricktendo/Archive/Ricks-YumeYao_MicrosoftVC7891012RuntimeLibraries_Addon_${RICKRUN}.7z" +DL_FILE[17]="vcrun${VC2002VER}.zip" +DL_SOURCE[17]="http://spench.net/drupal/files/MFC7.0_Runtime.zip" DL_ARCH[17]="x86" DL_EXTRACT_FORMAT[17]="7zip" -DL_EXTRACT_TO[17]="vc70/rick" +DL_EXTRACT_TO[17]="vc70/core" -DL_FILE[18]="VS7.0sp1-KB837234-X86.exe" -DL_SOURCE[18]="http://download.microsoft.com/download/4/1/a/41a70f33-ee71-417c-b830-4d3bd0acac13/VS7.0sp1-KB837234-X86.exe" +DL_FILE[18]="Ricks-YumeYao_MicrosoftVC7891012RuntimeLibraries_Addon_${RICKRUN}.7z" +DL_SOURCE[18]="http://brianspcrepair.com/ricktendo/Archive/Ricks-YumeYao_MicrosoftVC7891012RuntimeLibraries_Addon_${RICKRUN}.7z" DL_ARCH[18]="x86" -DL_EXTRACT_FORMAT[18]="cab" -DL_EXTRACT_TO[18]="vc70/sp1" +DL_EXTRACT_FORMAT[18]="7zip" +DL_EXTRACT_TO[18]="vc70/rick" DL_FILE[19]="VS7.0sp1-KB924642-X86.exe" DL_SOURCE[19]="http://download.microsoft.com/download/6/b/e/6be11d8a-e0c7-429c-ac8c-9860e313ced9/VS7.0sp1-KB924642-X86.exe" @@ -169,63 +170,57 @@ DL_ARCH[21]="x86" DL_EXTRACT_FORMAT[21]="7zip" DL_EXTRACT_TO[21]="vc71/rick" -DL_FILE[22]="VS7.1sp1-KB918007-X86.exe" -DL_SOURCE[22]="http://download.microsoft.com/download/b/5/f/b5f05fd6-2509-4a88-b70c-e0b1d1312852/VS7.1sp1-KB918007-X86.exe" +DL_FILE[22]="VS7.1sp1-KB971089-X86.exe" +DL_SOURCE[22]="http://download.microsoft.com/download/D/9/E/D9ECEE52-613F-4327-8147-073882D999F9/VS7.1sp1-KB971089-X86.exe" DL_ARCH[22]="x86" DL_EXTRACT_FORMAT[22]="cab" -DL_EXTRACT_TO[22]="vc71/sp1" +DL_EXTRACT_TO[22]="vc71/sp1fix" -DL_FILE[23]="VS7.1sp1-KB927696-X86.exe" -DL_SOURCE[23]="http://download.microsoft.com/download/f/0/5/f052914b-3a0f-4e90-b039-395005f77ef2/VS7.1sp1-KB927696-X86.exe" +DL_FILE[23]="autoit-v${AUTOITVER}_x86.zip" +DL_SOURCE[23]="http://www.autoitscript.com/autoit3/files/beta/autoit/autoit-v${AUTOITVER}.zip" DL_ARCH[23]="x86" -DL_EXTRACT_FORMAT[23]="cab" -DL_EXTRACT_TO[23]="vc71/sp1fix" +DL_EXTRACT_FORMAT[23]="7zip" +DL_EXTRACT_TO[23]="autoit" -DL_FILE[24]="autoit-v${AUTOITVER}_x86.zip" +DL_FILE[24]="autoit-v${AUTOITVER}_x64.zip" DL_SOURCE[24]="http://www.autoitscript.com/autoit3/files/beta/autoit/autoit-v${AUTOITVER}.zip" -DL_ARCH[24]="x86" +DL_ARCH[24]="x64" DL_EXTRACT_FORMAT[24]="7zip" DL_EXTRACT_TO[24]="autoit" -DL_FILE[25]="autoit-v${AUTOITVER}_x64.zip" -DL_SOURCE[25]="http://www.autoitscript.com/autoit3/files/beta/autoit/autoit-v${AUTOITVER}.zip" -DL_ARCH[25]="x64" -DL_EXTRACT_FORMAT[25]="7zip" -DL_EXTRACT_TO[25]="autoit" +DL_FILE[25]="Win32OpenSSL_Light-${OPENSSLVER}.exe" +DL_SOURCE[25]="http://slproweb.com/download/Win32OpenSSL_Light-${OPENSSLVER}.exe" +DL_ARCH[25]="x86" +DL_EXTRACT_FORMAT[25]="cp" +DL_EXTRACT_TO[25]="openssl" -DL_FILE[26]="Win32OpenSSL_Light-${OPENSSLVER}.exe" -DL_SOURCE[26]="http://slproweb.com/download/Win32OpenSSL_Light-${OPENSSLVER}.exe" -DL_ARCH[26]="x86" +DL_FILE[26]="Win64OpenSSL_Light-${OPENSSLVER}.exe" +DL_SOURCE[26]="http://slproweb.com/download/Win64OpenSSL_Light-${OPENSSLVER}.exe" +DL_ARCH[26]="x64" DL_EXTRACT_FORMAT[26]="cp" DL_EXTRACT_TO[26]="openssl" -DL_FILE[27]="Win64OpenSSL_Light-${OPENSSLVER}.exe" -DL_SOURCE[27]="http://slproweb.com/download/Win64OpenSSL_Light-${OPENSSLVER}.exe" -DL_ARCH[27]="x64" -DL_EXTRACT_FORMAT[27]="cp" -DL_EXTRACT_TO[27]="openssl" +DL_FILE[27]="SDL-${SDL1VER}-win32-x86.zip" +DL_SOURCE[27]="http://www.libsdl.org/release/SDL-${SDL1VER}-win32.zip" +DL_ARCH[27]="x86" +DL_EXTRACT_FORMAT[27]="7zip" +DL_EXTRACT_TO[27]="sdl1" -DL_FILE[28]="SDL-${SDL1VER}-win32-x86.zip" -DL_SOURCE[28]="http://www.libsdl.org/release/SDL-${SDL1VER}-win32.zip" -DL_ARCH[28]="x86" +DL_FILE[28]="SDL-${SDL1VER}-win32-x64.zip" +DL_SOURCE[28]="http://www.libsdl.org/release/SDL-${SDL1VER}-win32-x64.zip" +DL_ARCH[28]="x64" DL_EXTRACT_FORMAT[28]="7zip" DL_EXTRACT_TO[28]="sdl1" -DL_FILE[29]="SDL-${SDL1VER}-win32-x64.zip" -DL_SOURCE[29]="http://www.libsdl.org/release/SDL-${SDL1VER}-win32-x64.zip" -DL_ARCH[29]="x64" +DL_FILE[29]="SDL2-${SDL2VER}-win32-x86.zip" +DL_SOURCE[29]="http://www.libsdl.org/release/SDL2-${SDL2VER}-win32-x86.zip" +DL_ARCH[29]="x86" DL_EXTRACT_FORMAT[29]="7zip" -DL_EXTRACT_TO[29]="sdl1" +DL_EXTRACT_TO[29]="sdl2" -DL_FILE[30]="SDL2-${SDL2VER}-win32-x86.zip" -DL_SOURCE[30]="http://www.libsdl.org/release/SDL2-${SDL2VER}-win32-x86.zip" -DL_ARCH[30]="x86" +DL_FILE[30]="SDL2-${SDL2VER}-win32-x64.zip" +DL_SOURCE[30]="http://www.libsdl.org/release/SDL2-${SDL2VER}-win32-x64.zip" +DL_ARCH[30]="x64" DL_EXTRACT_FORMAT[30]="7zip" DL_EXTRACT_TO[30]="sdl2" -DL_FILE[31]="SDL2-${SDL2VER}-win32-x64.zip" -DL_SOURCE[31]="http://www.libsdl.org/release/SDL2-${SDL2VER}-win32-x64.zip" -DL_ARCH[31]="x64" -DL_EXTRACT_FORMAT[31]="7zip" -DL_EXTRACT_TO[31]="sdl2" - diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index 96648fd..a6ed768 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -40,6 +40,9 @@ function create() { extract_file cab $INST_DIR/Temp/x86/kels/Runtimes.cab $INST_DIR/Temp/x86/kels extract_file 7zip $INST_DIR/Temp/x86/vb6/core/*.exe $INST_DIR/Temp/x86/vb6/core extract_file inno $INST_DIR/Temp/x86/vb6/update/*.exe $INST_DIR/Temp/x86/vb6/update + extract_file inno $INST_DIR/Temp/x86/vbset/*.exe $INST_DIR/Temp/x86/vbset + extract_file msp-x $INST_DIR/Temp/x86/vc71/sp1fix/*.msp $INST_DIR/Temp/x86/vc71/sp1fix + extract_file cab $INST_DIR/Temp/x86/vc71/sp1fix/PCW* $INST_DIR/Temp/x86/vc71/sp1fix extract_file inno $INST_DIR/Temp/x86/openssl/*.exe $INST_DIR/Temp/x86/openssl extract_file inno $INST_DIR/Temp/x64/openssl/*.exe $INST_DIR/Temp/x64/openssl @@ -196,6 +199,17 @@ function create() { copyver $i $INST_DIR/bin/system32/`basename $i` done + # ============================================================================================= + # VB Set + # ============================================================================================= + + rm $INST_DIR/Temp/x86/vbset/\{sys\}/w95* + rm $INST_DIR/Temp/x86/vbset/\{sys\}/*.inf + for i in $INST_DIR/Temp/x86/vbset/\{sys\}/*.{dll,tlb,ocx} + do + copyver $i $INST_DIR/bin/system32/`basename $i` + done + # ============================================================================================= # Vc 7.0.0 # ============================================================================================= @@ -209,10 +223,6 @@ function create() { copyver $INST_DIR/Temp/x86/vc70/rick/$i.dll $INST_DIR/bin/system32/$i.dll done for i in atl70 msvcr70 msvci70 mfc70 mfc70u mfc70deu mfc70esp mfc70fra mfc70ita mfc70chs mfc70cht mfc70jpn mfc70kor msvcp70 - do - copyver $INST_DIR/Temp/x86/vc70/sp1/fl_${i}_dll_* $INST_DIR/bin/system32/$i.dll - done - for i in atl70 msvcr70 msvci70 mfc70 mfc70u mfc70deu mfc70esp mfc70fra mfc70ita mfc70chs mfc70cht mfc70jpn mfc70kor msvcp70 do copyver $INST_DIR/Temp/x86/vc70/sp1fix/fl_${i}_dll_* $INST_DIR/bin/system32/$i.dll done @@ -231,11 +241,7 @@ function create() { done for i in atl71 msvcr71 mfc71 mfc71u mfc71deu mfc71esp mfc71fra mfc71ita mfc71chs mfc71cht mfc71jpn mfc71kor msvcp71 do - copyver $INST_DIR/Temp/x86/vc71/sp1/fl_${i}_dll_* $INST_DIR/bin/system32/$i.dll - done - for i in atl71 msvcr71 mfc71 mfc71u mfc71deu mfc71esp mfc71fra mfc71ita mfc71chs mfc71cht mfc71jpn mfc71kor msvcp71 - do - copyver $INST_DIR/Temp/x86/vc71/sp1fix/fl_${i}_dll_* $INST_DIR/bin/system32/$i.dll + copyver $INST_DIR/Temp/x86/vc71/sp1fix/fl_${i}_dll__* $INST_DIR/bin/system32/$i.dll done # ============================================================================================= @@ -351,8 +357,6 @@ write_svcpack_file $INST_DIR/install_script.iss "Setup" "AppVersion" "${VERSION} ISCC.exe /Q /O"$(cygpath -pw "$INST_DIR")" /F"Geos_One_General_Runtimes_Installer_$VERSION" "$(cygpath -pw "$INST_DIR/install_script.iss")" -rm $INST_DIR/*.iss -rm $INST_DIR/bin ################################################### # Temp Package.xml @@ -372,5 +376,9 @@ echo "" >> $INST_DIR/package.old tidy_xml $INST_DIR/package.old $INST_DIR/package.xml rm $INST_DIR/package.old + +rm $INST_DIR/*.iss +rm -rf $INST_DIR/bin +#exit 1 }