[Libreoffice-commits] .: 4 commits - download lcms2/makefile.mk Makefile.top oowintool

Wed Aug 15 15:54:18 PDT 2012

Makefile.top      |    3 +++
 download          |   32 +++++++++++++++-----------------
 lcms2/makefile.mk |    2 +-
 oowintool         |   10 +++++-----
 4 files changed, 24 insertions(+), 23 deletions(-)

New commits:
commit 5133d3c48fd6d2a795e42b87a1e7b464946606a3
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Tue Aug 14 10:36:05 2012 -0400

    fix error when dictionaries has not been fetched yet
    
    Change-Id: Id40b2fb6f8e1667bcb5164e483ea7c6949b627a1

diff --git a/Makefile.top b/Makefile.top
index 2622e3e..d9ddea4 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -247,7 +247,10 @@ xpdf\
 xsltml\
 zlib\
 
+ifneq ($(wildcard dictionaries/Module_dictionaries.mk),)
 gb_TAILBUILDMODULES := $(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules)
+endif
+
 export gb_TAILBUILDTARGET=all slowcheck
 
 define gbuild_module_rules
commit 48fd7112d3890036d4dc321a65e3281a13c3c5f2
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Sun Aug 12 16:32:11 2012 -0400

    fix build with VS2010
    
    Change-Id: Ifee45475f8cfeee6b2a4f880f0ff1cc7f9024715

diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk
index b6b571f..52b7b4a 100644
--- a/lcms2/makefile.mk
+++ b/lcms2/makefile.mk
@@ -56,7 +56,7 @@ CONFIGURE_ACTION =
 BUILD_DIR=Projects/VC2010/lcms2_DLL
 
 .IF "$(CCNUMVER)" >= "001600000000"
-BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32
+BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 /p:TargetName=lcms2
 .ELSE
 BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe lcms2_DLL.vcproj "Release|Win32"
 .ENDIF
commit 6b0b50e0ec05a6a5279597a3c1158190969e2de0
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Sun Aug 12 16:04:56 2012 -0400

    Fix build with VS2010
    
    Change-Id: Ic3bbb20c446545d67682a6c547fb69e2255eb0b7

diff --git a/oowintool b/oowintool
index c9d74f6..de929cb 100755
--- a/oowintool
+++ b/oowintool
@@ -200,11 +200,11 @@ sub print_msvs_productdir()
 
 sub print_csc_compiler_dir()
 {
-    my $dir = cygpath (reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/InstallRoot"), 'w', $output_format);
-    my $csc_exe = `/bin/find "$dir" -iname csc.exe | grep "v3\.5\." | head -n 1` ||
-                  `/bin/find "$dir" -iname csc.exe | grep "v4\." | head -n 1` ||
-                  `/bin/find "$dir" -iname csc.exe | grep "v2\." | head -n 1`;
-    print `dirname $csc_exe`;
+	my $csc_exe =
+			reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/NET Framework Setup/NDP/v4/Client/InstallPath") ||
+			reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/NET Framework Setup/NDP/v3.5/InstallPath") ||
+			reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/InstallRoot") . "v2.0.50727";
+	print cygpath ($csc_exe, 'w', $output_format);
 }
 
 sub print_dotnetsdk_dir()
commit d7c7061fec80bdc3e2fea6bdfc4485c483835ba3
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Sun Aug 12 15:54:39 2012 -0400

    fix broken download links for dbghelp.dll and gdiplus.dll
    
    Change-Id: Icb567a848162bcee072476e817cc82278bddfd99

diff --git a/download b/download
index 99139ef..19f91e7 100755
--- a/download
+++ b/download
@@ -179,8 +179,8 @@ for i in $filelist ; do
 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"
+    downloaditem "http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/setup/WinSDKDebuggingTools/" "dbg_x86.msi" "2bd67a7b00507ad93539e138a4a6a2bf"
+    downloaditem "http://download.microsoft.com/download/E/9/F/E9FCA9E9-9908-4D8F-B491-8E8A4C294C01/" "WindowsXP-KB958911-x86-ENU.exe" "ff084c5815b0672d54628158b820f5b1"
 fi
 
 if [ -f $start_dir/sources.ver -a ! -d $start_dir/.git ] ; then
@@ -215,23 +215,21 @@ if [ "$COM" = "MSC" -a -n "$md5sum" ]; then
     # This can be run only on Windows itself (Cygwin)
     TMPUNPACK=`cygpath -d $TARFILE_LOCATION/tmp`
     chmod a+w $TARFILE_LOCATION/tmp
-    if [ ! -f ./external/dbghelp/dbghelp.dll -a -f $TARFILE_LOCATION/dbghinst.EXE ]; then
-	if [ ! -x `cygpath $TARFILE_LOCATION`/dbghinst.EXE ]; then
-	    chmod +x `cygpath $TARFILE_LOCATION`/dbghinst.EXE
-	fi
-        $TARFILE_LOCATION/dbghinst.EXE /T:$TMPUNPACK /C
-        sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/dbghelp.exe | sed "s/ .*//"`
-        if [ "$sum" = "cd3086a91e37965dd761ef5fd5df5b15" ]; then
-            unzip -LL -j -o -d ./external/dbghelp $TARFILE_LOCATION/tmp/dbghelp.exe
+    if [ ! -f ./external/dbghelp/dbghelp.dll -a -f $TARFILE_LOCATION/dbg_x86.msi ]; then
+        msiexec /a `cygpath -d $TARFILE_LOCATION/dbg_x86.msi` /qn TARGETDIR=$TMPUNPACK SHORTFILENAMES=1
+		dbghelp_dll_path=PFiles/DbgTools/dbghelp.dll
+        sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/$dbghelp_dll_path | sed "s/ .*//"`
+        if [ "$sum" = "4003e34416ebd25e4c115d49dc15e1a7" ]; then
+			cp $TARFILE_LOCATION/tmp/$dbghelp_dll_path ./external/dbghelp/dbghelp.dll
         fi
     fi
-    if [ ! -f ./external/gdiplus/gdiplus.dll -a -f $TARFILE_LOCATION/WindowsXP-KB975337-x86-ENU.exe ]; then
-	gdiplus_dll_path=asms/10/msft/windows/gdiplus/gdiplus.dll
-	chmod +x `cygpath $TARFILE_LOCATION`/WindowsXP-KB975337-x86-ENU.exe
+    if [ ! -f ./external/gdiplus/gdiplus.dll -a -f $TARFILE_LOCATION/WindowsXP-KB958911-x86-ENU.exe ]; then
+	gdiplus_dll_path=SP3QFE/asms/10/msft/windows/gdiplus/gdiplus.dll
+	chmod +x `cygpath $TARFILE_LOCATION`/WindowsXP-KB958911-x86-ENU.exe
 
 	# Run it through cmd so that the UAC prompt is displayed
 	echo
-	echo "NOTE: We are running the Microsoft KB975337 security fix installer"
+	echo "NOTE: We are running the Microsoft KB958911 security fix installer"
 	echo "to get gdiplus.dll. You will most probably get a UAC prompt now."
 	echo "If you trust us, just enter your administrator password."
 	echo "The security fix is run with the /extract switch to just unpack"
@@ -245,17 +243,17 @@ if [ "$COM" = "MSC" -a -n "$md5sum" ]; then
 	echo
 	echo
 	echo
-        cmd /c "`cygpath -d $TARFILE_LOCATION/WindowsXP-KB975337-x86-ENU.exe` /extract:$TMPUNPACK /q"
+        cmd /c "`cygpath -d $TARFILE_LOCATION/WindowsXP-KB958911-x86-ENU.exe` /extract:$TMPUNPACK /q"
 	if [ -f $TARFILE_LOCATION/tmp/$gdiplus_dll_path ]; then
 	    echo "Extraction succeeded"
 	    sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/$gdiplus_dll_path | sed "s/ .*//"`
-	    if [ "$sum" = "4721ab485e0c29cd1617a5f296b9cc47" ]; then
+	    if [ "$sum" = "3a95b4d80a3586ab1e2f0c608608ebac" ]; then
 		cp $TARFILE_LOCATION/tmp/$gdiplus_dll_path ./external/gdiplus/gdiplus.dll
 	    else
 		echo "But unexpected checksum of $gdiplus_dll_path"
 	    fi
 	else
-	    echo "WindowsXP-KB975337-x86-ENU.exe did not unpack the expected $gdiplus_dll_path"
+	    echo "WindowsXP-KB958911-x86-ENU.exe did not unpack the expected $gdiplus_dll_path"
         fi
     fi
 fi
