diff options
| -rwxr-xr-x | download | 17 | ||||
| -rw-r--r-- | external/prj/d.lst | 3 | ||||
| -rw-r--r-- | external/vcredist/README_vcredistX.exe | 2 | ||||
| -rw-r--r-- | post_download.in | 22 |
4 files changed, 0 insertions, 44 deletions
@@ -178,17 +178,6 @@ done if [ "$COM" = "MSC" ]; then downloaditem "http://download.microsoft.com/download/platformsdk/Redist/5.0.2195.1/W9XNT4/EN-US/" "dbghinst.EXE" "096f1d53d9ba09cde27d6f7c2ea6cc47" downloaditem "http://download.microsoft.com/download/a/b/c/abc45517-97a0-4cee-a362-1957be2f24e1/" "WindowsXP-KB975337-x86-ENU.exe" "946d00d87e4094f3a6e425e2d538eadd" - - msvcver=`$SRC_ROOT/oowintool --msvc-ver` - case "$msvcver" in - 9.0) - downloaditem "http://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/" "vcredist_x86.exe" "35da2bf2befd998980a495b6f4f55e60" - downloaditem "http://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/" "vcredist_x64.exe" "e2ada570911edaaae7d1b3c979345fce" - ;; - *) - ;; - esac - fi if [ -f $start_dir/bootstrap.ver -a ! -d $start_dir/.git ] ; then @@ -263,12 +252,6 @@ if [ "$COM" = "MSC" -a -n "$md5sum" ]; then echo "WindowsXP-KB975337-x86-ENU.exe did not unpack the expected $gdiplus_dll_path" fi fi - if [ ! -f ./external/vcredist/vcredist_x86.exe -a -f $TARFILE_LOCATION/vcredist_x86.exe ]; then - cp $TARFILE_LOCATION/vcredist_x86.exe ./external/vcredist/vcredist_x86.exe - fi - if [ ! -f ./external/vcredist/vcredist_x64.exe -a -f $TARFILE_LOCATION/vcredist_x64.exe ]; then - cp $TARFILE_LOCATION/vcredist_x64.exe ./external/vcredist/vcredist_x64.exe - fi fi # OxygenOffice extras diff --git a/external/prj/d.lst b/external/prj/d.lst index d24455bc17ee..fb1bd77b6ea8 100644 --- a/external/prj/d.lst +++ b/external/prj/d.lst @@ -45,9 +45,6 @@ mkdir: %_DEST%\inc\external\wine ..\unowinreg\unowinreg.dll %_DEST%\bin\unowinreg.dll -..\vcredist\vcredist_x86.exe %_DEST%\bin\vcredist_x86.exe -..\vcredist\vcredist_x64.exe %_DEST%\bin\vcredist_x64.exe - ..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll ..\%__SRC%\lib\libmsvcrt*.* %_DEST%\lib\lib*.* diff --git a/external/vcredist/README_vcredistX.exe b/external/vcredist/README_vcredistX.exe deleted file mode 100644 index fcea38371c65..000000000000 --- a/external/vcredist/README_vcredistX.exe +++ /dev/null @@ -1,2 +0,0 @@ -Put into this directory the vcredist_x86.exe and vcredist_x64.exe -correspoding to the runtime your Visual Studio version links with. diff --git a/post_download.in b/post_download.in index ea6b9433adb7..79b637e35fc0 100644 --- a/post_download.in +++ b/post_download.in @@ -70,25 +70,3 @@ You may have to search Microsoft's website. Last time it was seen at: <http://www.microsoft.com/downloads/details.aspx?familyid=6A63AB9C-DF12-4D41-933C-BE590FEAA05A&displaylang=en>.]) fi fi - -dnl =================================================================== -dnl Windows builds need vcredist_x86.exe and vcredist_x64.exe in external/vcredist/ -dnl =================================================================== -if test "$COM" = "MSC"; then - AC_MSG_CHECKING([for vcredist_x86.exe]) - if test -e ./external/vcredist/vcredist_x86.exe; then - AC_MSG_RESULT([found]) - else - AC_MSG_ERROR([vcredist_x86.exe is missing in external/vcredist/. -Get the version corresponding to your Visual Studio from the Microsoft site -and put it into external/vcredist.]) - fi - AC_MSG_CHECKING([for vcredist_x64.exe]) - if test -e ./external/vcredist/vcredist_x64.exe; then - AC_MSG_RESULT([found]) - else - AC_MSG_ERROR([vcredist_x64.exe is missing in external/vcredist/. -Get the version corresponding to your Visual Studio from the Microsoft site -and put it into external/vcredist.]) - fi -fi |