[ooo-build-commit] .: 2 commits - instsetoo_native/util oowintool

[Fridrich Strba]

 instsetoo_native/util/makefile.mk |    9 +++++++++
 oowintool                         |    3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 1e75650e8eb473df82d4d7af0c59eb8dd4fc2c1f
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Oct 7 14:19:02 2010 +0200

    Create openofficeall and openofficedevall dmake targets

diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 3c34c33..fb265ed 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -331,4 +331,13 @@ hack_msitemplates .PHONY:
     $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
     $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
 
+.IF "$(OS)" == "WNT"
+
+ALLLANGSTRING:=$(alllangiso)
+
+openofficeall: hack_msitemplates $(LOCALPYFILES) openoffice_$(ALLLANGSTRING:s/ /,/)$(PKGFORMAT:^".")
+
+openofficedevall: hack_msitemplates $(LOCALPYFILES) openofficedev_$(ALLLANGSTRING:s/ /,/)$(PKGFORMAT:^".")
+
+.ENDIF			# "$(OS)" == "WNT"
 
commit 6ed8e1a54994ed98bd00bbd085a82eca013a0419
Author: Jesús Corrius <jesus at softcatala.org>
Date:   Thu Oct 7 13:44:12 2010 +0200

    Detect the correct .NET Framework for Visual Studio 2008

diff --git a/oowintool b/oowintool
index 8d2e475..c02fc42 100755
--- a/oowintool
+++ b/oowintool
@@ -249,7 +249,8 @@ 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 "v2\." | head -n 1`;
+    my $csc_exe = `/bin/find "$dir" -iname csc.exe | grep "v3\.5\." | head -n 1` ||
+                  `/bin/find "$dir" -iname csc.exe | grep "v2\." | head -n 1`;
     print `dirname $csc_exe`;
 }