ooo-build r13215 - in branches/ooo-build-2-4-1: . patches/src680

[thorstenb svn gnome org]

Author: thorstenb
Date: Tue Jul 15 08:23:42 2008
New Revision: 13215
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13215&view=rev

Log:
	* patches/src680/apply:
	* patches/src680/soltools-isatty-fix.diff:
	Took patch from upstream issue to fix msvc8 breakage in soltools.
	* patches/src680/config_office-msvc8-compat.diff:
	More oowintool enhancements to scrape paths from registry



Added:
   branches/ooo-build-2-4-1/patches/src680/soltools-isatty-fix.diff
Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/patches/src680/apply
   branches/ooo-build-2-4-1/patches/src680/config_office-msvc8-compat.diff

Modified: branches/ooo-build-2-4-1/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/apply	(original)
+++ branches/ooo-build-2-4-1/patches/src680/apply	Tue Jul 15 08:23:42 2008
@@ -503,6 +503,9 @@
 # make path detection look for VC2005er dlls, too
 config_office-msvc8-compat.diff, thorsten
 
+# don't generate a parser that uses isatty
+soltools-isatty-fix.diff, i#89012, tono
+
 # init all members in VirDev's ctor
 vcl-virdev-missing-initialisation.diff, thorsten
 

Modified: branches/ooo-build-2-4-1/patches/src680/config_office-msvc8-compat.diff
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/config_office-msvc8-compat.diff	(original)
+++ branches/ooo-build-2-4-1/patches/src680/config_office-msvc8-compat.diff	Tue Jul 15 08:23:42 2008
@@ -11,3 +11,102 @@
  		dnl .NET case
  		if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb71.dll"; then
  			MSPDB_PATH="$with_cl_home/../Common7/IDE"
+--- config_office/oowintool	12 Dec 2007 13:24:57 -0000	1.4
++++ config_office/oowintool	14 Jul 2008 22:01:44 -0000
+@@ -101,6 +101,16 @@
+         $key = reg_find_key ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install Dir');
+         $value = reg_get_value ($key);
+     }
++    if (!defined $value)
++    {
++        $key = reg_find_key ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/CurrentInstallFolder');
++        $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);
+@@ -145,10 +155,38 @@
+     'dll_path' => 'Visual Studio .NET Enterprise Architect 2003 - English', # testme ...
+     'dll_suffix' => '71'
+ );
++my %msvs_express_2005 = (
++    'ver' => '8.0',
++    'key' => 'Microsoft/VCExpress/8.0/Setup/VS/ProductDir',
++    'instmsi_path' => '../SDK/v2.0/BootStrapper/Packages/InstMSI',
++    'dll_path' => '../SDK/v2.0/Bin',
++    'dll_suffix' => '80'
++);
++my %msvc_express_2005 = (
++    'ver' => '8.0',
++    'key' => 'Microsoft/VCExpress/8.0/Setup/VC/ProductDir',
++    'instmsi_path' => '../SDK/v2.0/BootStrapper/Packages/InstMSI',
++    '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'
++);
+ 
+ sub find_msvs()
+ {
+-    my @ms_versions = ( \%msvs_net_2003_ea, \%msvs_net_2003, \%msvs_net_2002, \%msvc6 );
++    my @ms_versions = ( \%msvs_2005, \%msvs_express_2005, \%msvs_net_2003_ea, \%msvs_net_2003, \%msvs_net_2002, \%msvc6 );
+ 
+     for $ver (@ms_versions)
+     {
+@@ -163,7 +201,7 @@
+ 
+ sub find_msvc()
+ {
+-    my @ms_versions = ( \%msvc_net_2003, \%msvc_net_2002, \%msvc6 );
++    my @ms_versions = ( \%msvc_2005, \%msvc_express_2005, \%msvc_net_2003, \%msvc_net_2002, \%msvc6 );
+ 
+     for $ver (@ms_versions)
+     {
+@@ -196,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);
+ }
+ 
+@@ -211,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); 
+ }
+ 

Added: branches/ooo-build-2-4-1/patches/src680/soltools-isatty-fix.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4-1/patches/src680/soltools-isatty-fix.diff	Tue Jul 15 08:23:42 2008
@@ -0,0 +1,46 @@
+--- soltools/HIDCompiler/hidclex.l	10 Apr 2008 17:56:30 -0000	1.7
++++ soltools/HIDCompiler/hidclex.l	5 May 2008 03:49:47 -0000
+@@ -454,40 +454,43 @@
+ }
+ 
+ 
+ /* forward */
+ int eat_comment();
+ int eat_cpp_comment();
+ 
+ /*===================================================*/
+ //
+ // '+' im identifier wg basic\source\classes\sb.src
+ //
+ // '<' im identifier wg sc subtdlg.src
+ //
+ // '&' im identifier wg scerror.src so2..nocode.src svxerr.src scwarngs.src
+ 
+ 
+ //string		(\"[^"]*\") alter einfacher string ohne "
+ 
+ %}
+ 
++/* i89012 */
++%option never-interactive
++
+ simple		([^\n\"]*)
+ %p 7000
+ string		\"{simple}((((\\\\)*(\\\"))?){simple})*\"
+ 
+ %x MACRO_STATE
+ 
+ %x EXCLUDE_STATE
+ resfilelist	    ([Ff][Ii][Ll][Ee][Ll][Ii][Ss][Tt])
+ resstringlist	([Ss][Tt][Rr][Ii][Nn][Gg][Ll][Ii][Ss][Tt])
+ resstring   	([Ss][Tt][Rr][Ii][Nn][Gg])
+ 
+ identifier ([a-z_A-Z]+[a-z_A-Z<+&0-9]*)
+ number		(([0-9]+)|(0x[0-9a-fA-F]+))
+ residentifier ([Ii][Dd][Ee][Nn][Tt][Ii][Ff][Ii][Ee][Rr])
+ w			([ \t\n]*)
+ wspecial	([\\ \t\n]*)
+ texttag		(([Tt][Ii][Tt][Ll][Ee])|([Tt][Ee][Xx][Tt])|([Mm][Ee][Ss][Ss][Aa][Gg][Ee]))
+ qhelptag	(([Qq][Uu][Ii][Cc][Kk])?([Hh][Ee][Ll][Pp][Tt][Ee][Xx][Tt]))
+ langtag		([a-zA-Z_]+)
+ helptag		([Hh][Ee][Ll][Pp][Ii][Dd])