GNOME.org
 

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

Author: tml
Date: Wed Aug  6 16:50:25 2008
New Revision: 13487
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13487&view=rev

Log:
2008-08-06  Tor Lillqvist  <tml novell com>

	* patches/dev300/config_office-msvc-compat.diff
	* patches/dev300/config_office-msvc-compat-m28.diff: Split into
	separate versions, renamed original for [ < dev300-m29 < ooo300-m1
	] and an updated one for [ >= dev300-m29 >= ooo300-m1 ].

	* patches/dev300/apply: Do it.



Added:
   trunk/patches/dev300/config_office-msvc-compat-m28.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/config_office-msvc-compat.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Aug  6 16:50:25 2008
@@ -2338,7 +2338,14 @@
 
 sd-more-title-styles.diff, i#23221, thorsten
 officecfg-bighandles-default.diff, thorsten
+
+[ Fixes < dev300-m29 < ooo300-m1 ]
+config_office-msvc-compat-m28.diff, thorsten
+
+[ Fixes >= dev300-m29 >= ooo300-m1]
 config_office-msvc-compat.diff, thorsten
+
+[ Fixes ]
 config_office-disable-atl.diff, thorsten
 xmlsecurity-disable-moz.diff, thorsten
 solenv-paths.diff, caolan

Added: trunk/patches/dev300/config_office-msvc-compat-m28.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/config_office-msvc-compat-m28.diff	Wed Aug  6 16:50:25 2008
@@ -0,0 +1,180 @@
+--- config_office/oowintool	6 Mar 2008 11:46:11 -0000	1.5
++++ config_office/oowintool	18 Jul 2008 16:30:04 -0000
+@@ -94,48 +94,44 @@
+ 
+ sub print_psdk_home()
+ {
+-    my $value;
+-    $value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/Directories/Install Dir');
++    my ($value, $key);
++	$value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/v6.1/InstallationFolder');
+     if (!defined $value)
+     {
+-        $key = reg_find_key ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install Dir');
+-        $value = reg_get_value ($key);
++        $value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/CurrentInstallFolder');
+     }
++    if (!defined $value)
++    {
++	    $value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/Directories/Install Dir');
++	}
++    if (!defined $value)
++    {
++	    $key = reg_find_key ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install Dir');
++	    $value = reg_get_value ($key);
++	}
++    if (!defined $value)
++    {
++        my $dir = cygpath (find_msvc()->{'product_dir'}, 'w', $output_format);
++		$value = `/bin/find "$dir" -iname platformsdk | head -n 1`;
++    }
++
+     defined $value || die "psdk not found";
+ 
+     print cygpath ($value, 'w', $output_format);
+ }
+ 
+-my %msvc6 = (
+-    'ver' => '6.0',
+-    'key' => 'Microsoft/VisualStudio/6.0/Setup/Microsoft Visual C++/ProductDir',
+-);
+-my %msvc_net_2002 = (
+-    'ver' => '7.0',
+-    'key' => 'Microsoft/VisualStudio/7.0/Setup/VC/ProductDir',
+-    'instmsi_path' => '../Common7/Tools/Deployment/MsiRedist',
+-    'dll_path' => '../Visual Studio .NET Professional - English', # testme ...
+-    'dll_suffix' => '70'
+-);
+-my %msvs_net_2002 = (
+-    'ver' => '7.0',
+-    'key' => 'Microsoft/VisualStudio/7.0/Setup/VS/ProductDir',
+-    'instmsi_path' => 'Common7/Tools/Deployment/MsiRedist',
+-    'dll_path' => 'Visual Studio .NET Professional - English', # testme ...
+-    'dll_suffix' => '70'
+-);
+ my %msvc_net_2003 = (
+     'ver' => '7.1',
+     'key' => 'Microsoft/VisualStudio/7.1/Setup/VC/ProductDir',
+     'instmsi_path' => '../Common7/Tools/Deployment/MsiRedist',
+-    'dll_path' => '../SDK/v1.1/Bin',
++    'dll_path' => '../Visual Studio .NET Professional 2003 - English',
+     'dll_suffix' => '71'
+ );
+ my %msvs_net_2003 = (
+     'ver' => '7.1',
+     'key' => 'Microsoft/VisualStudio/7.1/Setup/VS/ProductDir',
+     'instmsi_path' => 'Common7/Tools/Deployment/MsiRedist',
+-    'dll_path' => 'Visual Studio .NET Professional 2003 - English', # testme ...
++    'dll_path' => 'Visual Studio .NET Professional 2003 - English',
+     'dll_suffix' => '71'
+ );
+ my %msvs_net_2003_ea = (
+@@ -159,10 +155,38 @@
+     'dll_path' => '../SDK/v2.0/Bin',
+     'dll_suffix' => '80'
+ );
++my %msvs_2005 = (
++    'ver' => '8.0',
++    'key' => 'Microsoft/VisualStudio/8.0/Setup/VS/ProductDir',
++    'instmsi_path' => 'SDK/v2.0/BootStrapper/Packages/InstMSI',
++    'dll_path' => 'Visual Studio .NET Professional 2005 - English',
++    'dll_suffix' => '80'
++);
++my %msvc_2005 = (
++    'ver' => '8.0',
++    'key' => 'Microsoft/VisualStudio/8.0/Setup/VC/ProductDir',
++    'instmsi_path' => '../SDK/v2.0/BootStrapper/Packages/InstMSI',
++    'dll_path' => '../SDK/v2.0/Bin',
++    'dll_suffix' => '80'
++);
++my %msvs_2008 = (
++    'ver' => '9.0',
++    'key' => 'Microsoft/VisualStudio/9.0/Setup/VS/ProductDir',
++    'instmsi_path' => '?',
++    'dll_path' => 'VC/redist/x86/Microsoft.VC90.CRT',
++    'dll_suffix' => '90'
++);
++my %msvc_2008 = (
++    'ver' => '9.0',
++    'key' => 'Microsoft/VisualStudio/9.0/Setup/VC/ProductDir',
++    'instmsi_path' => '?',
++    'dll_path' => 'redist/x86/Microsoft.VC90.CRT',
++    'dll_suffix' => '90'
++);
+ 
+ sub find_msvs()
+ {
+-    my @ms_versions = ( \%msvs_express_2005, \%msvs_net_2003_ea, \%msvs_net_2003, \%msvs_net_2002, \%msvc6 );
++    my @ms_versions = ( \%msvs_2008, \%msvs_2005, \%msvs_express_2005, \%msvs_net_2003_ea, \%msvs_net_2003 );
+ 
+     for $ver (@ms_versions)
+     {
+@@ -177,7 +201,7 @@
+ 
+ sub find_msvc()
+ {
+-    my @ms_versions = ( \%msvc_express_2005, \%msvc_net_2003, \%msvc_net_2002, \%msvc6 );
++    my @ms_versions = ( \%msvc_2008, \%msvc_2005, \%msvc_express_2005, \%msvc_net_2003 );
+ 
+     for $ver (@ms_versions)
+     {
+@@ -210,14 +234,16 @@
+ 
+ sub print_csc_compiler_dir()
+ {
+-    my $dir = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/InstallRoot");
+-    $dir .= "v1.1.4322"; # lame-but ...
+-    print cygpath ($dir, 'w', $output_format);
++    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`;
++    print `dirname $csc_exe`;
+ }
+ 
+ sub print_dotnetsdk_dir()
+ {
+-    my $dir = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv1.1");
++    my $dir = 
++          reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv1.1") ||
++          reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv2.0");
+     print cygpath ($dir, 'w', $output_format);
+ }
+ 
+@@ -225,7 +251,8 @@
+ {
+     my $dir =
+ 	  reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.5/JavaHome") ||
+-	  reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.4/JavaHome");
++	  reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.4/JavaHome") ||
++	  reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.3/JavaHome");
+     print cygpath($dir, 'w', $output_format); 
+ }
+ 
+@@ -242,6 +269,7 @@
+     -f "$src/$fname" || die "can't find $src";
+     -d $dest || die "no directory $dest";
+ 
++	print STDERR "Copying $src/$fname to $dest\n";
+     copy ("$src/$fname", $dest) || die "copy failed: $!";
+     chmod (0755, "$dest/$fname") || die "failed to set dll executable: $!";
+ }
+@@ -257,7 +285,7 @@
+     $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' . 
+ 		  $ver->{$checkpath});
+     -d $srcdir && return $ver;
+-    return "";
++    return undef;
+ }
+ 
+ sub msvc_copy_dlls($)
+@@ -272,6 +300,11 @@
+ 	      $dest . $ver->{'dll_suffix'});
+     copy_dll ($srcdir, "msvcr" . $ver->{'dll_suffix'} . ".dll",
+ 	      $dest . $ver->{'dll_suffix'});
++    if ($ver->{'dll_suffix'} >= 90) {
++        copy_dll ($srcdir, "msvcm" . $ver->{'dll_suffix'} . ".dll",
++                  $dest . $ver->{'dll_suffix'});
++        copy_dll ($srcdir, "Microsoft.VC90.CRT.manifest", $dest . $ver->{'dll_suffix'});
++    }
+ }
+ 
+ sub msvc_copy_instmsi($)

Modified: trunk/patches/dev300/config_office-msvc-compat.diff
==============================================================================
--- trunk/patches/dev300/config_office-msvc-compat.diff	(original)
+++ trunk/patches/dev300/config_office-msvc-compat.diff	Wed Aug  6 16:50:25 2008
@@ -1,19 +1,22 @@
 --- config_office/oowintool	6 Mar 2008 11:46:11 -0000	1.5
 +++ config_office/oowintool	18 Jul 2008 16:30:04 -0000
-@@ -94,48 +94,44 @@
+@@ -94,17 +94,27 @@
  
  sub print_psdk_home()
  {
 -    my $value;
--    $value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/Directories/Install Dir');
 +    my ($value, $key);
-+	$value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/v6.1/InstallationFolder');
+     $value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/v6.1/InstallationFolder');
      if (!defined $value)
      {
--        $key = reg_find_key ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install Dir');
--        $value = reg_get_value ($key);
+-		$value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/Directories/Install Dir');
 +        $value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/CurrentInstallFolder');
-     }
+-		if (!defined $value)
+-		{
+-			$key = reg_find_key ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install Dir');
+-			$value = reg_get_value ($key);
+-		}
+ 	}
 +    if (!defined $value)
 +    {
 +	    $value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/Directories/Install Dir');
@@ -32,44 +35,7 @@
      defined $value || die "psdk not found";
  
      print cygpath ($value, 'w', $output_format);
- }
- 
--my %msvc6 = (
--    'ver' => '6.0',
--    'key' => 'Microsoft/VisualStudio/6.0/Setup/Microsoft Visual C++/ProductDir',
--);
--my %msvc_net_2002 = (
--    'ver' => '7.0',
--    'key' => 'Microsoft/VisualStudio/7.0/Setup/VC/ProductDir',
--    'instmsi_path' => '../Common7/Tools/Deployment/MsiRedist',
--    'dll_path' => '../Visual Studio .NET Professional - English', # testme ...
--    'dll_suffix' => '70'
--);
--my %msvs_net_2002 = (
--    'ver' => '7.0',
--    'key' => 'Microsoft/VisualStudio/7.0/Setup/VS/ProductDir',
--    'instmsi_path' => 'Common7/Tools/Deployment/MsiRedist',
--    'dll_path' => 'Visual Studio .NET Professional - English', # testme ...
--    'dll_suffix' => '70'
--);
- my %msvc_net_2003 = (
-     'ver' => '7.1',
-     'key' => 'Microsoft/VisualStudio/7.1/Setup/VC/ProductDir',
-     'instmsi_path' => '../Common7/Tools/Deployment/MsiRedist',
--    'dll_path' => '../SDK/v1.1/Bin',
-+    'dll_path' => '../Visual Studio .NET Professional 2003 - English',
-     'dll_suffix' => '71'
- );
- my %msvs_net_2003 = (
-     'ver' => '7.1',
-     'key' => 'Microsoft/VisualStudio/7.1/Setup/VS/ProductDir',
-     'instmsi_path' => 'Common7/Tools/Deployment/MsiRedist',
--    'dll_path' => 'Visual Studio .NET Professional 2003 - English', # testme ...
-+    'dll_path' => 'Visual Studio .NET Professional 2003 - English',
-     'dll_suffix' => '71'
- );
- my %msvs_net_2003_ea = (
-@@ -159,10 +155,38 @@
+@@ -159,6 +155,20 @@
      'dll_path' => '../SDK/v2.0/Bin',
      'dll_suffix' => '80'
  );
@@ -87,24 +53,14 @@
 +    'dll_path' => '../SDK/v2.0/Bin',
 +    'dll_suffix' => '80'
 +);
-+my %msvs_2008 = (
-+    'ver' => '9.0',
-+    'key' => 'Microsoft/VisualStudio/9.0/Setup/VS/ProductDir',
-+    'instmsi_path' => '?',
-+    'dll_path' => 'VC/redist/x86/Microsoft.VC90.CRT',
-+    'dll_suffix' => '90'
-+);
-+my %msvc_2008 = (
-+    'ver' => '9.0',
-+    'key' => 'Microsoft/VisualStudio/9.0/Setup/VC/ProductDir',
-+    'instmsi_path' => '?',
-+    'dll_path' => 'redist/x86/Microsoft.VC90.CRT',
-+    'dll_suffix' => '90'
-+);
+ my %msvs_2008 = (
+     'ver' => '9.0',
+     'key' => 'Microsoft/VisualStudio/9.0/Setup/VS/ProductDir',
+@@ -162,7 +162,7 @@
  
  sub find_msvs()
  {
--    my @ms_versions = ( \%msvs_express_2005, \%msvs_net_2003_ea, \%msvs_net_2003, \%msvs_net_2002, \%msvc6 );
+-    my @ms_versions = ( \%msvs_2008, \%msvs_express_2005, \%msvs_net_2003_ea, \%msvs_net_2003 );
 +    my @ms_versions = ( \%msvs_2008, \%msvs_2005, \%msvs_express_2005, \%msvs_net_2003_ea, \%msvs_net_2003 );
  
      for $ver (@ms_versions)
@@ -113,7 +69,7 @@
  
  sub find_msvc()
  {
--    my @ms_versions = ( \%msvc_express_2005, \%msvc_net_2003, \%msvc_net_2002, \%msvc6 );
+-    my @ms_versions = ( \%msvc_2008, \%msvc_express_2005, \%msvc_net_2003 );
 +    my @ms_versions = ( \%msvc_2008, \%msvc_2005, \%msvc_express_2005, \%msvc_net_2003 );
  
      for $ver (@ms_versions)
@@ -123,7 +79,7 @@
  sub print_csc_compiler_dir()
  {
 -    my $dir = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/InstallRoot");
--    $dir .= "v1.1.4322"; # lame-but ...
+-    $dir .= "v2.0.50727"; # lame, but...
 -    print cygpath ($dir, 'w', $output_format);
 +    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`;
@@ -132,7 +88,7 @@
  
  sub print_dotnetsdk_dir()
  {
--    my $dir = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv1.1");
+-    my $dir = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv2.0");
 +    my $dir = 
 +          reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv1.1") ||
 +          reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv2.0");
@@ -149,32 +105,3 @@
      print cygpath($dir, 'w', $output_format); 
  }
  
-@@ -242,6 +269,7 @@
-     -f "$src/$fname" || die "can't find $src";
-     -d $dest || die "no directory $dest";
- 
-+	print STDERR "Copying $src/$fname to $dest\n";
-     copy ("$src/$fname", $dest) || die "copy failed: $!";
-     chmod (0755, "$dest/$fname") || die "failed to set dll executable: $!";
- }
-@@ -257,7 +285,7 @@
-     $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' . 
- 		  $ver->{$checkpath});
-     -d $srcdir && return $ver;
--    return "";
-+    return undef;
- }
- 
- sub msvc_copy_dlls($)
-@@ -272,6 +300,11 @@
- 	      $dest . $ver->{'dll_suffix'});
-     copy_dll ($srcdir, "msvcr" . $ver->{'dll_suffix'} . ".dll",
- 	      $dest . $ver->{'dll_suffix'});
-+    if ($ver->{'dll_suffix'} >= 90) {
-+        copy_dll ($srcdir, "msvcm" . $ver->{'dll_suffix'} . ".dll",
-+                  $dest . $ver->{'dll_suffix'});
-+        copy_dll ($srcdir, "Microsoft.VC90.CRT.manifest", $dest . $ver->{'dll_suffix'});
-+    }
- }
- 
- sub msvc_copy_instmsi($)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]