ooo-build r13301 - in trunk: . patches/dev300
- From: thorstenb svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r13301 - in trunk: . patches/dev300
- Date: Fri, 18 Jul 2008 18:23:24 +0000 (UTC)
Author: thorstenb
Date: Fri Jul 18 18:23:24 2008
New Revision: 13301
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13301&view=rev
Log:
* patches/dev300/apply:
* patches/dev300/config_office-msvc-compat.diff: added more path
detection magic to oowintool
* patches/dev300/config_office-disable-atl.diff: added configure
switch to set DISABLE_ATL env var.
* patches/dev300/msvs9-temporary-fix.diff: moved an improved
version of the oowintool chunk to config_office-msvc-compat.diff
Added:
trunk/patches/dev300/config_office-disable-atl.diff
trunk/patches/dev300/config_office-msvc-compat.diff
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
trunk/patches/dev300/msvs9-temporary-fix.diff
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Fri Jul 18 18:23:24 2008
@@ -2555,6 +2555,8 @@
[ Fixes ]
sd-more-title-styles.diff, i#23221, thorsten
officecfg-bighandles-default.diff, thorsten
+config_office-msvc-compat.diff, thorsten
+config_office-disable-atl.diff, thorsten
sw-source-filter-ww8-continous-section-break-fix.diff, n#405071, i#91395, fridrich
Added: trunk/patches/dev300/config_office-disable-atl.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/config_office-disable-atl.diff Fri Jul 18 18:23:24 2008
@@ -0,0 +1,40 @@
+--- config_office/configure.in.bak 2008-07-17 07:57:50.734375000 -0700
++++ config_office/configure.in 2008-07-17 08:00:13.781250000 -0700
+@@ -152,6 +152,10 @@
+ [ --disable-activex Disable the use of ActiveX for windows build.
+ This switch is mandatory when using VC++ 2005 Express.
+ ],,)
++AC_ARG_ENABLE(atl,
++[ --disable-atl Disable the use of atl.h windows build.
++ This switch is mandatory when using VC++ 2005 Express.
++],,)
+
+ AC_ARG_ENABLE(symbols,
+ [ --enable-symbols Include debugging symbols in output.
+@@ -1173,6 +1177,16 @@
+ AC_MSG_RESULT([no])
+ fi
+ AC_SUBST(DISABLE_ACTIVEX)
++
++ AC_MSG_CHECKING([whether to use atl.h])
++ if test "$enable_atl" = "yes" -o "$enable_atl" = "TRUE" -o "$enable_atl" = ""; then
++ DISABLE_ATL=""
++ AC_MSG_RESULT([yes])
++ else
++ DISABLE_ATL="TRUE"
++ AC_MSG_RESULT([no])
++ fi
++ AC_SUBST(DISABLE_ATL)
+ fi
+
+ dnl ===================================================================
+--- config_office/set_soenv.in.bak 2008-07-17 08:01:33.000000000 -0700
++++ config_office/set_soenv.in 2008-07-17 08:02:13.890625000 -0700
+@@ -1859,6 +1859,7 @@
+ ToFile( "MFC_INCLUDE", $MFC_INCLUDE, "e" );
+ ToFile( "NSIS_PATH", $NSIS_PATH, "e" );
+ ToFile( "DISABLE_ACTIVEX", "@DISABLE_ACTIVEX@","e" );
++ ToFile( "DISABLE_ATL", "@DISABLE_ATL@","e" );
+ ToFile( "USE_NEW_SDK", $USE_NEW_SDK, "e" );
+
+ if ( "@NOWRAPCMD@" eq "yes" ) {
Added: trunk/patches/dev300/config_office-msvc-compat.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/config_office-msvc-compat.diff Fri Jul 18 18:23:24 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 | 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/msvs9-temporary-fix.diff
==============================================================================
--- trunk/patches/dev300/msvs9-temporary-fix.diff (original)
+++ trunk/patches/dev300/msvs9-temporary-fix.diff Fri Jul 18 18:23:24 2008
@@ -1,148 +1,3 @@
---- config_office/oowintool.BAK 2008-04-25 13:12:44.546875000 +0300
-+++ config_office/oowintool 2008-04-25 16:45:16.093750000 +0300
-@@ -95,12 +95,16 @@
- sub print_psdk_home()
- {
- my $value;
-- $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/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');
-+ if (!defined $value)
-+ {
-+ $key = reg_find_key ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install Dir');
-+ $value = reg_get_value ($key);
-+ }
-+ }
- defined $value || die "psdk not found";
-
- print cygpath ($value, 'w', $output_format);
-@@ -110,24 +110,6 @@
- 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',
-@@ -128,14 +132,14 @@
- '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 +163,24 @@
- '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_express_2005, \%msvs_net_2003_ea, \%msvs_net_2003 );
-
- for $ver (@ms_versions)
- {
-@@ -177,7 +195,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 );
-
- for $ver (@ms_versions)
- {
-@@ -235,13 +235,13 @@
- 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);
- }
-
- 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");
- print cygpath ($dir, 'w', $output_format);
- }
-
-@@ -242,6 +260,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 +276,7 @@
- $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
- $ver->{$checkpath});
- -d $srcdir && return $ver;
-- return "";
-+ return undef;
- }
-
- sub msvc_copy_dlls($)
-@@ -291,6 +291,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($)
--- config_office/configure.in
+++ config_office/configure.in
@@ -1758,6 +1758,12 @@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]