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

(-)set_soenv.in (-235 / +251 lines)
Lines 43-49 Link Here
43
#--------------------------------------------------------
43
#--------------------------------------------------------
44
#
44
#
45
my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment, $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir, 
45
my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment, $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir, 
46
     $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $FreeBSD, $NetBSD, $Tru64, $Irix, $Irix64, $Winnt, $Macosx, $MINGWIN32, $USE_SHELL,
46
     $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $FreeBSD, $NetBSD, $Tru64, $Irix, $Irix64, $Winnt, $Macosx, $MINGWIN32,
47
     $WScomp, $GNUcomp, $platform, $cygwinver, $machine_type, $empty, $no_ant, $no_stl, $no_gcc_home, $no_gcc_include, 
47
     $WScomp, $GNUcomp, $platform, $cygwinver, $machine_type, $empty, $no_ant, $no_stl, $no_gcc_home, $no_gcc_include, 
48
     $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $exportvars, $win_format_var, $perl_os);
48
     $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $exportvars, $win_format_var, $perl_os);
49
#
49
#
Lines 73-85 Link Here
73
#
73
#
74
# Help variables.
74
# Help variables.
75
my ( $USR, $ETC, $BIN, $LIB, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, 
75
my ( $USR, $ETC, $BIN, $LIB, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, 
76
     $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
76
     $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_LIB,
77
     $SOLARENVINC, $USR_DT, $USR_OPENWIN, $TCSH_PATH, $XLIB, $XINC,
77
     $SOLARENVINC, $USR_DT, $USR_OPENWIN, $TCSH_PATH, $XLIB, $XINC,
78
     $CYGWIN, $language, $ASM_PATH, $UNZIP_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB,
78
     $CYGWIN, $language, $ASM_PATH, $UNZIP_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB,
79
     $STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH );
79
     $STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH );
80
80
81
# Environment variables.
81
# Environment variables.
82
my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $SHELL, $GCC_HOME,
82
my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $SHELL,
83
     $UPD, $SOLARUPD, $WORK_STAMP, $TF_ONE51, $TF_UCB, 
83
     $UPD, $SOLARUPD, $WORK_STAMP, $TF_ONE51, $TF_UCB, 
84
     $URD_ONLY, $SOLARROOT, $SOLARSRC, $RSCRES, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, 
84
     $URD_ONLY, $SOLARROOT, $SOLARSRC, $RSCRES, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, 
85
     $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI, 
85
     $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI, 
Lines 131-143 Link Here
131
$Warning        = "";               # container for warning messages
131
$Warning        = "";               # container for warning messages
132
$STLPORT4	= '@STLPORT4@';     # Location of STLport4
132
$STLPORT4	= '@STLPORT4@';     # Location of STLport4
133
$MINGWIN32	= '@WITH_MINGWIN@'; # use MINGWIN32
133
$MINGWIN32	= '@WITH_MINGWIN@'; # use MINGWIN32
134
$USE_SHELL	= '@USE_SHELL@';    # preferred shell
135
$USE_GCC3	= '@USE_GCC3@';     # use gcc3 (only for unxlngi4 and unxfbsd5i at the moment)
134
$USE_GCC3	= '@USE_GCC3@';     # use gcc3 (only for unxlngi4 and unxfbsd5i at the moment)
136
$CC			= '@CC@';           # C compiler
135
$CC			= '@CC@';           # C compiler
137
$CXX		= '@CXX@';          # C++ compiler
136
$CXX		= '@CXX@';          # C++ compiler
138
$EXCEPTIONS	= '@EXCEPTIONS@';   # Exception handling type
137
$EXCEPTIONS	= '@EXCEPTIONS@';   # Exception handling type
139
$ENABLE_DEBUG	= '@ENABLE_DEBUG@';  # Enable a debug build
138
$ENABLE_DEBUG	= '@ENABLE_DEBUG@';  # Enable a debug build
140
$WRAPCMD	= "";				# Wrapper (only for winnt)
139
$WRAPCMD	= "";				# Wrapper (only for Winnt)
141
140
142
#
141
#
143
#---------------------------------------------------------------
142
#---------------------------------------------------------------
Lines 232-240 Link Here
232
$ENABLEUNICODE        = "TRUE";
231
$ENABLEUNICODE        = "TRUE";
233
$NEW_JAR_PACK         = "TRUE";
232
$NEW_JAR_PACK         = "TRUE";
234
$NO_BSYMBOLIC         = "TRUE";
233
$NO_BSYMBOLIC         = "TRUE";
234
$comment              = "#";           # UNIX script comment character
235
$comment4nt           = "rem";         # Windows 4nt script comment character
236
$GLIBC                = "";            # GLibc used, empty = no.
235
237
236
# Setting platform dependent constant values.
238
# Setting platform dependent constant values.
237
if ( $platform eq "$Solaris" ) 
239
if ( $platform eq $Solaris ) 
238
{     print "Setting Solaris specific values... ";
240
{     print "Setting Solaris specific values... ";
239
if ($machine_type eq "i86pc")
241
if ($machine_type eq "i86pc")
240
{     $outfile        = "SolarisIntelEnv.Set";
242
{     $outfile        = "SolarisIntelEnv.Set";
Lines 274-280 Link Here
274
      $PATH_SEPERATOR = $ps;
276
      $PATH_SEPERATOR = $ps;
275
      $PROSWITCH      = "-DPRODUCT";
277
      $PROSWITCH      = "-DPRODUCT";
276
}
278
}
277
elsif ( $platform eq "$NetBSD" ) 
279
elsif ( $platform eq $NetBSD ) 
278
{  print "Setting NetBSD Sparc specific values... ";
280
{  print "Setting NetBSD Sparc specific values... ";
279
   $outfile        = "NetBSDSparcEnv.Set"; 
281
   $outfile        = "NetBSDSparcEnv.Set"; 
280
   $BIG_SVX        = "TRUE";
282
   $BIG_SVX        = "TRUE";
Lines 301-307 Link Here
301
   $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."client";
303
   $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."client";
302
   $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads";
304
   $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads";
303
} 
305
} 
304
elsif ( $platform eq "$FreeBSD" ) 
306
elsif ( $platform eq $FreeBSD ) 
305
{     print "Setting FreeBSD specific values... ";
307
{     print "Setting FreeBSD specific values... ";
306
      $outfile        = "FreeBSDEnv.Set"; 
308
      $outfile        = "FreeBSDEnv.Set"; 
307
      $BIG_SVX        = "TRUE";
309
      $BIG_SVX        = "TRUE";
Lines 336-342 Link Here
336
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
338
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
337
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."green_threads";
339
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."green_threads";
338
} 
340
} 
339
elsif ( $platform eq "$Linux" ) 
341
elsif ( $platform eq $Linux ) 
340
{
342
{
341
#Set machine_type specific values: 
343
#Set machine_type specific values: 
342
   if (($machine_type eq "i686") or ($machine_type eq "i586"))
344
   if (($machine_type eq "i686") or ($machine_type eq "i586"))
Lines 348-353 Link Here
348
      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
350
      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
349
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
351
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
350
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
352
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
353
      if ($USE_GCC3 eq  "TRUE")
354
	  {
355
         $OUTPATH     = "unxlngi4";
356
      }
357
      else
358
      {
359
         $OUTPATH     = "unxlngi3";
360
      }
351
   }
361
   }
352
   elsif ($machine_type eq "sparc")
362
   elsif ($machine_type eq "sparc")
353
   {  print "Setting Linux Sparc specific values... ";
363
   {  print "Setting Linux Sparc specific values... ";
Lines 404-427 Link Here
404
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."client";
414
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."client";
405
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
415
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
406
   }
416
   }
407
#Conditional setting depending on gcc3 (on x86):
417
   #Conditional setting depending on gcc3 (on x86):
408
if ($USE_GCC3 eq  "TRUE")
418
   if ($USE_GCC3 eq  "TRUE")
409
   {
419
   {
410
      $CVER           = "C300";
420
      $CVER           = "C300";
411
   if (($machine_type eq "i686") or ($machine_type eq "i586"))
412
      {
413
        $OUTPATH      = "unxlngi4"
414
      }
415
   }
421
   }
416
else
422
   else
417
   {
423
   {
418
      $CVER           = "C295";
424
      $CVER           = "C295";
419
   if (($machine_type eq "i686") or ($machine_type eq "i586"))
420
      {
421
	$OUTPATH      = "unxlngi3"
422
      }
423
   }
425
   }
424
# General Linux settings:
426
   # General Linux settings:
425
427
426
      $BIG_SVX        = "TRUE";
428
      $BIG_SVX        = "TRUE";
427
      $COM            = "GCC";
429
      $COM            = "GCC";
Lines 438-444 Link Here
438
      $PROSWITCH      = "-DPRODUCT";
440
      $PROSWITCH      = "-DPRODUCT";
439
      $XPVERSION      = "3"; 
441
      $XPVERSION      = "3"; 
440
}
442
}
441
elsif ( $platform eq "$Tru64" ) 
443
elsif ( $platform eq $Tru64 ) 
442
{     print "Setting Tru64 specific values... ";
444
{     print "Setting Tru64 specific values... ";
443
      $outfile        = "Tru64AlphaEnv.Set"; 
445
      $outfile        = "Tru64AlphaEnv.Set"; 
444
      $BIG_SVX        = "TRUE";
446
      $BIG_SVX        = "TRUE";
Lines 463-469 Link Here
463
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."client";
465
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."client";
464
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads";
466
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads";
465
} 
467
} 
466
elsif ( $platform eq "$Irix" || $platform eq "$Irix64" )
468
elsif ( $platform eq $Irix || $platform eq $Irix64 )
467
{     print "Setting Irix specific values... ";
469
{     print "Setting Irix specific values... ";
468
      $outfile        = "IrixMipsEnv.Set";
470
      $outfile        = "IrixMipsEnv.Set";
469
      $BIG_SVX        = "TRUE";
471
      $BIG_SVX        = "TRUE";
Lines 475-481 Link Here
475
            } else {
477
            } else {
476
              $CVER           = "C295";
478
              $CVER           = "C295";
477
            }
479
            }
478
     } else {
480
      } else {
479
	  	$COM            = "C730";
481
	  	$COM            = "C730";
480
        $CVER           = "C730";
482
        $CVER           = "C730";
481
        $OUTPATH        = "unxirxm3";
483
        $OUTPATH        = "unxirxm3";
Lines 498-504 Link Here
498
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."mips".$ds."client";
500
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."mips".$ds."client";
499
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."mips".$ds."native_threads";
501
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."mips".$ds."native_threads";
500
}
502
}
501
elsif ( $platform eq "$Winnt" ) 
503
elsif ( $platform eq $Winnt ) 
502
{ 
504
{ 
503
      $COMPATH        = PosixFormat('@COMPATH@');
505
      $COMPATH        = PosixFormat('@COMPATH@');
504
      $PSDK_HOME      = PosixFormat('@PSDK_HOME@');
506
      $PSDK_HOME      = PosixFormat('@PSDK_HOME@');
Lines 518-525 Link Here
518
      $emergency      = "FALSE";
520
      $emergency      = "FALSE";
519
      $use_shl_versions = "TRUE";
521
      $use_shl_versions = "TRUE";
520
      $MULTITHREAD_OBJ = "TRUE";
522
      $MULTITHREAD_OBJ = "TRUE";
521
  if ( $MINGWIN32 eq "yes" )
523
    if ( $MINGWIN32 eq "yes" )
522
  {   print "Setting Windows NT cygwin mingwin32 specific values... ";
524
    { print "Setting Windows NT cygwin mingwin32 specific values... ";
523
      $outfile        = "winmingw.set"; 
525
      $outfile        = "winmingw.set"; 
524
      $COM            = "GCC";
526
      $COM            = "GCC";
525
      # Change path to lower case.
527
      # Change path to lower case.
Lines 529-537 Link Here
529
      $INPATH         = $OUTPATH.$PROEXT;
531
      $INPATH         = $OUTPATH.$PROEXT;
530
      $GVERDIR        = $INPATH;
532
      $GVERDIR        = $INPATH;
531
      $PATH_SEPERATOR = ':';
533
      $PATH_SEPERATOR = ':';
532
  }
534
    }
533
  elsif ( $USE_SHELL ne "4nt" )
535
    elsif ( '@USE_SHELL@' ne "4nt" )
534
  {   print "Setting Windows NT cygwin without 4NT specific values... ";
536
    { print "Setting Windows NT cygwin without 4NT specific values... ";
535
      $outfile        = "winenv.set"; 
537
      $outfile        = "winenv.set"; 
536
      $COM            = "MSC";
538
      $COM            = "MSC";
537
	  $WRAPCMD        = "guw.pl";
539
	  $WRAPCMD        = "guw.pl";
Lines 539-545 Link Here
539
	  $CXX            = $WRAPCMD." ".$CXX;
541
	  $CXX            = $WRAPCMD." ".$CXX;
540
      # Change path to lower case.
542
      # Change path to lower case.
541
      # not realy usefull for *sh
543
      # not realy usefull for *sh
542
#      $COMPATH        = lc $COMPATH;
544
      # $COMPATH      = lc $COMPATH;
543
      $CVER           = "MI200";
545
      $CVER           = "MI200";
544
      $DLLSUFFIX      = "mi";
546
      $DLLSUFFIX      = "mi";
545
      $OUTPATH        = "wntmsci7";
547
      $OUTPATH        = "wntmsci7";
Lines 547-555 Link Here
547
      $GVERDIR        = $INPATH;
549
      $GVERDIR        = $INPATH;
548
      $PATH_SEPERATOR = ':';
550
      $PATH_SEPERATOR = ':';
549
      $COMEX          = 7;
551
      $COMEX          = 7;
550
  }
552
    }
551
  else
553
    else
552
  {   print "Setting Windows NT specific values... ";
554
    { print "Setting Windows NT specific values... ";
553
      $outfile        = "winenv.set"; 
555
      $outfile        = "winenv.set"; 
554
      $COM            = "MSC";
556
      $COM            = "MSC";
555
      # Change path to lower case.
557
      # Change path to lower case.
Lines 561-569 Link Here
561
      $GVERDIR        = $INPATH;
563
      $GVERDIR        = $INPATH;
562
      $PATH_SEPERATOR = ';';
564
      $PATH_SEPERATOR = ';';
563
      $COMEX          = 7;
565
      $COMEX          = 7;
564
  }
566
      $comment        = "rem";         # Windows script comment character
567
    }
565
}
568
}
566
elsif ( $platform eq "$Macosx" ) 
569
elsif ( $platform eq $Macosx ) 
567
{     print "Setting Mac OS X/Darwin specific values... ";
570
{     print "Setting Mac OS X/Darwin specific values... ";
568
      $outfile        = "MacosxEnv.Set"; 
571
      $outfile        = "MacosxEnv.Set"; 
569
      $BIG_SVX        = "TRUE";
572
      $BIG_SVX        = "TRUE";
Lines 584-591 Link Here
584
      $PROSWITCH      = "-DPRODUCT";
587
      $PROSWITCH      = "-DPRODUCT";
585
      # GUIBASE is set below; may be "aqua" or "unx".
588
      # GUIBASE is set below; may be "aqua" or "unx".
586
}
589
}
587
$comment4nt     = "rem";         # Windows 4nt script comment character
590
elsif ( $platform eq "AIX" )
588
$comment        = "#";           # UNIX script comment character
591
{
592
   $machine_type = `uname -p`;  # trust AIX to be different!
593
   chomp( $machine_type );
594
   if( $machine_type ne "powerpc" )
595
   {
596
   		print "\nAIX has only been ported and tested on powerpc\n";
597
		AddWarn( "set_soenv", "Machine type $machine_type has not been tested");
598
   }
599
   print "Setting Linux PPC specific values... ";
600
   $outfile        = "aixPPCEnv.Set"; 
601
   $CPU            = "P";
602
   $CPUNAME        = "POWERPC";
603
   $DLLSUFFIX      = "ap";
604
   $OUTPATH        = "unxlngppc";
605
   $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
606
   $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
607
   $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
608
   $BIG_SVX        = "TRUE";
609
   $COM            = "GCC";
610
   $COMPATH        = '@COMPATH@'; 
611
   # $GLIBC          = "2REDHAT60";
612
   $GUI            = "UNX";
613
   $GUIBASE        = "unx";
614
   $GUIENV         = "sal";
615
   $GVER           = "VCL";
616
   $INPATH         = $OUTPATH.$PROEXT;
617
   $GVERDIR        = $INPATH;
618
   $OS             = "AIX";
619
   $PATH_SEPERATOR = $ps;
620
   $PROSWITCH      = "-DPRODUCT";
621
   $XPVERSION      = "3"; 
622
}
623
else {
624
	print "\nset_soenv:  Cannot figure out what platform you are running\n";
625
	print "For $platform and machine type $machine_type\n";
626
	exit 1;
627
}
589
print "done\n";
628
print "done\n";
590
629
591
#
630
#
Lines 612-623 Link Here
612
# JAVA_HOME as argument from autoconf.
651
# JAVA_HOME as argument from autoconf.
613
$JAVA_HOME = PosixFormat('@JAVA_HOME@') ;
652
$JAVA_HOME = PosixFormat('@JAVA_HOME@') ;
614
653
615
if ( $platform eq "$Winnt" ) {
654
if ( $platform eq $Winnt ) {
616
   $JAVA_HOME =~ s/[\s\/]+$//;	# remove trailing \n or \/ if there is any.
655
   $JAVA_HOME =~ s/[\s\/]+$//;	# remove trailing \n or \/ if there is any.
617
}
656
}
618
# 3. Tcsh path.
657
# 3. Tcsh path.
619
# Check whether autoconf found the Tcsh path.
658
# Check whether autoconf found the Tcsh path.
620
if ($USE_SHELL eq "tcsh") 
659
if ('@USE_SHELL@' eq "tcsh") 
621
{  # SHELL as argument from autoconf.
660
{  # SHELL as argument from autoconf.
622
   $SHELL = '@TCSH@'."\/tcsh";
661
   $SHELL = '@TCSH@'."\/tcsh";
623
   $TCSH_PATH = '@TCSH@';
662
   $TCSH_PATH = '@TCSH@';
Lines 625-649 Link Here
625
664
626
if ( '@STLPORT4@' eq $no_stl )
665
if ( '@STLPORT4@' eq $no_stl )
627
{
666
{
628
   $STLPORT4 = "$no_stl";
667
   $STLPORT4 = $no_stl;
629
}
668
}
630
669
631
# ml.exe assembler path for Windows users.
670
# ml.exe assembler path for Windows users.
632
if ($platform eq "$Winnt")
633
{  $ASM_PATH = PosixFormat('@ASM_HOME@');
634
}
635
# unzip.exe path for Windows users.
671
# unzip.exe path for Windows users.
636
if ($platform eq "$Winnt")
672
if ($platform eq $Winnt)
637
{  $UNZIP_PATH = PosixFormat('@UNZIP_HOME@');
673
{  $ASM_PATH = PosixFormat('@ASM_HOME@');
638
}
674
   $UNZIP_PATH = PosixFormat('@UNZIP_HOME@');
639
# 4. Gcc path.
640
# Check whether autoconf found the compiler path.
641
if (($platform eq $Linux) or ($platform eq $NetBSD) or ($platform eq $FreeBSD) or 
642
    ( ($platform eq $Irix ) or ($platform eq $Irix64) and ($compiler eq "gcc")) ) 
643
{    # GCC_HOME is not needed.
644
      $GCC_HOME = $no_gcc_home;
645
}
675
}
646
647
#
676
#
648
# E. Determining the envionment values based on the information
677
# E. Determining the envionment values based on the information
649
#    that was gathered earlier on.
678
#    that was gathered earlier on.
Lines 670-676 Link Here
670
$COMMON_BUILD_TOOLS   = '$SRC_ROOT'.$ds."external".$ds."common";
699
$COMMON_BUILD_TOOLS   = '$SRC_ROOT'.$ds."external".$ds."common";
671
700
672
# Generate alternate output file for sh?
701
# Generate alternate output file for sh?
673
if ($USE_SHELL eq "tcsh")
702
if ('@USE_SHELL@' eq "tcsh")
674
{  $outfile_sh = $outfile.".sh";
703
{  $outfile_sh = $outfile.".sh";
675
}
704
}
676
else
705
else
Lines 678-684 Link Here
678
}
707
}
679
708
680
# Generate output file for 4nt?
709
# Generate output file for 4nt?
681
if ($USE_SHELL eq "4nt")
710
if ('@USE_SHELL@' eq "4nt")
682
{  $outfile_bat = $outfile;
711
{  $outfile_bat = $outfile;
683
   $outfile_bat =~ s/set$/bat/i;
712
   $outfile_bat =~ s/set$/bat/i;
684
}
713
}
Lines 700-706 Link Here
700
729
701
730
702
# Windows NT only variables
731
# Windows NT only variables
703
if ($platform eq "$Winnt")
732
if ($platform eq $Winnt)
704
{  
733
{  
705
   if ( $JAVA_HOME ne "" )
734
   if ( $JAVA_HOME ne "" )
706
   {
735
   {
Lines 719-729 Link Here
719
   $WIN_TOUCH            = '$CYGWIN'.$ds."touch.exe";
748
   $WIN_TOUCH            = '$CYGWIN'.$ds."touch.exe";
720
}
749
}
721
750
722
if ( $JAVA_HOME ne "" )
723
{
724
   $JAVA_BIN             = $JAVA_HOME.$BIN;
725
   $JAVA_INCLUDE         = $JAVA_HOME.$ds."include";
726
}
727
$PERL                 = PosixFormat('@PERL@'); # Perl program
751
$PERL                 = PosixFormat('@PERL@'); # Perl program
728
$PERL_PATH            = dirname('@PERL@'); # Perl Path 
752
$PERL_PATH            = dirname('@PERL@'); # Perl Path 
729
$XLIB                 = PosixFormat('@XLIB@'); # X11 libraries
753
$XLIB                 = PosixFormat('@XLIB@'); # X11 libraries
Lines 731-737 Link Here
731
755
732
756
733
# Mac OS X/Darwin only variables.
757
# Mac OS X/Darwin only variables.
734
if ( $platform eq "$Macosx" )
758
if ( $platform eq $Macosx )
735
{  $FRAMEWORKSHOME       = $ds."System".$ds."Library".$ds."Frameworks";
759
{  $FRAMEWORKSHOME       = $ds."System".$ds."Library".$ds."Frameworks";
736
   if ( $XLIB eq "no_x_libraries" ) {
760
   if ( $XLIB eq "no_x_libraries" ) {
737
      $GUIBASE  = "aqua";
761
      $GUIBASE  = "aqua";
Lines 799-806 Link Here
799
# Location of the JDK supported standard classes.zip file.
823
# Location of the JDK supported standard classes.zip file.
800
# see above for why the change
824
# see above for why the change
801
$XCLASSPATH           = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$ps.'.';
825
$XCLASSPATH           = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$ps.'.';
826
802
# Paths to run time shared libraries.
827
# Paths to run time shared libraries.
803
if ($platform eq "$Solaris") 
828
if ($platform eq $Solaris) 
804
{  $LD_LIBRARY_PATH   = $cur_dir.
829
{  $LD_LIBRARY_PATH   = $cur_dir.
805
                        $ps.$USR_DT.$LIB.
830
                        $ps.$USR_DT.$LIB.
806
                        $ps.$USR_OPENWIN.$LIB.
831
                        $ps.$USR_OPENWIN.$LIB.
Lines 812-818 Link Here
812
                        $ps.$JRETHREADDIR.
837
                        $ps.$JRETHREADDIR.
813
                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
838
                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
814
}
839
}
815
elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64"))
840
elsif (($platform eq $Linux) || ($platform eq $NetBSD) ||
841
       ($platform eq $Tru64) || ($platform eq $FreeBSD) ||
842
	   ($platform = "AIX") )
816
{  $LD_LIBRARY_PATH   = $cur_dir.
843
{  $LD_LIBRARY_PATH   = $cur_dir.
817
                        $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
844
                        $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
818
                        $ps.$JRELIBDIR.
845
                        $ps.$JRELIBDIR.
Lines 823-839 Link Here
823
                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
850
                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
824
                       $ps.$ENV{'LD_LIBRARY_PATH'};
851
                       $ps.$ENV{'LD_LIBRARY_PATH'};
825
}
852
}
826
elsif ($platform eq "$FreeBSD")
853
elsif ($platform eq $Irix || $platform eq $Irix64)
827
{  $LD_LIBRARY_PATH   = $cur_dir.
828
                        $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
829
                        $ps.$JRELIBDIR.
830
                        $ps.$JRETOOLKITDIR.
831
                        $ps.$JRETHREADDIR.
832
                        $ps.$par_dir.$LIB.
833
			$ps_STLPORT_LIB.
834
                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
835
}
836
elsif ($platform eq "$Irix" || $platform eq "$Irix64")
837
{  $LD_LIBRARY_PATH   = $cur_dir.
854
{  $LD_LIBRARY_PATH   = $cur_dir.
838
                        $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
855
                        $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
839
                        $ps.$JRELIBDIR.
856
                        $ps.$JRELIBDIR.
Lines 847-859 Link Here
847
{  $LD_LIBRARY_PATH   = '$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
864
{  $LD_LIBRARY_PATH   = '$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
848
                        $ps_STLPORT_LIB;
865
                        $ps_STLPORT_LIB;
849
}
866
}
867
else
868
{  AddWarning( "set_soenv", "$platform not configured for runtime shared libraries" );
869
}
870
	
850
# Compiler directives.
871
# Compiler directives.
851
if ($platform eq "$Solaris") 
872
if ($platform eq $Solaris) 
852
{  $SOLARDEF          = $D."UNX".
873
{  $SOLARDEF          = $D."UNX".
853
                        $D.$COM.
874
                        $D.$COM.
854
                        $D.$GVER.
875
                        $D.$GVER.
855
                        $D."_PTHREADS".
876
                        $D."_PTHREADS".
856
			$D."NO_AUDIO".
877
                        $D."NO_AUDIO".
857
                        $D."SYSV".
878
                        $D."SYSV".
858
                        $D.$OS.
879
                        $D.$OS.
859
                        $D.$CPUNAME.
880
                        $D.$CPUNAME.
Lines 865-893 Link Here
865
                        $D."PRODUCT".
886
                        $D."PRODUCT".
866
                        $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"';
887
                        $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"';
867
}
888
}
868
elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$FreeBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64"))
889
elsif (($platform eq $Linux) || ($platform eq $NetBSD) ||
890
       ($platform eq $FreeBSD) || ($platform eq $Tru64) ||
891
	   ($platform eq $Irix) || ($platform eq $Irix64) || ($platform eq "AIX") )
869
{  $SOLARDEF          = $D."UNX".
892
{  $SOLARDEF          = $D."UNX".
870
                        $D.$COM.
893
                        $D.$COM.
871
			$D.$CVER.
894
                        $D.$CVER.
872
                        $D.$GVER.
895
                        $D.$GVER.
873
                        $D.$OS.
896
                        $D.$OS.
874
                        $D.$CPUNAME;
897
                        $D.$CPUNAME;
875
if  ($platform eq "$FreeBSD")
898
    if  ($platform eq $FreeBSD)
876
{  $SOLARDEF         .= $D."X86".
899
    {  $SOLARDEF     .= $D."X86".
877
                        $D."OSVERSION=$OSVERSION".
900
                        $D."OSVERSION=$OSVERSION".
878
			" ".$PTHREAD_CFLAGS;
901
			" ".$PTHREAD_CFLAGS;
879
}
902
    }
880
$SOLARDEF            .= $D."_REENTRANT".
903
    $SOLARDEF        .= $D."_REENTRANT".
881
                        $D."_POSIX_PTHREAD_SEMANTICS";
904
                            $D."_POSIX_PTHREAD_SEMANTICS";
882
if  (($platform ne "$Tru64") && ( $platform ne "$Irix") && ( $platform ne "$Irix64") && ( $platform ne "FreeBSD" ) && ( $platform ne "NetBSD" ))
905
    if  ($GLIBC ne "" )
883
{  $SOLARDEF         .= $D."GLIBC=".$GLIBC;
906
    {  $SOLARDEF     .= $D."GLIBC=".$GLIBC;
884
}
907
    }
885
$SOLARDEF            .= $D."SUPD=$UPD".
908
    $SOLARDEF        .= $D."SUPD=$UPD".
886
                        $D."PRODUCT".
909
                        $D."PRODUCT".
887
                        $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"';
910
                        $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"';
888
}
911
}
912
else
913
{  AddWarning( "set_soenv", "$platform not configured for compiler directives" );
914
}
915
889
# Location used by the linker to create libraries.
916
# Location used by the linker to create libraries.
890
if ($platform eq "$Solaris") 
917
if ($platform eq $Solaris) 
891
{  $SOLAREXTRALIB     = $L.$par_dir.$LIB.
918
{  $SOLAREXTRALIB     = $L.$par_dir.$LIB.
892
                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$ds."lib.solaris.2.6".
919
                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$ds."lib.solaris.2.6".
893
                        $L.$LIB.
920
                        $L.$LIB.
Lines 896-932 Link Here
896
                        $L.$USR_DT.$LIB.
923
                        $L.$USR_DT.$LIB.
897
                        $L.$USR_OPENWIN.$LIB;
924
                        $L.$USR_OPENWIN.$LIB;
898
}
925
}
899
elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") ||  ($platform eq "$Tru64") ||
926
elsif (($platform eq $Linux) || ($platform eq $NetBSD) ||
900
       ($platform eq "$Irix") || ($platform eq "$Irix64") || ($platform eq "$FreeBSD"))
927
       ($platform eq $Tru64) || ($platform eq $Irix) ||
928
	   ($platform eq $Irix64) || ($platform eq $FreeBSD) || ($platform eq "AIX"))
901
{
929
{
902
   $SOLAREXTRALIB     = $L.$par_dir.$LIB;
930
   $SOLAREXTRALIB     = $L.$par_dir.$LIB;
903
}
931
}
904
elsif ($platform eq "$Macosx") 
932
elsif ($platform eq $Macosx) 
905
{  $SOLAREXTRALIB     = $L.$LIB.
933
{  $SOLAREXTRALIB     = $L.$LIB.
906
                        $L.$USR.$LIB;
934
                        $L.$USR.$LIB;
907
}
935
}
936
else
937
{  AddWarning( "set_soenv", "$platform not configured for linkage create libraries" );
938
}
908
939
909
# Compiler include search directory paths.
940
# Compiler include search directory paths.
910
if (($platform eq "$Solaris") || ($platform eq "$Linux") || ($platform eq "$FreeBSD") ||
941
if (($platform eq $Solaris) || ($platform eq $Linux) ||
911
    ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) 
942
    ($platform eq $FreeBSD) || ($platform eq $NetBSD) ||
943
	($platform eq $Tru64)   || ($platform eq $Irix) ||
944
	($platform eq $Irix64)  || ($platform eq "AIX" )) 
912
{  $SOLARINCLUDES     = $I.'$SOLARENV'.$INC;
945
{  $SOLARINCLUDES     = $I.'$SOLARENV'.$INC;
913
}
946
}
914
elsif ($platform eq "$Winnt")
947
elsif ($platform eq $Winnt)
915
{  $SOLARINCLUDES     = $I.$SOLARVER.$INC.
948
{  $SOLARINCLUDES     = $I.$SOLARVER.$INC.
916
                        $I.$SOLARENV.$ds.$INPATH.$INC.
949
                        $I.$SOLARENV.$ds.$INPATH.$INC.
917
                        $I.$SOLARENV.$INC.
950
                        $I.$SOLARENV.$INC.
918
                        $I."'".$PSDK_HOME.$INCLUDE."'".
951
                        $I."'".$PSDK_HOME.$INCLUDE."'".
919
                        $I.'$COMPATH'.$ds."include";
952
                        $I.'$COMPATH'.$ds."include";
920
}
953
}
921
elsif ($platform eq "$Macosx")
954
elsif ($platform eq $Macosx)
922
{  $SOLARINCLUDES     = $I.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$INC.
955
{  $SOLARINCLUDES     = $I.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$INC.
923
                        $I.'$SOLARENV'.$ds.'$OUTPATH'.$INC.
956
                        $I.'$SOLARENV'.$ds.'$OUTPATH'.$INC.
924
                        $I.'$SOLARENV'.$INC.
957
                        $I.'$SOLARENV'.$INC.
925
                        $I.'$SRC_ROOT'.$ds."res";
958
                        $I.'$SRC_ROOT'.$ds."res";
926
}                        
959
}                        
960
else
961
{  AddWarning( "set_soenv", "$platform not configured for compiler search paths" );
962
}
927
                        
963
                        
928
# Windows NT only variables
964
# Windows NT only variables
929
if ($platform eq "$Winnt")
965
if ($platform eq $Winnt)
930
{  $COMP_ENV          = $OUTPATH;
966
{  $COMP_ENV          = $OUTPATH;
931
967
932
   $JAVAHOME          = '$JAVA_HOME';
968
   $JAVAHOME          = '$JAVA_HOME';
Lines 962-968 Link Here
962
}
998
}
963
     
999
     
964
# The general environment path.
1000
# The general environment path.
965
if ($platform eq "$Solaris") 
1001
if ($platform eq $Solaris) 
966
{  $PATH              = $cur_dir.
1002
{  $PATH              = $cur_dir.
967
                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
1003
                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
968
                        $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
1004
                        $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
Lines 977-985 Link Here
977
1013
978
   $PATH             .= $ps.$oldPATH;
1014
   $PATH             .= $ps.$oldPATH;
979
}
1015
}
980
elsif (($platform eq "$Linux") or ($platform eq "$NetBSD") 
1016
elsif (($platform eq $Linux)  || ($platform eq $NetBSD) ||
981
    or ($platform eq "$Tru64") or ($platform eq "$Irix") 
1017
       ($platform eq $Tru64)  || ($platform eq $Irix) ||
982
	or ($platform eq "$Irix64") or ($platform eq "$FreeBSD"))
1018
	   ($platform eq $Irix64) || ($platform eq $FreeBSD) || ($platform = "AIX"))
983
{  $PATH              = $cur_dir.
1019
{  $PATH              = $cur_dir.
984
                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
1020
                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
985
                        $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
1021
                        $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
Lines 1000-1006 Link Here
1000
1036
1001
}
1037
}
1002
1038
1003
elsif ($platform eq "$Winnt")
1039
elsif ($platform eq $Winnt)
1004
{ 
1040
{ 
1005
   my ( $noldPATH );
1041
   my ( $noldPATH );
1006
   $noldPATH = $oldPATH;
1042
   $noldPATH = $oldPATH;
Lines 1046-1052 Link Here
1046
	$PATH          .= $ps.'${PERL_PATH}';
1082
	$PATH          .= $ps.'${PERL_PATH}';
1047
   }
1083
   }
1048
   # Check if $TCSH_PATH is already set in PATH
1084
   # Check if $TCSH_PATH is already set in PATH
1049
   if ( ( "$USE_SHELL" eq "tcsh" ) && ( ! $noldPATH =~ /(?:[:]|\A)(?:$TCSH_PATH)(?:[:]|\Z)/ ) )
1085
   if ( ( "'@USE_SHELL@'" eq "tcsh" ) && ( ! $noldPATH =~ /(?:[:]|\A)(?:$TCSH_PATH)(?:[:]|\Z)/ ) )
1050
   {   $PATH          .= $ps.$TCSH_PATH;
1086
   {   $PATH          .= $ps.$TCSH_PATH;
1051
   }
1087
   }
1052
   if ($ASM_PATH ne "ASM_IN_PATH")
1088
   if ($ASM_PATH ne "ASM_IN_PATH")
Lines 1081-1095 Link Here
1081
                        $ps.$USR.$ds."X11R6".$BIN.
1117
                        $ps.$USR.$ds."X11R6".$BIN.
1082
                        $ps.$USR_LOCAL.$ds."sbin";
1118
                        $ps.$USR_LOCAL.$ds."sbin";
1083
                        
1119
                        
1084
# PATHEXTRA variable for Macosx.
1120
  # PATHEXTRA variable for Macosx.
1085
  $PATHEXTRA         = $USR_BIN.
1121
  $PATHEXTRA         = $USR_BIN.
1086
                        $ps.$BIN.
1122
                        $ps.$BIN.
1087
                        $ps.$USR.$ds."sbin".
1123
                        $ps.$USR.$ds."sbin".
1088
                        $ps.$ds."sbin".
1124
                        $ps.$ds."sbin".
1089
                        $ps.'$SOLARENV'.$BIN;
1125
                        $ps.'$SOLARENV'.$BIN;
1090
}
1126
}
1127
else
1128
{  AddWarning( "set_soenv", "$platform not configured for general environment paths" );
1129
}
1130
1091
# Linker library search directory paths. 
1131
# Linker library search directory paths. 
1092
if ($platform eq "$Solaris") 
1132
if ($platform eq $Solaris) 
1093
{  $SOLARLIB          = $L.$par_dir.$LIB.
1133
{  $SOLARLIB          = $L.$par_dir.$LIB.
1094
                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
1134
                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
1095
                        $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
1135
                        $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
Lines 1107-1115 Link Here
1107
                        $L_STLPORT_LIB.
1147
                        $L_STLPORT_LIB.
1108
                        $L.$XLIB;
1148
                        $L.$XLIB;
1109
}
1149
}
1110
elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64"))
1150
elsif (($platform eq $Linux)  || ($platform eq $NetBSD) ||
1151
       ($platform eq $Tru64)  || ($platform eq $Irix) ||
1152
	   ($platform eq $Irix64) || ($platform eq "AIX"))
1111
{  $SOLARLIB          = $L.$par_dir.$LIB.
1153
{  $SOLARLIB          = $L.$par_dir.$LIB.
1112
			$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
1154
                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
1113
                        $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
1155
                        $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
1114
                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
1156
                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
1115
                        $L.'$JAVA_HOME'.$LIB.
1157
                        $L.'$JAVA_HOME'.$LIB.
Lines 1119-1243 Link Here
1119
                        $L_STLPORT_LIB.
1161
                        $L_STLPORT_LIB.
1120
                        $L.$XLIB;
1162
                        $L.$XLIB;
1121
}
1163
}
1122
elsif ($platform eq "$FreeBSD")
1164
elsif ($platform eq $FreeBSD)
1123
{  $SOLARLIB          = $L.$par_dir.$LIB.
1165
{  $SOLARLIB          = $L.$par_dir.$LIB.
1124
			$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
1166
                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
1125
                        $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
1167
                        $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
1126
                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
1168
                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
1127
                        $L.'$JAVA_HOME'.$LIB.
1169
                        $L.'$JAVA_HOME'.$LIB.
1128
			$L_STLPORT_LIB.
1170
                        $L_STLPORT_LIB.
1129
                        $L.$XLIB;
1171
                        $L.$XLIB;
1130
}
1172
}
1131
elsif ($platform eq "$Winnt")
1173
elsif ($platform eq $Winnt)
1132
{  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
1174
{  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
1133
                        $L.$par_dir.$LIB.
1175
                        $L.$par_dir.$LIB.
1134
                        $L_STLPORT_LIB.
1176
                        $L_STLPORT_LIB.
1135
                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB;
1177
                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB;
1136
} 
1178
} 
1137
elsif ($platform eq "$Macosx") 
1179
elsif ($platform eq $Macosx) 
1138
{  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
1180
{  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
1139
                        $L_STLPORT_LIB.
1181
                        $L_STLPORT_LIB.
1140
                        $L.$USR_LIB;
1182
                        $L.$USR_LIB;
1141
# [ed] 6/15/02 Add in X11 libraries onto the library path
1183
    # [ed] 6/15/02 Add in X11 libraries onto the library path
1142
    if ($GUIBASE eq "unx") {
1184
    if ($GUIBASE eq "unx") {
1143
       $SOLARLIB      .= $L.$XLIB;
1185
       $SOLARLIB      .= $L.$XLIB;
1144
    }
1186
    }
1145
1187
1146
}
1188
}
1147
# Location of the compiler include search directory paths.
1189
else
1148
$SOLARINC             = $I.$cur_dir.
1190
{  AddWarning( "set_soenv", "$platform not configured for linker search directories" );
1149
                        $I.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$INC.$ds."stl".
1150
                        $I.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$INC.$ds."external".
1151
                        $I.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$INC.
1152
                        $I.'$SOLARENV'.$ds.'$OUTPATH'.$INC.
1153
                        $I.'$SOLARENV'.$INC.
1154
                        $I.'$SRC_ROOT'.$ds."res";
1155
1156
if (($platform eq "$Solaris") or ($platform eq "$Linux") or ($platform eq "$Tru64") or ($platform eq "$FreeBSD") or ($platform eq "$NetBSD") or ($platform eq "$Irix") or ($platform eq "$Irix64"))
1157
{
1158
$SOLARINC	     .= $STLPORT_stlport;
1159
if ($platform eq "$Linux" || $platform eq "$FreeBSD")
1160
{
1161
# This simply adds an include path, so even cases that break the FHS work
1162
$SOLARINC            .= $STLPORT_inc_stlport;
1163
}
1164
if ($platform eq "$Solaris")
1165
{
1166
$SOLARINC            .= '/SC5 ';
1167
}
1168
# Platform dependent include path at the top of this list of include paths
1169
if ($platform eq "$Solaris") 
1170
{  $SOLARINC         .= $I.'$COMPATH'.$ds."include";
1171
}
1191
}
1172
1192
1173
if ($platform eq "$Linux")
1193
# Location of the compiler include search directory paths.
1194
$SOLARINC         = $I.$cur_dir.
1195
                    $I.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$INC.$ds."stl".
1196
                    $I.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$INC.$ds."external".
1197
                    $I.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$INC.
1198
                    $I.'$SOLARENV'.$ds.'$OUTPATH'.$INC.
1199
                    $I.'$SOLARENV'.$INC.
1200
                    $I.'$SRC_ROOT'.$ds."res";
1201
1202
if (($platform eq $Solaris) || ($platform eq $Linux) || ($platform eq $Tru64) ||
1203
    ($platform eq $FreeBSD) || ($platform eq $NetBSD) || ($platform eq $Irix) ||
1204
	($platform eq $Irix64)  || ($platform eq "AIX"))
1174
{
1205
{
1175
# This simply adds an include path, so even cases that break the FHS work
1206
    $SOLARINC	  .= $STLPORT_stlport;
1176
   $SOLARINC         .= $STLPORT_inc_stlport;
1207
    if ($platform eq $Linux || $platform eq $FreeBSD)
1177
}
1208
    {
1209
      # This simply adds an include path, so even cases that break the FHS work
1210
      $SOLARINC   .= $STLPORT_inc_stlport;
1211
    }
1212
    # Platform dependent include path at the top of this list of include paths
1213
    elsif ($platform eq $Solaris) 
1214
    {  $SOLARINC  .= '/SC5 '.
1215
                     $I.'$COMPATH'.$ds."include";
1216
    }
1178
1217
1179
$SOLARINC            .= $I.'$SOLARENV'.$INC.$ds."Xp31".
1218
   $SOLARINC      .= $I.'$SOLARENV'.$INC.$ds."Xp31".
1180
                        $I.'$JAVA_HOME'.$INCLUDE;
1219
                     $I.'$JAVA_HOME'.$INCLUDE;
1181
1220
1182
#include system dependent Java include directory
1221
   #include system dependent Java include directory
1183
1222
1184
if ($platform eq "$Solaris")
1223
   if ($platform eq $Solaris)
1185
{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."solaris";
1224
   {  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."solaris";
1186
}
1225
   }
1187
elsif  (($platform eq "$Linux") or ($platform eq "$Tru64"))
1226
   elsif  (($platform eq $Linux) || ($platform eq $Tru64))
1188
{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
1227
   {  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
1189
}
1228
   }
1190
elsif ($platform eq "$FreeBSD")
1229
   elsif ($platform eq $FreeBSD)
1191
{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
1230
   {  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
1192
}
1231
   }
1193
elsif ($platform eq "$NetBSD")
1232
   elsif ($platform eq $NetBSD)
1194
{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
1233
   {  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
1195
}
1234
   }
1196
elsif (($platform eq "$Irix") or ($platform eq "$Irix64"))
1235
   elsif (($platform eq $Irix) || ($platform eq $Irix64))
1197
{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."irix";
1236
   {  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."irix";
1198
}
1237
   }
1199
1238
1200
#java threads include path
1239
   #java threads include path
1201
1240
1202
if ($platform eq "$FreeBSD")
1241
   if ($platform eq $FreeBSD)
1203
{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."green_threads".$ds."include";
1242
    {  $SOLARINC  .=$I.'$JAVA_HOME'.$INCLUDE.$ds."green_threads".$ds."include";
1204
}
1243
    }
1205
else
1244
    else
1206
{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include";
1245
    {  $SOLARINC  .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include";
1207
}
1246
    }
1208
1247
1209
#The tail, if needed
1248
    #The tail, if needed
1210
if (($platform eq "$Linux") or  ($platform eq "$FreeBSD") or ($platform eq "$NetBSD"))
1249
    if (($platform eq $Linux) || ($platform eq $FreeBSD) ||
1211
{  $SOLARINC         .= $I.$XINC;
1250
	   ($platform eq $NetBSD) || ($platform eq $Irix) || ($platform eq $Irix64))
1212
}
1251
    {  $SOLARINC  .= $I.$XINC;
1213
elsif ($platform eq "$Tru64") 
1252
    }
1214
{  $SOLARINC         .= $I.$XINC.
1253
    elsif ($platform eq $Tru64) 
1215
                        $I.$USR.$INCLUDE;
1254
    {  $SOLARINC  .= $I.$XINC.
1216
}
1255
                     $I.$USR.$INCLUDE;
1217
elsif (($platform eq "$Irix") or ($platform eq "$Irix64"))
1256
    }
1218
{  $SOLARINC         .= $I.$XINC;
1219
}
1220
}
1257
}
1221
elsif ($platform eq "$Winnt")
1258
elsif ($platform eq $Winnt)
1222
{  $SOLARINC         .= $STLPORT_stlport.
1259
{  $SOLARINC         .= $STLPORT_stlport.
1223
                        $I.'$JAVA_HOME'.$ds."include".$ds."win32".
1260
                        $I.'$JAVA_HOME'.$ds."include".$ds."win32".
1224
                        $I.'$JAVA_HOME'.$ds."include".
1261
                        $I.'$JAVA_HOME'.$ds."include".
1225
                        $I."'".$PSDK_HOME.$INCLUDE."'".
1262
                        $I."'".$PSDK_HOME.$INCLUDE."'".
1226
                        $I.'$COMPATH'.$ds."include";
1263
                        $I.'$COMPATH'.$ds."include";
1227
}
1264
}
1228
elsif ($platform eq "$Macosx")
1265
elsif ($platform eq $Macosx)
1229
{  $SOLARINC         .= $STLPORT_stlport.
1266
{  $SOLARINC         .= $STLPORT_stlport.
1230
                        $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
1267
                        $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
1231
# [ed] 6/15/02 Add in X11 headers as appropriate for the build
1268
   # [ed] 6/15/02 Add in X11 headers as appropriate for the build
1232
   if ($GUIBASE eq "unx") {
1269
   if ($GUIBASE eq "unx") {
1233
      $SOLARINC      .= $I.$XINC.
1270
      $SOLARINC      .= $I.$XINC.
1234
                        $I.$XINC.$ds."freetype2";
1271
                        $I.$XINC.$ds."freetype2";
1235
   }
1272
   }
1236
}
1273
}
1237
                        
1274
else
1238
1275
{  AddWarning( "set_soenv", "$platform not configured for system dependant include dir" );
1276
}
1239
#
1277
#
1240
print "done\n";
1278
print "done\n";
1279
1241
#
1280
#
1242
# F. Setting the different aliases.
1281
# F. Setting the different aliases.
1243
#
1282
#
Lines 1358-1364 Link Here
1358
# There may be a better way to do this, like splitting unxmacxp into two, but
1397
# There may be a better way to do this, like splitting unxmacxp into two, but
1359
# hopefully this hack will work for now...
1398
# hopefully this hack will work for now...
1360
1399
1361
if ($platform eq "$Macosx")
1400
if ($platform eq $Macosx)
1362
{
1401
{
1363
    my $macosxCdefs="";
1402
    my $macosxCdefs="";
1364
    
1403
    
Lines 1550-1556 Link Here
1550
# Writing the variables to file.
1589
# Writing the variables to file.
1551
# (c = comment, e = environment variable, a = alias, n = newline )
1590
# (c = comment, e = environment variable, a = alias, n = newline )
1552
ToFile( "Variable values.",  $empty,             "c" );
1591
ToFile( "Variable values.",  $empty,             "c" );
1553
if ( $platform eq "$Winnt" )
1592
if ( $platform eq $Winnt )
1554
{  ToFile( "CYGWIN",            $CYGWIN,            "e" );
1593
{  ToFile( "CYGWIN",            $CYGWIN,            "e" );
1555
   ToFile( "PSDK_HOME",         $PSDK_HOME,         "e" );
1594
   ToFile( "PSDK_HOME",         $PSDK_HOME,         "e" );
1556
   ToFile( "USE_NEW_SDK",       $USE_NEW_SDK,       "e" );
1595
   ToFile( "USE_NEW_SDK",       $USE_NEW_SDK,       "e" );
Lines 1583-1593 Link Here
1583
ToFile( "DMAKEROOT",         $DMAKEROOT,         "e" );
1622
ToFile( "DMAKEROOT",         $DMAKEROOT,         "e" );
1584
ToFile( "CLASSPATH",         $CLASSPATH,         "e" );
1623
ToFile( "CLASSPATH",         $CLASSPATH,         "e" );
1585
ToFile( "XCLASSPATH",        $XCLASSPATH,        "e" );
1624
ToFile( "XCLASSPATH",        $XCLASSPATH,        "e" );
1586
if ( $platform eq "$Macosx" )
1625
if ( $platform eq $Macosx )
1587
{  ToFile( "DYLD_LIBRARY_PATH", $LD_LIBRARY_PATH,   "e" );
1626
{  ToFile( "DYLD_LIBRARY_PATH", $LD_LIBRARY_PATH,   "e" );
1588
}
1627
}
1589
else {
1628
else {
1590
  if ( $platform eq "$Irix" || $platform eq "$Irix64" ) { 
1629
  if ( $platform eq $Irix || $platform eq $Irix64 ) { 
1591
    ToFile( "LD_LIBRARYN32_PATH",   $LD_LIBRARY_PATH,   "e" );
1630
    ToFile( "LD_LIBRARYN32_PATH",   $LD_LIBRARY_PATH,   "e" );
1592
  }
1631
  }
1593
  else {
1632
  else {
Lines 1612-1627 Link Here
1612
ToFile( "ENVCFLAGSCXX",      "@ENVCFLAGSCXX@",    "e" );
1651
ToFile( "ENVCFLAGSCXX",      "@ENVCFLAGSCXX@",    "e" );
1613
ToFile( "GXX_INCLUDE_PATH",  "@GXX_INCLUDE_PATH@","e" );
1652
ToFile( "GXX_INCLUDE_PATH",  "@GXX_INCLUDE_PATH@","e" );
1614
ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );
1653
ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );
1615
if ($platform ne "$Winnt")
1654
if ($platform ne $Winnt)
1616
{  ToFile( "TEMP",              $TEMP,              "e" );
1655
{  ToFile( "TEMP",              $TEMP,              "e" );
1617
   ToFile( "TMP",               $TEMP,              "e" );
1656
   ToFile( "TMP",               $TEMP,              "e" );
1618
}
1657
}
1619
if (( $platform eq "$Winnt" ) and ( $USE_SHELL ne "4nt" )) {
1658
if (( $platform eq $Winnt ) and ( '@USE_SHELL@' ne "4nt" )) {
1620
   ToFile( "SOLARSRC",          $SOLARSRC   ,       "j" );
1659
   ToFile( "SOLARSRC",          $SOLARSRC   ,       "j" );
1621
} else {
1660
} else {
1622
   ToFile( "SOLARSRC",          $SOLARSRC,          "e" );
1661
   ToFile( "SOLARSRC",          $SOLARSRC,          "e" );
1623
}
1662
}
1624
if ( $platform eq "$Winnt" )
1663
if ( $platform eq $Winnt )
1625
{
1664
{
1626
   # these variables marked with "j" are used with cygwin only
1665
   # these variables marked with "j" are used with cygwin only
1627
   ToFile( "LIB",               $WIN_LIB,           "j" );
1666
   ToFile( "LIB",               $WIN_LIB,           "j" );
Lines 1635-1644 Link Here
1635
   ToFile( "GNUCOPY",           $WIN_GNUCOPY,       "e" );
1674
   ToFile( "GNUCOPY",           $WIN_GNUCOPY,       "e" );
1636
   ToFile( "TOUCH",             $WIN_TOUCH,         "e" );
1675
   ToFile( "TOUCH",             $WIN_TOUCH,         "e" );
1637
}
1676
}
1638
elsif ($platform eq "$Macosx" )
1677
elsif ($platform eq $Macosx )
1639
{  ToFile( "LIB",               $MAC_LIB,           "e" );
1678
{  ToFile( "LIB",               $MAC_LIB,           "e" );
1640
}
1679
}
1641
if (( $platform eq "$Winnt" ) and ( $USE_SHELL eq "4nt" )) {
1680
if (( $platform eq $Winnt ) and ( '@USE_SHELL@' eq "4nt" )) {
1642
  my ($tempstring);
1681
  my ($tempstring);
1643
  $tempstring="perl ".WinFormat(${SOLARENV}.${BIN}.${ds}."deliver.pl");
1682
  $tempstring="perl ".WinFormat(${SOLARENV}.${BIN}.${ds}."deliver.pl");
1644
  if ( $perl_os =~ /cygwin/ ) { $tempstring =~ s#\\#\\\\#g; }
1683
  if ( $perl_os =~ /cygwin/ ) { $tempstring =~ s#\\#\\\\#g; }
Lines 1657-1663 Link Here
1657
  ToFile( "ZIPDEP",            "zipdep.pl",         "e" );
1696
  ToFile( "ZIPDEP",            "zipdep.pl",         "e" );
1658
  ToFile( "GCCINSTLIB",        "gccinstlib.pl",    "e" );
1697
  ToFile( "GCCINSTLIB",        "gccinstlib.pl",    "e" );
1659
}
1698
}
1660
ToFile( "USE_SHELL",         $USE_SHELL,         "e" );
1699
ToFile( "USE_SHELL",         '@USE_SHELL@',         "e" );
1661
#
1700
#
1662
# Writing the aliases to file.
1701
# Writing the aliases to file.
1663
# (c = comment, e = environment variable, a = alias )
1702
# (c = comment, e = environment variable, a = alias )
Lines 1666-1678 Link Here
1666
ToFile( "alias deliver",     $deliver,           "a" );
1705
ToFile( "alias deliver",     $deliver,           "a" );
1667
ToFile( "alias build",       $build,             "a" );
1706
ToFile( "alias build",       $build,             "a" );
1668
ToFile( "alias zipdep",      $zipdep,            "a" );
1707
ToFile( "alias zipdep",      $zipdep,            "a" );
1669
if ( $platform ne "$Winnt" )
1708
if ( $platform ne $Winnt )
1670
{  ToFile( "alias nmake",       $nmake,             "a" );
1709
{  ToFile( "alias nmake",       $nmake,             "a" );
1671
}
1710
}
1672
# write make command for dmake for windows
1711
# write make command for dmake for windows
1673
# (x = write as is)
1712
# (x = write as is)
1674
1713
1675
if ( $platform eq "$Winnt" and $USE_SHELL eq "4nt" )
1714
if ( $platform eq $Winnt and '@USE_SHELL@' eq "4nt" )
1676
{
1715
{
1677
  ToFile( "build the dmake executable.", $empty, "c");
1716
  ToFile( "build the dmake executable.", $empty, "c");
1678
  ToFile( "if not exist \%SRC_ROOT\\dmake\\dmake.exe (cd \%SRC_ROOT\\dmake \^ call make.bat win95-vpp40 \^ cd \%SRC_ROOT)", $empty, "x");
1717
  ToFile( "if not exist \%SRC_ROOT\\dmake\\dmake.exe (cd \%SRC_ROOT\\dmake \^ call make.bat win95-vpp40 \^ cd \%SRC_ROOT)", $empty, "x");
Lines 1766-1772 Link Here
1766
#
1805
#
1767
#
1806
#
1768
print "*********************************************************".
1807
print "*********************************************************".
1769
      "******************* $newline"."*"."$newline";
1808
      "******************* $newline"."*".$newline;
1770
print "* OpenOffice.org $UPD configuration. $newline";
1809
print "* OpenOffice.org $UPD configuration. $newline";
1771
for ( $tmp = 0; $tmp < 2; $tmp++ ) 
1810
for ( $tmp = 0; $tmp < 2; $tmp++ ) 
1772
{  print "* $newline";
1811
{  print "* $newline";
Lines 1779-1791 Link Here
1779
1818
1780
if ( $Warning ne "" ) 
1819
if ( $Warning ne "" ) 
1781
{  print "$Warning*"; 
1820
{  print "$Warning*"; 
1782
   print "$newline";
1821
   print $newline;
1783
}
1822
}
1784
1823
1785
print "$newline* USAGE: $newline";
1824
print "$newline* USAGE: $newline";
1786
print "* Source $outfile (in tcsh)";
1825
print "* Source $outfile (in tcsh)";
1787
print " or $outfile.sh (in sh)" if defined($outfile_sh);
1826
print " or $outfile.sh (in sh)" if defined($outfile_sh);
1788
print "$newline";
1827
print $newline;
1789
print "* in order to set up the build-environment variables.$newline";
1828
print "* in order to set up the build-environment variables.$newline";
1790
for ( $tmp = 0; $tmp < 2; $tmp++ ) 
1829
for ( $tmp = 0; $tmp < 2; $tmp++ ) 
1791
{  print "* $newline";
1830
{  print "* $newline";
Lines 1796-1802 Link Here
1796
$bootfile = "bootstrap";
1835
$bootfile = "bootstrap";
1797
open( OUT, ">$bootfile" ) ||
1836
open( OUT, ">$bootfile" ) ||
1798
die "Cannot open $bootfile: $!\n";
1837
die "Cannot open $bootfile: $!\n";
1799
if ( $USE_SHELL eq "4nt" )
1838
if ( '@USE_SHELL@' eq "4nt" )
1800
{  $SHELL="tcsh";
1839
{  $SHELL="tcsh";
1801
}
1840
}
1802
print OUT "#!$SHELL\n";
1841
print OUT "#!$SHELL\n";
Lines 1819-1825 Link Here
1819
}
1858
}
1820
1859
1821
print "Configure completed\n";
1860
print "Configure completed\n";
1822
if ($platform ne "$Winnt") {
1861
if ($platform ne $Winnt) {
1823
	print "You may now run $tmp in $SRC_ROOT\n";
1862
	print "You may now run $tmp in $SRC_ROOT\n";
1824
}
1863
}
1825
#
1864
#
Lines 1828-1855 Link Here
1828
#-----------------
1867
#-----------------
1829
#
1868
#
1830
#-------------------------------------------------------------
1869
#-------------------------------------------------------------
1831
# Function name: CheckPathName 
1832
# Description:   chops off the '/' character if it's the last
1833
#                character in a pathname. also adds the '/'
1834
#                character if it's not the first character
1835
#                in a path.
1836
# Arguments:     1. Path (string)
1837
# Return value:  Path (string)
1838
#-------------------------------------------------------------
1839
sub CheckPathName 
1840
{  my $retrn = $_[ 0 ];
1841
   if (($platform ne "$Winnt") or ( $USE_SHELL ne "4nt" ))
1842
   {  # Check if the first character is not a '/'.
1843
      if ( !( $_[ 0 ] =~ /^\// ) ) 
1844
      {  $retrn = $ds.$_[ 0 ];
1845
      }
1846
   }
1847
   # kill the last '/','\','\n' if they exists.
1848
   $retrn =~ s![\s/\\]+$!!;
1849
   # Done!
1850
   return( $retrn );
1851
}
1852
#-------------------------------------------------------------
1853
# Function name: CheckPathExist 
1870
# Function name: CheckPathExist 
1854
# Description:   Checks whether the directory that is given
1871
# Description:   Checks whether the directory that is given
1855
#                as an argument exists. If not it asks the     
1872
#                as an argument exists. If not it asks the     
Lines 1859-1865 Link Here
1859
#-------------------------------------------------------------
1876
#-------------------------------------------------------------
1860
sub CheckPathExist 
1877
sub CheckPathExist 
1861
{  my $dir = $_[ 0 ];
1878
{  my $dir = $_[ 0 ];
1862
   if ( !( -d $dir ) and $platform ne "$Winnt") 
1879
   if ( !( -d $dir ) and $platform ne $Winnt) 
1863
   {  printf "The directory $_[ 0 ] does not exist. Want to create it (y/n)?: ";
1880
   {  printf "The directory $_[ 0 ] does not exist. Want to create it (y/n)?: ";
1864
      my $answer = <STDIN>; 
1881
      my $answer = <STDIN>; 
1865
      chomp( $answer );
1882
      chomp( $answer );
Lines 1876-1882 Link Here
1876
      return "false";
1893
      return "false";
1877
   }
1894
   }
1878
   else
1895
   else
1879
   {   # Don't check under "$Winnt". The path is possibly posix and you could use a native NT perl!  
1896
   {   # Don't check under $Winnt. The path is possibly posix and you could use a native NT perl!  
1880
	   return "true";
1897
	   return "true";
1881
   }
1898
   }
1882
}
1899
}
Lines 1954-1978 Link Here
1954
   }
1971
   }
1955
   elsif ( $_[ 2 ] eq "c" ) 
1972
   elsif ( $_[ 2 ] eq "c" ) 
1956
   {  # Write a comment to file.
1973
   {  # Write a comment to file.
1957
      print "$newline";
1974
      print $newline;
1958
      print "$comment $newline";
1975
      print "$comment $newline";
1959
      print "$comment $_[ 0 ] $newline"; 
1976
      print "$comment $_[ 0 ] $newline"; 
1960
      print "$comment $newline";     
1977
      print "$comment $newline";     
1961
      print OUT "$newline";
1978
      print OUT $newline;
1962
      print OUT "$comment $newline";
1979
      print OUT "$comment $newline";
1963
      print OUT "$comment $_[ 0 ] $newline"; 
1980
      print OUT "$comment $_[ 0 ] $newline"; 
1964
      print OUT "$comment $newline";     
1981
      print OUT "$comment $newline";     
1965
#      print OUT "$newline";
1966
      if(defined($outfile_sh))
1982
      if(defined($outfile_sh))
1967
      {
1983
      {
1968
          print OUT_SH "$newline";
1984
          print OUT_SH $newline;
1969
          print OUT_SH "$comment $newline";
1985
          print OUT_SH "$comment $newline";
1970
          print OUT_SH "$comment $_[ 0 ] $newline"; 
1986
          print OUT_SH "$comment $_[ 0 ] $newline"; 
1971
          print OUT_SH "$comment $newline";     
1987
          print OUT_SH "$comment $newline";     
1972
      }
1988
      }
1973
      if(defined($outfile_bat))
1989
      if(defined($outfile_bat))
1974
      {
1990
      {
1975
          print OUT_BAT "$newline";
1991
          print OUT_BAT $newline;
1976
          print OUT_BAT "$comment4nt $newline";
1992
          print OUT_BAT "$comment4nt $newline";
1977
          print OUT_BAT "$comment4nt $_[ 0 ] $newline"; 
1993
          print OUT_BAT "$comment4nt $_[ 0 ] $newline"; 
1978
          print OUT_BAT "$comment4nt $newline";     
1994
          print OUT_BAT "$comment4nt $newline";     
Lines 1980-1988 Link Here
1980
   }
1996
   }
1981
   elsif ( $_[ 2 ] eq "n" ) 
1997
   elsif ( $_[ 2 ] eq "n" ) 
1982
   {  #Write a newline to a file
1998
   {  #Write a newline to a file
1983
      print OUT "$newline";
1999
      print OUT $newline;
1984
      print OUT_SH "$newline" if defined($outfile_sh);
2000
      print OUT_SH $newline if defined($outfile_sh);
1985
      print OUT_BAT "$newline" if defined($outfile_bat);
2001
      print OUT_BAT $newline if defined($outfile_bat);
1986
   }
2002
   }
1987
   elsif ( $_[ 2 ] eq "x" )
2003
   elsif ( $_[ 2 ] eq "x" )
1988
   {
2004
   {
Lines 1992-1998 Link Here
1992
   }
2008
   }
1993
   elsif ( $_[ 2 ] eq "j" )
2009
   elsif ( $_[ 2 ] eq "j" )
1994
   {
2010
   {
1995
      if ((defined $_[ 1 ]) and ( $platform eq "$Winnt" )) 
2011
      if ((defined $_[ 1 ]) and ( $platform eq $Winnt )) 
1996
      {  printf("%-12s %-17s %-10s %-39s\n", "The variable", $_[ 0 ], "is set to:", $_[ 1 ]) ; # to stdout
2012
      {  printf("%-12s %-17s %-10s %-39s\n", "The variable", $_[ 0 ], "is set to:", $_[ 1 ]) ; # to stdout
1997
         $win_format_var = WinFormat( $_[ 1 ] );  #Filter for Windows
2013
         $win_format_var = WinFormat( $_[ 1 ] );  #Filter for Windows
1998
         $win_format_var =~ s/\\/\\\\/g;
2014
         $win_format_var =~ s/\\/\\\\/g;
Lines 2025-2031 Link Here
2025
{  my ( $variable );
2041
{  my ( $variable );
2026
   $variable = $_[ 0 ];
2042
   $variable = $_[ 0 ];
2027
   # ToDo: Do the replacement only if "Winnt" and var contains "\" and ":"
2043
   # ToDo: Do the replacement only if "Winnt" and var contains "\" and ":"
2028
   if ( $platform eq "$Winnt" )
2044
   if ( $platform eq $Winnt )
2029
   {   $variable =~ s/(\$\{?\w+\}?)/$1/eeg ;         # expand the variables
2045
   {   $variable =~ s/(\$\{?\w+\}?)/$1/eeg ;         # expand the variables
2030
       $variable =~ s/(\$\{?\w+\}?)/$1/eeg ;         # expand the variables twice!
2046
       $variable =~ s/(\$\{?\w+\}?)/$1/eeg ;         # expand the variables twice!
2031
   	   if ( ( $variable =~ /\\/ ) and ( $variable =~ /:/ ) )
2047
   	   if ( ( $variable =~ /\\/ ) and ( $variable =~ /:/ ) )
Lines 2142-2148 Link Here
2142
sub CheckBuildEnv 
2158
sub CheckBuildEnv 
2143
{  my ( $src_root );
2159
{  my ( $src_root );
2144
   $src_root  = $_[ 0 ];
2160
   $src_root  = $_[ 0 ];
2145
   if ( !( -d $src_root ) and $platform ne "$Winnt") 
2161
   if ( !( -d $src_root ) and $platform ne $Winnt) 
2146
   {  return 0;
2162
   {  return 0;
2147
   }
2163
   }
2148
   return 1;
2164
   return 1;

Return to issue 12442