[Libreoffice-commits] .: post_download.in solenv/bin

[Tor Lillqvist]

 post_download.in                        |   12 ------------
 solenv/bin/modules/installer/control.pm |   14 --------------
 2 files changed, 26 deletions(-)

New commits:
commit 66b322a7b5a3142949259b502c6234ca7516583f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Dec 21 19:07:12 2010 +0200

    Drop msvc*7*.dll, see fdo#32426

diff --git a/post_download.in b/post_download.in
index a6bef09..9902ea0 100755
--- a/post_download.in
+++ b/post_download.in
@@ -113,15 +113,3 @@ Get the version corresponding to your Visual Studio from the Microsoft site
 and put it into external/vcredist.])
    fi
 fi
-
-dnl ===================================================================
-dnl Windows builds with MSVS 2008/2010 need msvcr71.dll in external/msvcp71
-dnl ===================================================================
-if test "$_os" = "WINNT"; then
-   AC_MSG_CHECKING([for msvcr71.dll])
-   if test -f ./external/msvcp71/msvcr71.dll; then
-      AC_MSG_RESULT([found])
-   else
-      AC_MSG_ERROR([msvcr71.dll is missing in external/msvcp71.])
-   fi
-fi
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index ad5478a..f0225dc 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -77,7 +77,6 @@ sub check_system_path
 {
     # The following files have to be found in the environment variable PATH
     # All platforms: zip
-    # Windows only: msvcp70.dll, msvcr70.dll for regcomp.exe
     # Windows only: "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe" for msi database and packaging
 
     my $onefile;	
@@ -105,19 +104,6 @@ sub check_system_path
     if (($installer::globals::iswin) && ($installer::globals::iswindowsbuild))
     {
         @needed_files_in_path = ("zip.exe", "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe");
-        
-        if ( $installer::globals::compiler eq "wntmsci8" )
-        {
-            push(@needed_files_in_path, "msvcp70.dll");
-            push(@needed_files_in_path, "msvcr70.dll");
-        }
-
-        if ( $installer::globals::compiler eq "wntmsci10" )
-        {
-            push(@needed_files_in_path, "msvcp71.dll");
-            push(@needed_files_in_path, "msvcr71.dll");
-        }
-        
     }
     elsif ($installer::globals::iswin)
     {