svn commit: r1409597 - /incubator/ooo/branches/gbuild/main/set_soenv.in

[ar...@apache.org]

Author: arist
Date: Thu Nov 15 00:13:48 2012
New Revision: 1409597

URL: http://svn.apache.org/viewvc?rev=1409597&view=rev
Log:
gnumake4_144_7ac1d3e8f1fa.patch
# HG changeset patch
# User Michael Stahl <ms...@openoffice.org>
# Date 1303142355 0
# Node ID 7ac1d3e8f1fa931d58efa78c44aa0fe254fd95dc
# Parent  ffdb9023a592a0bb6f676d4ca78690492580acac
gnumake4: set_soenv.in: do not generate tcsh environment file


Modified:
    incubator/ooo/branches/gbuild/main/set_soenv.in

Modified: incubator/ooo/branches/gbuild/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/set_soenv.in?rev=1409597&r1=1409596&r2=1409597&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/set_soenv.in (original)
+++ incubator/ooo/branches/gbuild/main/set_soenv.in Thu Nov 15 00:13:48 2012
@@ -679,7 +679,7 @@ elsif ( $platform =~ m/cygwin/ ) 
       $use_shl_versions = "TRUE";
       $wps = ';'; # Windows style path seperator
   if ( $MINGW eq "yes" )
-  {   # At the moment this implies the use of tcsh
+  {
       print "Setting Windows NT cygwin MinGW specific values... ";
       $FLIPCMD        = "slfl.pl";
       $PATH_SEPERATOR = ';';
@@ -1552,8 +1552,6 @@ print "done\n";
 # VI. Open the output file.
 #--------------------------
 #
-open( OUT, ">$outfile" ) ||
-   die "Cannot open $outfile: $!\n";
 
 # Create sh environment file
 open( OUT_SH, ">$outfile_sh" ) ||
@@ -1571,7 +1569,6 @@ if(defined($outfile_bat))
 #------------------------------------------
 #
 # Write file header.
-CreateFileHeader( *OUT, $UPD, $platform, "(t)csh", "#" );
 CreateFileHeader( *OUT_SH, $UPD, $platform, "sh/bash/ksh", "#" );
 CreateFileHeader( *OUT_BAT, $UPD, $platform, "4nt", "rem" ) if defined($outfile_bat);
 
@@ -2121,8 +2118,6 @@ ToFile( "SAL_ENABLE_FILE_LOCKING",	"1",	
 #
 # Writing unset variables you might not need to file.
 # 
-print OUT $unsetvars;
-
 print OUT_SH "export $exportvars$newline";
 print OUT_SH "unset $unsetvarssh$newline";
 
@@ -2135,8 +2130,6 @@ if(defined($outfile_bat))
 # VIII. Closing output file.
 #---------------------------
 #
-close( OUT ) || print "Can't close $outfile: $!";
-
 close( OUT_SH ) || print "Can't close $outfile_sh: $!";
 
 if( defined($outfile_bat))
@@ -2197,8 +2190,7 @@ if ( $Warning ne "" ) 
 }
 
 print "*$newline* USAGE: $newline";
-print "* Source $outfile (in tcsh)";
-print " or $outfile.sh (in sh)";
+print "* Source $outfile.sh (in sh)";
 print "$newline";
 print "* in order to set up the build-environment variables.$newline";
 for ( $tmp = 0; $tmp < 2; $tmp++ ) 
@@ -2313,8 +2305,6 @@ sub CreateFileHeader 
 #                   a - alias
 #                   c - comment
 #                   n - newline
-#                   x - raw, write as is to OUT_BAT
-#                   y - raw, write as is to OUT
 #                   z - raw, write as is to OUT_SH
 # Return value:  void
 #---------------------------------------------------------
@@ -2356,7 +2346,6 @@ sub ToFile {
          }
 
          printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", $envvar);
-         print OUT "$setenv $_[ 0 ] \"$envvar\"$newline";  # to tcsh file
          print OUT_SH "$_[ 0 ]=\"$envvarbash\"$newline";   # to sh file
          $exportvars .= " $_[ 0 ]";                        # add to export list for sh file
 
@@ -2377,7 +2366,6 @@ sub ToFile {
    elsif ( $_[ 2 ] eq "a" ) 
    {  # Write an alias to file.
       print "The $_[ 0 ] is set to: $_[ 1 ]\n";    # to stdout
-      print OUT "$_[ 0 ] $_[ 1 ]$newline";         # to tcsh file
       print OUT_SH "$_[ 0 ]=$_[ 1 ]$newline";      # to sh file
       if(defined($outfile_bat)) # create the correct 4nt alias format
       {  my $aliastmp = $_[ 1 ];
@@ -2393,10 +2381,6 @@ sub ToFile {
       print "$comment$newline";
       print "$comment $_[ 0 ]$newline";
       print "$comment$newline";
-      print OUT "$newline";
-      print OUT "$comment$newline";
-      print OUT "$comment $_[ 0 ]$newline";
-      print OUT "$comment$newline";
       print OUT_SH "$newline";
       print OUT_SH "$comment$newline";
       print OUT_SH "$comment $_[ 0 ]$newline";
@@ -2410,15 +2394,9 @@ sub ToFile {
    }
    elsif ( $_[ 2 ] eq "n" )
    {  #Write a newline to a file
-      print OUT "$newline";
       print OUT_SH "$newline";
       print OUT_BAT "$newline" if defined($outfile_bat);
    }
-   elsif ( $_[ 2 ] eq "y" )
-   {
-      #Write first argument as is, and nothing else
-      print OUT "$_[ 0 ]$newline";
-   }
    elsif ( $_[ 2 ] eq "z" )
    {
       #Write first argument as is, and nothing else