[Libreoffice-commits] .: download.in Makefile.am

[Jesús Corrius]

 Makefile.am |    4 +---
 download.in |    2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit a7fb7c8df5a8b588d2ac31dea88b072997e602ea
Author: Jesús Corrius <jesus at softcatala.org>
Date:   Thu Dec 9 15:31:23 2010 +0100

    Don't download unicows.exe

diff --git a/Makefile.am b/Makefile.am
old mode 100644
new mode 100755
index ae9fbbf..5404b48
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,13 +63,11 @@ $(STAMP_DIR)/patch.apply : $(top_srcdir)/patches/apply.pl \
 			   $(APPLY_DIR)/apply
 	if test "z$(BUILD_WIN32)" != "z"; then \
 	    cp -af $(BUILDDIR)/x86/* $(OOBUILDDIR)/external/dbghelp || true; \
-	    cp -af $(BUILDDIR)/*.dll $(OOBUILDDIR)/external/unicows || true; \
 	    mv $(OOBUILDDIR)/external/dbghelp/DbgHelp.Dll  \
 		     $(OOBUILDDIR)/external/dbghelp/dbghelp.dll.temp || true; \
 	    mv $(OOBUILDDIR)/external/dbghelp/dbghelp.dll.temp  \
 		     $(OOBUILDDIR)/external/dbghelp/dbghelp.dll || true; \
-	    chmod +x $(OOBUILDDIR)/external/dbghelp/*.dll \
-		     $(OOBUILDDIR)/external/unicows/*.dll || true; \
+	    chmod +x $(OOBUILDDIR)/external/dbghelp/*.dll || true; \
 	fi
 
 	test -n "$(OOO_GIT_MANAGED)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) prepare || true
diff --git a/download.in b/download.in
index 8387fe4..27177ca 100755
--- a/download.in
+++ b/download.in
@@ -151,7 +151,6 @@ sub download_tests_dependencies() {
 # FIXME: Hacky packinfo from setup_native; is needed in bootstrap for the split build
     'setup_native_packinfo-.*'           => '@MIRROR@/DEV300',
 # Win32 bits:
-    'unicows\.exe'                       => 'http://download.microsoft.com/download/b/7/5/b75eace3-00e2-4aa0-9a6f-0b6882c71642',
     # from http://www.microsoft.com/downloads/release.asp?releaseid=30682'
     'dbghinst\.EXE'                      => 'http://download.microsoft.com/download/platformsdk/Redist/5.0.2195.1/W9XNT4/EN-US',
     'instmsia.exe'                       => 'http://download.microsoft.com/download/WindowsInstaller/Install/2.0/W9XMe/EN-US',
@@ -436,7 +435,6 @@ if ('@BUILD_WIN32@' || $requires_ant{@DISTRO@})
 # Misc. bits for Win32
 if ('@BUILD_WIN32@' ne '')
 {
-    source_file( 'unicows.exe' ) unless '@DISTRO@' =~ m/NovellWin32|GoOoWin32/;
     source_file( 'dbghinst.EXE' );
     source_file( 'instmsiw.exe' );
     source_file( 'instmsia.exe' ) unless '@DISTRO@' =~ m/NovellWin32|GoOoWin32/;