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

(-)config_office/set_soenv.in (-9 / +10 lines)
Lines 1033-1039 Link Here
1033 
                        $I.$SOLARENV.$ds.$INPATH.$INC.
 1033 
                        $I.$SOLARENV.$ds.$INPATH.$INC.
1034 
                        $I.$SOLARENV.$INC.
 1034 
                        $I.$SOLARENV.$INC.
1035 
                        $I.'$COMPATH'.$ds."include".
 1035 
                        $I.'$COMPATH'.$ds."include".
1036 
                        $I.'$PSDK_HOME'.$INCLUDE; # This must be the last
 1036 
                        $I."'".$PSDK_HOME.$INCLUDE."'"; # This must be the last
1037 
}
 1037 
}
1038 
elsif ($platform eq "$Macosx")
 1038 
elsif ($platform eq "$Macosx")
1039 
{  $SOLARINCLUDES     = $I.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$INC.
 1039 
{  $SOLARINCLUDES     = $I.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$INC.
Lines 1341-1347 Link Here
1341 
                        $I.'$JAVA_HOME'.$ds."include".$ds."win32".
 1341 
                        $I.'$JAVA_HOME'.$ds."include".$ds."win32".
1342 
                        $I.'$JAVA_HOME'.$ds."include".
 1342 
                        $I.'$JAVA_HOME'.$ds."include".
1343 
                        $I.'$COMPATH'.$ds."include".
 1343 
                        $I.'$COMPATH'.$ds."include".
1344 
                        $I.'$PSDK_HOME'.$INCLUDE; # This must be the last.
 1344 
                        $I."'".$PSDK_HOME.$INCLUDE."'"; # This must be the last.
1345 
}
 1345 
}
1346 
elsif ($platform eq "$Macosx")
 1346 
elsif ($platform eq "$Macosx")
1347 
{  $SOLARINC         .= $STLPORT_stlport.
 1347 
{  $SOLARINC         .= $STLPORT_stlport.
Lines 2155-2161 Link Here
2155 
# Return value:  Reformatted String
 2155 
# Return value:  Reformatted String
2156 
#----------------------------------------------------------
 2156 
#----------------------------------------------------------
2157 
sub WinFormat
2157 
sub WinFormat
2158 
{  my ( $variable, $d1, $d1_prefix, @split_var );
2158 
{  my ( $variable, $d1, $d1_prefix, $d1_fname, @split_var );
2159 
   $variable = $_[ 0 ];
 2159 
   $variable = $_[ 0 ];
2160 
   $variable =~ s/^\s+//g ; #remove leading spaces
 2160 
   $variable =~ s/^\s+//g ; #remove leading spaces
2161 
   $variable =~ s/\s+$//g ; #remove trailing spaces
 2161 
   $variable =~ s/\s+$//g ; #remove trailing spaces
Lines 2189-2207 Link Here
2189 
           foreach $d1 ( @split_var )
 2189 
           foreach $d1 ( @split_var )
2190 
           {
 2190 
           {
2191 
			   $d1 = "-".$d1;
 2191 
			   $d1 = "-".$d1;
2192 
               if ( $d1 =~ /^(-\w)(?:(?:\/[\w\.~ ]+)+)/ )
 2192 
               if ( $d1 =~ /^(-\w)[\'\"]?((?:\/[\w\.~ ]+)+)[\'\"]?/ )
2193 
			   # This regex: option -> $1, filename without quotes -> $2
2193 
               {
 2194 
               {
2194 
                   $d1_prefix = $1;
 2195 
                   $d1_prefix = $1;
2195 
                   $d1 =~ s/^-\w//;
 2196 
				   $d1_fname = $2;
2196 
				   if ( $d1 =~ / / )
 2197 
				   if ( $d1_fname =~ / / )
2197 
				   {
 2198 
				   {
2198 
					   chomp( $d1 = qx{cygpath -d "$d1"} ); # Use DOS 8.3 style to avoid quoting
 2199 
					   chomp( $d1_fname = qx{cygpath -d "$d1_fname"} ); # Use DOS 8.3 style to avoid quoting
2199 
				   }                                        # ! This fails when $d1 doesn't exist!
 2200 
				   }                                        # ! This fails when $d1 doesn't exist!
2200 
				   else
 2201 
				   else
2201 
				   {
 2202 
				   {
2202 
					   chomp( $d1 = qx{cygpath -w "$d1"} ); # Use "normal" filenames
 2203 
					   chomp( $d1_fname = qx{cygpath -w "$d1_fname"} ); # Use "normal" filenames
2203 
				   }
 2204 
				   }
2204 
                   $d1 = $d1_prefix.$d1;
 2205 
                   $d1 = $d1_prefix.$d1_fname;
2205 
               }
 2206 
               }
2206 
			   else
 2207 
			   else
2207 
			   {   # relative paths here
 2208 
			   {   # relative paths here

Return to issue 8762