ooo-build r13742 - in trunk: . patches/dev300

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Mon Sep  1 12:03:20 2008
New Revision: 13742
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13742&view=rev

Log:
        * patches/dev300/buildfix-msvc2008-express.diff,
          patches/dev300/buildfix-directx-path.diff,
          patches/dev300/apply: Fix build with MSVC 2008 Express and with
          DirectX's SDK strange $PATH.


Added:
   trunk/patches/dev300/buildfix-directx-path.diff
   trunk/patches/dev300/buildfix-msvc2008-express.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Sep  1 12:03:20 2008
@@ -258,6 +258,14 @@
 # don't lstat() that much while creating absolute URLs
 speed-sal-fewer-lstats.diff, i#89730, jholesov
 
+# support msvc 2008 express in oowintool
+buildfix-msvc2008-express.diff, i#93332, jholesov
+
+# fix build when PATH is set to something like /bin:"C:\blah\bleh":/ugh
+# (happened to me with DirectX SDK)
+buildfix-directx-path.diff, i#93333, jholesov
+
+
 [ CJK ]
 #set default CJK font fontsize as 10.5pt
 sw-default-cjk-fontsize.diff i#72010, jianhua

Added: trunk/patches/dev300/buildfix-directx-path.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/buildfix-directx-path.diff	Mon Sep  1 12:03:20 2008
@@ -0,0 +1,27 @@
+--- config_office/set_soenv.in	2008-09-01 11:17:18.238778500 +0200
++++ config_office/set_soenv.in	2008-09-01 12:22:09.738788000 +0200
+@@ -1328,7 +1328,23 @@ elsif ($platform =~ m/cygwin/)
+    if (($^O eq "cygwin")) { # Not for ActiveState perl
+        my $expandedPATH = $PATH;
+        $expandedPATH =~ s/(\$\w+)/$1/eeg;
++
++       # fix situations where PATH may look like /bin:"C:\blah\bleh":/ugh
++       my $fixedPATH = $oldPATH;
++       if ( $oldPATH =~ /"/ ) {
++	   $fixedPATH = "";
++	   foreach my $pathentry ( split( '"',$oldPATH ) ) {
++	       if ( ( $pathentry =~ /^$ps/ ) || ( $pathentry =~ /$ps$/ ) ) {
++		   $fixedPATH .= $pathentry;
++	       } else {
++		   chomp( $pathentry = qx{cygpath -d "$pathentry"} ) ;
++		   chomp( $pathentry = qx{cygpath -u "$pathentry"} ) ;
++		   $fixedPATH .= $pathentry;
++	       }
++	   }
++       }
++
+-       foreach my $pathentry (split($ps,$oldPATH)) {
++       foreach my $pathentry (split($ps,$fixedPATH)) {
+            if ( ! ( $expandedPATH =~ /(?:$ps|\A)(?:$pathentry)(?:$ps|\Z)/ ) ) {
+                $PATH .= $ps.$pathentry;
+                $expandedPATH .= $ps.$pathentry;

Added: trunk/patches/dev300/buildfix-msvc2008-express.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/buildfix-msvc2008-express.diff	Mon Sep  1 12:03:20 2008
@@ -0,0 +1,37 @@
+--- config_office/oowintool	2008-09-01 09:27:20.368864500 +0200
++++ config_office/oowintool	2008-09-01 10:17:41.042713000 +0200
+@@ -183,10 +183,24 @@ my %msvc_2008 = (
+     'dll_path' => 'redist/x86/Microsoft.VC90.CRT',
+     'dll_suffix' => '90'
+ );
++my %msvs_express_2008 = (
++    'ver' => '9.0',
++    'key' => 'Microsoft/VCExpress/9.0/Setup/VS/ProductDir',
++    'instmsi_path' => '?',
++    'dll_path' => 'VC/redist/x86/Microsoft.VC90.CRT',
++    'dll_suffix' => '90'
++);
++my %msvc_express_2008 = (
++    'ver' => '9.0',
++    'key' => 'Microsoft/VCExpress/9.0/Setup/VC/ProductDir',
++    'instmsi_path' => '?',
++    'dll_path' => 'redist/x86/Microsoft.VC90.CRT',
++    'dll_suffix' => '90'
++);
+ 
+ sub find_msvs()
+ {
+-    my @ms_versions = ( \%msvs_2008, \%msvs_2005, \%msvs_express_2005, \%msvs_net_2003_ea, \%msvs_net_2003 );
++    my @ms_versions = ( \%msvs_2008, \%msvs_express_2008, \%msvs_2005, \%msvs_express_2005, \%msvs_net_2003_ea, \%msvs_net_2003 );
+ 
+     for $ver (@ms_versions)
+     {
+@@ -201,7 +215,7 @@ sub find_msvs()
+ 
+ sub find_msvc()
+ {
+-    my @ms_versions = ( \%msvc_2008, \%msvc_2005, \%msvc_express_2005, \%msvc_net_2003 );
++    my @ms_versions = ( \%msvc_2008, \%msvc_express_2008, \%msvc_2005, \%msvc_express_2005, \%msvc_net_2003 );
+ 
+     for $ver (@ms_versions)
+     {