Attachment #38788 for issue #68986

View | Details | Raw Unified | Return to issue 68986
Collapse All | Expand All




#
#   $RCSfile: guw.pl,v $
#
#   $Revision: 172 $
#
#   last change: $Author: hr $ $Date: 2006-08-09 23:35:35 -0400 (Wed, 09 Aug 2006) $
#
#   The Contents of this file are made available subject to
#   the terms of GNU Lesser General Public License Version 2.1.

			   'link', [ 'BASE:', 'DEBUG', 'DLL', 'LIBPATH', 'MACHINE:',
						 'MAP', 'NODEFAULTLIB', 'OPT', 'PDB', 'RELEASE',
						 'SUBSYSTEM', 'STACK', 'out:', 'map:', 'ENTRY:',
						 'implib:', 'delayload:', '/DEF', 'COMMENT:' ],
			   'regcomp', [ '-env:', 'vnd.sun.star.expand:' , 'vnd.openoffice.pymodule' ],
			   'regmerge', [ '/UCR' ],
			   'rc', [ '-D' ],

	  if ( defined $debug ) { print(STDERR "WinFormat:\ninclude ([-]<something>=<path>) path:\n$variable\n"); }
	  $d1_prefix = $1;
	  $d1 = myCygpath($2,1);
  } elsif ( $variable =~ /\A(-F[ARdemopr])[\'\"]?((?:\/[\w\.\- ~]+)+\/?)[\'\"]?\Z/ ) {
	  # This regex evaluates -FX<path> (MSVC switches for output naming), sometimes with quotes or "/" at the end
	  # option -> $1, filename without quotes -> $2
	  if ( defined $debug ) { print(STDERR "WinFormat:\ncompiler naming (-FX<absolute path>) path:\n$variable\n"); }
	  $d1_prefix = $1;
	  $d1 = myCygpath($2,1);
  } elsif ( $variable =~ /\A(-F[ARdemopr])[\'\"]?([a-zA-Z]:(?:\/[\w\.\- ~]+)+\/?)[\'\"]?\Z/ ) {
	  # This regex finds -FX<dos mixed mode path> (MSVC switches for output naming),
	  # sometimes with quotes or "/" at the end to prevent them from being caught by the
	  # next case.
	  # option -> $1, filename without quotes -> $2
	  if ( defined $debug ) { print(STDERR "WinFormat:\ncompiler naming (-FX<absolute mixed mode path>) path:\n$variable\n"); }
	  $d1_prefix = $1;
	  $d1 = myCygpath($2,1);
  } elsif ( $variable =~ /\A(-\w[\w\.]*:)[\'\"]?((?:\/?[\w\.\- ~]+)+\/?)[\'\"]?\Z/ ) {
	  # This regex evaluates -X<something>:<path>, sometimes with quotes or "/" at the end
	  # option -> $1, filename without quotes -> $2

	  # option -> $1, rest -> $2
	  if ( defined $debug ) { print(STDERR "WinFormat:\nFound (-<something>:<no-path>):\n$variable\n"); }
	  $d1_prefix = $1;
	  $d1 = $2;
  } elsif ( $variable =~ /\A(\w+:)[\'\"]?\/\/\/((?:\/?[\w\.\- ~]+)+\/?)[\'\"]?\Z/ ) {
      # See iz35982 for the reason for the special treatment of this switch.
      # This regex evaluates <something>:///<path>, sometimes with quotes or "/" at the end

	  if ( defined $debug ) { print(STDERR "WinFormat:\ninclude (-X<absolute path>) path:\n$variable\n"); }
	  $d1_prefix = $1;
	  $d1 = myCygpath($2,1);
  } elsif ( $variable =~ /\A(-F[ARdemopr])[\'\"]?((?:\/[\w\.\- ~]+)+\/?)[\'\"]?\Z/ ) {
	  # This regex evaluates -FX<path> (MSVC switches for output naming), sometimes with quotes or "/" at the end
	  # option -> $1, filename without quotes -> $2
	  if ( defined $debug ) { print(STDERR "WinFormat:\ncompiler naming (-FX<absolute path>) path:\n$variable\n"); }
	  $d1_prefix = $1;
	  $d1 = myCygpath($2,1);
  } else {
      $d1 = "";
  }

	  print(STDERR "Error: guw.pl: WinFormat: Not converted -X/... type switch in :$variable:.\n");
	  if ( (defined $debug_light) or (defined $debug) ) { die "\nNot processed -X/...\n"; }
  }
  # Sanity check for [-]X<something>(:|=)<path> case - accept mixed mode paths (c:/foo/bar)
  if ( $variable =~ /\A-?\w[\w\.]+[=:][\'\"]?(?:\/[\w\.\- ~]+)+/ ) {
	  print(STDERR "Error: guw.pl: WinFormat: Not converted [-]X<something>(=|:)/<path> type switch in :$variable:.\n");
	  if ( (defined $debug_light) or (defined $debug) ) { die "\nNot processed [-]X<something>(=|:)/...\n"; }
  }

Return to issue 68986

Lines 7-15 Link Here

(-)solenv/bin/guw.pl (-12 / +20 lines)
7	#	7	#
8	# $RCSfile: guw.pl,v $	8	# $RCSfile: guw.pl,v $
9	#	9	#
10	# $Revision: 1.26 $	10	# $Revision: 172 $
11	#	11	#
12	# last change: $Author: hr $ $Date: 2005/10/13 16:48:17 $	12	# last change: $Author: hr $ $Date: 2006-08-09 23:35:35 -0400 (Wed, 09 Aug 2006) $
13	#	13	#
14	# The Contents of this file are made available subject to	14	# The Contents of this file are made available subject to
15	# the terms of GNU Lesser General Public License Version 2.1.	15	# the terms of GNU Lesser General Public License Version 2.1.
Lines 57-63 Link Here
57	'link', [ 'BASE:', 'DEBUG', 'DLL', 'LIBPATH', 'MACHINE:',	57	'link', [ 'BASE:', 'DEBUG', 'DLL', 'LIBPATH', 'MACHINE:',
58	'MAP', 'NODEFAULTLIB', 'OPT', 'PDB', 'RELEASE',	58	'MAP', 'NODEFAULTLIB', 'OPT', 'PDB', 'RELEASE',
59	'SUBSYSTEM', 'STACK', 'out:', 'map:', 'ENTRY:',	59	'SUBSYSTEM', 'STACK', 'out:', 'map:', 'ENTRY:',
60	'implib:', 'delayload:', 'def', 'COMMENT:' ],	60	'implib:', 'delayload:', '/DEF', 'COMMENT:' ],
61	'regcomp', [ '-env:', 'vnd.sun.star.expand:' , 'vnd.openoffice.pymodule' ],	61	'regcomp', [ '-env:', 'vnd.sun.star.expand:' , 'vnd.openoffice.pymodule' ],
62	'regmerge', [ '/UCR' ],	62	'regmerge', [ '/UCR' ],
63	'rc', [ '-D' ],	63	'rc', [ '-D' ],
Lines 122-127 Link Here
122	if ( defined $debug ) { print(STDERR "WinFormat:\ninclude ([-]<something>=<path>) path:\n$variable\n"); }	122	if ( defined $debug ) { print(STDERR "WinFormat:\ninclude ([-]<something>=<path>) path:\n$variable\n"); }
123	$d1_prefix = $1;	123	$d1_prefix = $1;
124	$d1 = myCygpath($2,1);	124	$d1 = myCygpath($2,1);
		125	} elsif ( $variable =~ /\A(-F[ARdemopr])[\'\"]?((?:\/[\w\.\- ~]+)+\/?)[\'\"]?\Z/ ) {
		126	# This regex evaluates -FX<path> (MSVC switches for output naming), sometimes with quotes or "/" at the end
		127	# option -> $1, filename without quotes -> $2
		128	if ( defined $debug ) { print(STDERR "WinFormat:\ncompiler naming (-FX<absolute path>) path:\n$variable\n"); }
		129	$d1_prefix = $1;
		130	$d1 = myCygpath($2,1);
		131	} elsif ( $variable =~ /\A(-F[ARdemopr])[\'\"]?([a-zA-Z]:(?:\/[\w\.\- ~]+)+\/?)[\'\"]?\Z/ ) {
		132	# This regex finds -FX<dos mixed mode path> (MSVC switches for output naming),
		133	# sometimes with quotes or "/" at the end to prevent them from being caught by the
		134	# next case.
		135	# option -> $1, filename without quotes -> $2
		136	if ( defined $debug ) { print(STDERR "WinFormat:\ncompiler naming (-FX<absolute mixed mode path>) path:\n$variable\n"); }
		137	$d1_prefix = $1;
		138	$d1 = myCygpath($2,1);
125	} elsif ( $variable =~ /\A(-\w[\w\.]*:)[\'\"]?((?:\/?[\w\.\- ~]+)+\/?)[\'\"]?\Z/ ) {	139	} elsif ( $variable =~ /\A(-\w[\w\.]*:)[\'\"]?((?:\/?[\w\.\- ~]+)+\/?)[\'\"]?\Z/ ) {
126	# This regex evaluates -X<something>:<path>, sometimes with quotes or "/" at the end	140	# This regex evaluates -X<something>:<path>, sometimes with quotes or "/" at the end
127	# option -> $1, filename without quotes -> $2	141	# option -> $1, filename without quotes -> $2
Lines 133-139 Link Here
133	# option -> $1, rest -> $2	147	# option -> $1, rest -> $2
134	if ( defined $debug ) { print(STDERR "WinFormat:\nFound (-<something>:<no-path>):\n$variable\n"); }	148	if ( defined $debug ) { print(STDERR "WinFormat:\nFound (-<something>:<no-path>):\n$variable\n"); }
135	$d1_prefix = $1;	149	$d1_prefix = $1;
136	$d1 = myCygpath($2,1);	150	$d1 = $2;
137	} elsif ( $variable =~ /\A(\w+:)[\'\"]?\/\/\/((?:\/?[\w\.\- ~]+)+\/?)[\'\"]?\Z/ ) {	151	} elsif ( $variable =~ /\A(\w+:)[\'\"]?\/\/\/((?:\/?[\w\.\- ~]+)+\/?)[\'\"]?\Z/ ) {
138	# See iz35982 for the reason for the special treatment of this switch.	152	# See iz35982 for the reason for the special treatment of this switch.
139	# This regex evaluates <something>:///<path>, sometimes with quotes or "/" at the end	153	# This regex evaluates <something>:///<path>, sometimes with quotes or "/" at the end
Lines 148-159 Link Here
148	if ( defined $debug ) { print(STDERR "WinFormat:\ninclude (-X<absolute path>) path:\n$variable\n"); }	162	if ( defined $debug ) { print(STDERR "WinFormat:\ninclude (-X<absolute path>) path:\n$variable\n"); }
149	$d1_prefix = $1;	163	$d1_prefix = $1;
150	$d1 = myCygpath($2,1);	164	$d1 = myCygpath($2,1);
151	} elsif ( $variable =~ /\A(-F[ARdemopr])[\'\"]?((?:\/[\w\.\- ~]+)+\/?)[\'\"]?\Z/ ) {
152	# This regex evaluates -FX<path> (MSVC switches for output naming), sometimes with quotes or "/" at the end
153	# option -> $1, filename without quotes -> $2
154	if ( defined $debug ) { print(STDERR "WinFormat:\ncompiler naming (-FX<absolute path>) path:\n$variable\n"); }
155	$d1_prefix = $1;
156	$d1 = myCygpath($2,1);
157	} else {	165	} else {
158	$d1 = "";	166	$d1 = "";
159	}	167	}
Lines 184-191 Link Here
184	print(STDERR "Error: guw.pl: WinFormat: Not converted -X/... type switch in :$variable:.\n");	192	print(STDERR "Error: guw.pl: WinFormat: Not converted -X/... type switch in :$variable:.\n");
185	if ( (defined $debug_light) or (defined $debug) ) { die "\nNot processed -X/...\n"; }	193	if ( (defined $debug_light) or (defined $debug) ) { die "\nNot processed -X/...\n"; }
186	}	194	}
187	# Sanity check for [-]X<something>(:\|=)<path> case	195	# Sanity check for [-]X<something>(:\|=)<path> case - accept mixed mode paths (c:/foo/bar)
188	if ( $variable =~ /\A-?\w[\w\.]*[=:][\'\"]?(?:\/[\w\.\- ~]+)+/ ) {	196	if ( $variable =~ /\A-?\w[\w\.]+[=:][\'\"]?(?:\/[\w\.\- ~]+)+/ ) {
189	print(STDERR "Error: guw.pl: WinFormat: Not converted [-]X<something>(=\|:)/<path> type switch in :$variable:.\n");	197	print(STDERR "Error: guw.pl: WinFormat: Not converted [-]X<something>(=\|:)/<path> type switch in :$variable:.\n");
190	if ( (defined $debug_light) or (defined $debug) ) { die "\nNot processed [-]X<something>(=\|:)/...\n"; }	198	if ( (defined $debug_light) or (defined $debug) ) { die "\nNot processed [-]X<something>(=\|:)/...\n"; }
191	}	199	}