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

(-)configure.in (-1 / +7 lines)
Lines 225-230 Link Here
225
	;;
225
	;;
226
	"WINNT")
226
	"WINNT")
227
	;;
227
	;;
228
    "AIX")
229
       echo "AIX is an alpha port ---> Use at own risk" >> warn
230
	   PTHREAD_LIBS=-pthread
231
232
    ;;
228
   *)
233
   *)
229
   AC_MSG_ERROR([$_os operating system is not suitable to build OpenOffice.org!])
234
   AC_MSG_ERROR([$_os operating system is not suitable to build OpenOffice.org!])
230
   ;;
235
   ;;
Lines 892-898 Link Here
892
   _perl_version=$?
897
   _perl_version=$?
893
   if test "$_perl_version" -lt 5; then
898
   if test "$_perl_version" -lt 5; then
894
      AC_MSG_ERROR([found Perl version "$_perl_version", use version 5 of Perl])
899
      AC_MSG_ERROR([found Perl version "$_perl_version", use version 5 of Perl])
895
   fi 
900
   fi
901
   AC_MSG_RESULT([checked (perl $_perl_version)])
896
else
902
else
897
   AC_MSG_ERROR([Perl not found, install version 5 of Perl])
903
   AC_MSG_ERROR([Perl not found, install version 5 of Perl])
898
fi
904
fi
(-)set_soenv.in (-241 / +255 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 65-71 Link Here
65
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
65
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
66
      $GVER, $GVERDIR, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
66
      $GVER, $GVERDIR, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
67
      $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR,
67
      $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR,
68
      $JRETOOLKITDIR, $JRETHREADDIR, $PTHREAD_CFLAGS, $PTHREAD_LIBS, $EXCEPTIONS, $WRAPCMD );
68
      $JRETOOLKITDIR, $JRETHREADDIR, $EXCEPTIONS, $WRAPCMD );
69
#
69
#
70
#-------------------------------------------
70
#-------------------------------------------
71
# IIc. Declaring the environment variables.
71
# IIc. Declaring the environment variables.
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 330-342 Link Here
330
      $PROSWITCH      = "-DPRODUCT";
332
      $PROSWITCH      = "-DPRODUCT";
331
      $XPVERSION      = "3";
333
      $XPVERSION      = "3";
332
      $OSVERSION      = '@OSVERSION@';
334
      $OSVERSION      = '@OSVERSION@';
333
      $PTHREAD_CFLAGS = '@PTHREAD_CFLAGS@';
334
      $PTHREAD_LIBS   = '@PTHREAD_LIBS@';
335
      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
335
      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
336
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
336
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
337
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."green_threads";
337
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."green_threads";
338
} 
338
} 
339
elsif ( $platform eq "$Linux" ) 
339
elsif ( $platform eq $Linux ) 
340
{
340
{
341
#Set machine_type specific values: 
341
#Set machine_type specific values: 
342
   if (($machine_type eq "i686") or ($machine_type eq "i586"))
342
   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";
348
      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
349
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
349
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
350
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
350
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
351
      if ($USE_GCC3 eq  "TRUE")
352
	  {
353
         $OUTPATH     = "unxlngi4";
354
      }
355
      else
356
      {
357
         $OUTPATH     = "unxlngi3";
358
      }
351
   }
359
   }
352
   elsif ($machine_type eq "sparc")
360
   elsif ($machine_type eq "sparc")
353
   {  print "Setting Linux Sparc specific values... ";
361
   {  print "Setting Linux Sparc specific values... ";
Lines 404-427 Link Here
404
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."client";
412
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."client";
405
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
413
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
406
   }
414
   }
407
#Conditional setting depending on gcc3 (on x86):
415
   #Conditional setting depending on gcc3 (on x86):
408
if ($USE_GCC3 eq  "TRUE")
416
   if ($USE_GCC3 eq  "TRUE")
409
   {
417
   {
410
      $CVER           = "C300";
418
      $CVER           = "C300";
411
   if (($machine_type eq "i686") or ($machine_type eq "i586"))
412
      {
413
        $OUTPATH      = "unxlngi4"
414
      }
415
   }
419
   }
416
else
420
   else
417
   {
421
   {
418
      $CVER           = "C295";
422
      $CVER           = "C295";
419
   if (($machine_type eq "i686") or ($machine_type eq "i586"))
420
      {
421
	$OUTPATH      = "unxlngi3"
422
      }
423
   }
423
   }
424
# General Linux settings:
424
   # General Linux settings:
425
425
426
      $BIG_SVX        = "TRUE";
426
      $BIG_SVX        = "TRUE";
427
      $COM            = "GCC";
427
      $COM            = "GCC";
Lines 438-444 Link Here
438
      $PROSWITCH      = "-DPRODUCT";
438
      $PROSWITCH      = "-DPRODUCT";
439
      $XPVERSION      = "3"; 
439
      $XPVERSION      = "3"; 
440
}
440
}
441
elsif ( $platform eq "$Tru64" ) 
441
elsif ( $platform eq $Tru64 ) 
442
{     print "Setting Tru64 specific values... ";
442
{     print "Setting Tru64 specific values... ";
443
      $outfile        = "Tru64AlphaEnv.Set"; 
443
      $outfile        = "Tru64AlphaEnv.Set"; 
444
      $BIG_SVX        = "TRUE";
444
      $BIG_SVX        = "TRUE";
Lines 463-469 Link Here
463
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."client";
463
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."client";
464
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads";
464
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads";
465
} 
465
} 
466
elsif ( $platform eq "$Irix" || $platform eq "$Irix64" )
466
elsif ( $platform eq $Irix || $platform eq $Irix64 )
467
{     print "Setting Irix specific values... ";
467
{     print "Setting Irix specific values... ";
468
      $outfile        = "IrixMipsEnv.Set";
468
      $outfile        = "IrixMipsEnv.Set";
469
      $BIG_SVX        = "TRUE";
469
      $BIG_SVX        = "TRUE";
Lines 475-481 Link Here
475
            } else {
475
            } else {
476
              $CVER           = "C295";
476
              $CVER           = "C295";
477
            }
477
            }
478
     } else {
478
      } else {
479
	  	$COM            = "C730";
479
	  	$COM            = "C730";
480
        $CVER           = "C730";
480
        $CVER           = "C730";
481
        $OUTPATH        = "unxirxm3";
481
        $OUTPATH        = "unxirxm3";
Lines 498-504 Link Here
498
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."mips".$ds."client";
498
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."mips".$ds."client";
499
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."mips".$ds."native_threads";
499
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."mips".$ds."native_threads";
500
}
500
}
501
elsif ( $platform eq "$Winnt" ) 
501
elsif ( $platform eq $Winnt ) 
502
{ 
502
{ 
503
      $COMPATH        = PosixFormat('@COMPATH@');
503
      $COMPATH        = PosixFormat('@COMPATH@');
504
      $PSDK_HOME      = PosixFormat('@PSDK_HOME@');
504
      $PSDK_HOME      = PosixFormat('@PSDK_HOME@');
Lines 518-525 Link Here
518
      $emergency      = "FALSE";
518
      $emergency      = "FALSE";
519
      $use_shl_versions = "TRUE";
519
      $use_shl_versions = "TRUE";
520
      $MULTITHREAD_OBJ = "TRUE";
520
      $MULTITHREAD_OBJ = "TRUE";
521
  if ( $MINGWIN32 eq "yes" )
521
    if ( $MINGWIN32 eq "yes" )
522
  {   print "Setting Windows NT cygwin mingwin32 specific values... ";
522
    { print "Setting Windows NT cygwin mingwin32 specific values... ";
523
      $outfile        = "winmingw.set"; 
523
      $outfile        = "winmingw.set"; 
524
      $COM            = "GCC";
524
      $COM            = "GCC";
525
      # Change path to lower case.
525
      # Change path to lower case.
Lines 529-537 Link Here
529
      $INPATH         = $OUTPATH.$PROEXT;
529
      $INPATH         = $OUTPATH.$PROEXT;
530
      $GVERDIR        = $INPATH;
530
      $GVERDIR        = $INPATH;
531
      $PATH_SEPERATOR = ':';
531
      $PATH_SEPERATOR = ':';
532
  }
532
    }
533
  elsif ( $USE_SHELL ne "4nt" )
533
    elsif ( '@USE_SHELL@' ne "4nt" )
534
  {   print "Setting Windows NT cygwin without 4NT specific values... ";
534
    { print "Setting Windows NT cygwin without 4NT specific values... ";
535
      $outfile        = "winenv.set"; 
535
      $outfile        = "winenv.set"; 
536
      $COM            = "MSC";
536
      $COM            = "MSC";
537
	  $WRAPCMD        = "guw.pl";
537
	  $WRAPCMD        = "guw.pl";
Lines 539-545 Link Here
539
	  $CXX            = $WRAPCMD." ".$CXX;
539
	  $CXX            = $WRAPCMD." ".$CXX;
540
      # Change path to lower case.
540
      # Change path to lower case.
541
      # not realy usefull for *sh
541
      # not realy usefull for *sh
542
#      $COMPATH        = lc $COMPATH;
542
      # $COMPATH      = lc $COMPATH;
543
      $CVER           = "MI200";
543
      $CVER           = "MI200";
544
      $DLLSUFFIX      = "mi";
544
      $DLLSUFFIX      = "mi";
545
      $OUTPATH        = "wntmsci7";
545
      $OUTPATH        = "wntmsci7";
Lines 547-555 Link Here
547
      $GVERDIR        = $INPATH;
547
      $GVERDIR        = $INPATH;
548
      $PATH_SEPERATOR = ':';
548
      $PATH_SEPERATOR = ':';
549
      $COMEX          = 7;
549
      $COMEX          = 7;
550
  }
550
    }
551
  else
551
    else
552
  {   print "Setting Windows NT specific values... ";
552
    { print "Setting Windows NT specific values... ";
553
      $outfile        = "winenv.set"; 
553
      $outfile        = "winenv.set"; 
554
      $COM            = "MSC";
554
      $COM            = "MSC";
555
      # Change path to lower case.
555
      # Change path to lower case.
Lines 561-569 Link Here
561
      $GVERDIR        = $INPATH;
561
      $GVERDIR        = $INPATH;
562
      $PATH_SEPERATOR = ';';
562
      $PATH_SEPERATOR = ';';
563
      $COMEX          = 7;
563
      $COMEX          = 7;
564
  }
564
      $comment        = "rem";         # Windows script comment character
565
    }
565
}
566
}
566
elsif ( $platform eq "$Macosx" ) 
567
elsif ( $platform eq $Macosx ) 
567
{     print "Setting Mac OS X/Darwin specific values... ";
568
{     print "Setting Mac OS X/Darwin specific values... ";
568
      $outfile        = "MacosxEnv.Set"; 
569
      $outfile        = "MacosxEnv.Set"; 
569
      $BIG_SVX        = "TRUE";
570
      $BIG_SVX        = "TRUE";
Lines 584-591 Link Here
584
      $PROSWITCH      = "-DPRODUCT";
585
      $PROSWITCH      = "-DPRODUCT";
585
      # GUIBASE is set below; may be "aqua" or "unx".
586
      # GUIBASE is set below; may be "aqua" or "unx".
586
}
587
}
587
$comment4nt     = "rem";         # Windows 4nt script comment character
588
elsif ( $platform eq "AIX" )
588
$comment        = "#";           # UNIX script comment character
589
{
590
   $machine_type = `uname -p`;  # trust AIX to be different!
591
   chomp( $machine_type );
592
   if( $machine_type ne "powerpc" )
593
   {
594
   		print "\nAIX has only been ported and tested on powerpc\n";
595
		AddWarn( "set_soenv", "Machine type $machine_type has not been tested");
596
   }
597
   print "Setting Linux PPC specific values... ";
598
   $outfile        = "aixPPCEnv.Set"; 
599
   $CPU            = "P";
600
   $CPUNAME        = "POWERPC";
601
   $DLLSUFFIX      = "ap";
602
   $OUTPATH        = "unxlngppc";
603
   $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
604
   $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
605
   $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
606
   $BIG_SVX        = "TRUE";
607
   $COM            = "GCC";
608
   $COMPATH        = '@COMPATH@'; 
609
   # $GLIBC          = "2REDHAT60";
610
   $GUI            = "UNX";
611
   $GUIBASE        = "unx";
612
   $GUIENV         = "sal";
613
   $GVER           = "VCL";
614
   $INPATH         = $OUTPATH.$PROEXT;
615
   $GVERDIR        = $INPATH;
616
   $OS             = "AIX";
617
   $PATH_SEPERATOR = $ps;
618
   $PROSWITCH      = "-DPRODUCT";
619
   $XPVERSION      = "3"; 
620
}
621
else {
622
	print "\nset_soenv:  Cannot figure out what platform you are running\n";
623
	print "For $platform and machine type $machine_type\n";
624
	exit 1;
625
}
589
print "done\n";
626
print "done\n";
590
627
591
#
628
#
Lines 612-623 Link Here
612
# JAVA_HOME as argument from autoconf.
649
# JAVA_HOME as argument from autoconf.
613
$JAVA_HOME = PosixFormat('@JAVA_HOME@') ;
650
$JAVA_HOME = PosixFormat('@JAVA_HOME@') ;
614
651
615
if ( $platform eq "$Winnt" ) {
652
if ( $platform eq $Winnt ) {
616
   $JAVA_HOME =~ s/[\s\/]+$//;	# remove trailing \n or \/ if there is any.
653
   $JAVA_HOME =~ s/[\s\/]+$//;	# remove trailing \n or \/ if there is any.
617
}
654
}
618
# 3. Tcsh path.
655
# 3. Tcsh path.
619
# Check whether autoconf found the Tcsh path.
656
# Check whether autoconf found the Tcsh path.
620
if ($USE_SHELL eq "tcsh") 
657
if ('@USE_SHELL@' eq "tcsh") 
621
{  # SHELL as argument from autoconf.
658
{  # SHELL as argument from autoconf.
622
   $SHELL = '@TCSH@'."\/tcsh";
659
   $SHELL = '@TCSH@'."\/tcsh";
623
   $TCSH_PATH = '@TCSH@';
660
   $TCSH_PATH = '@TCSH@';
Lines 625-649 Link Here
625
662
626
if ( '@STLPORT4@' eq $no_stl )
663
if ( '@STLPORT4@' eq $no_stl )
627
{
664
{
628
   $STLPORT4 = "$no_stl";
665
   $STLPORT4 = $no_stl;
629
}
666
}
630
667
631
# ml.exe assembler path for Windows users.
668
# 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.
669
# unzip.exe path for Windows users.
636
if ($platform eq "$Winnt")
670
if ($platform eq $Winnt)
637
{  $UNZIP_PATH = PosixFormat('@UNZIP_HOME@');
671
{  $ASM_PATH = PosixFormat('@ASM_HOME@');
638
}
672
   $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
}
673
}
646
647
#
674
#
648
# E. Determining the envionment values based on the information
675
# E. Determining the envionment values based on the information
649
#    that was gathered earlier on.
676
#    that was gathered earlier on.
Lines 670-676 Link Here
670
$COMMON_BUILD_TOOLS   = '$SRC_ROOT'.$ds."external".$ds."common";
697
$COMMON_BUILD_TOOLS   = '$SRC_ROOT'.$ds."external".$ds."common";
671
698
672
# Generate alternate output file for sh?
699
# Generate alternate output file for sh?
673
if ($USE_SHELL eq "tcsh")
700
if ('@USE_SHELL@' eq "tcsh")
674
{  $outfile_sh = $outfile.".sh";
701
{  $outfile_sh = $outfile.".sh";
675
}
702
}
676
else
703
else
Lines 678-684 Link Here
678
}
705
}
679
706
680
# Generate output file for 4nt?
707
# Generate output file for 4nt?
681
if ($USE_SHELL eq "4nt")
708
if ('@USE_SHELL@' eq "4nt")
682
{  $outfile_bat = $outfile;
709
{  $outfile_bat = $outfile;
683
   $outfile_bat =~ s/set$/bat/i;
710
   $outfile_bat =~ s/set$/bat/i;
684
}
711
}
Lines 700-706 Link Here
700
727
701
728
702
# Windows NT only variables
729
# Windows NT only variables
703
if ($platform eq "$Winnt")
730
if ($platform eq $Winnt)
704
{  
731
{  
705
   if ( $JAVA_HOME ne "" )
732
   if ( $JAVA_HOME ne "" )
706
   {
733
   {
Lines 719-729 Link Here
719
   $WIN_TOUCH            = '$CYGWIN'.$ds."touch.exe";
746
   $WIN_TOUCH            = '$CYGWIN'.$ds."touch.exe";
720
}
747
}
721
748
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
749
$PERL                 = PosixFormat('@PERL@'); # Perl program
728
$PERL_PATH            = dirname('@PERL@'); # Perl Path 
750
$PERL_PATH            = dirname('@PERL@'); # Perl Path 
729
$XLIB                 = PosixFormat('@XLIB@'); # X11 libraries
751
$XLIB                 = PosixFormat('@XLIB@'); # X11 libraries
Lines 731-737 Link Here
731
753
732
754
733
# Mac OS X/Darwin only variables.
755
# Mac OS X/Darwin only variables.
734
if ( $platform eq "$Macosx" )
756
if ( $platform eq $Macosx )
735
{  $FRAMEWORKSHOME       = $ds."System".$ds."Library".$ds."Frameworks";
757
{  $FRAMEWORKSHOME       = $ds."System".$ds."Library".$ds."Frameworks";
736
   if ( $XLIB eq "no_x_libraries" ) {
758
   if ( $XLIB eq "no_x_libraries" ) {
737
      $GUIBASE  = "aqua";
759
      $GUIBASE  = "aqua";
Lines 799-806 Link Here
799
# Location of the JDK supported standard classes.zip file.
821
# Location of the JDK supported standard classes.zip file.
800
# see above for why the change
822
# see above for why the change
801
$XCLASSPATH           = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$ps.'.';
823
$XCLASSPATH           = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$ps.'.';
824
802
# Paths to run time shared libraries.
825
# Paths to run time shared libraries.
803
if ($platform eq "$Solaris") 
826
if ($platform eq $Solaris) 
804
{  $LD_LIBRARY_PATH   = $cur_dir.
827
{  $LD_LIBRARY_PATH   = $cur_dir.
805
                        $ps.$USR_DT.$LIB.
828
                        $ps.$USR_DT.$LIB.
806
                        $ps.$USR_OPENWIN.$LIB.
829
                        $ps.$USR_OPENWIN.$LIB.
Lines 812-818 Link Here
812
                        $ps.$JRETHREADDIR.
835
                        $ps.$JRETHREADDIR.
813
                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
836
                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
814
}
837
}
815
elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64"))
838
elsif (($platform eq $Linux) || ($platform eq $NetBSD) ||
839
       ($platform eq $Tru64) || ($platform eq $FreeBSD) ||
840
	   ($platform = "AIX") )
816
{  $LD_LIBRARY_PATH   = $cur_dir.
841
{  $LD_LIBRARY_PATH   = $cur_dir.
817
                        $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
842
                        $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
818
                        $ps.$JRELIBDIR.
843
                        $ps.$JRELIBDIR.
Lines 823-839 Link Here
823
                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
848
                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
824
                       $ps.$ENV{'LD_LIBRARY_PATH'};
849
                       $ps.$ENV{'LD_LIBRARY_PATH'};
825
}
850
}
826
elsif ($platform eq "$FreeBSD")
851
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.
852
{  $LD_LIBRARY_PATH   = $cur_dir.
838
                        $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
853
                        $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
839
                        $ps.$JRELIBDIR.
854
                        $ps.$JRELIBDIR.
Lines 847-859 Link Here
847
{  $LD_LIBRARY_PATH   = '$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
862
{  $LD_LIBRARY_PATH   = '$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
848
                        $ps_STLPORT_LIB;
863
                        $ps_STLPORT_LIB;
849
}
864
}
865
else
866
{  AddWarning( "set_soenv", "$platform not configured for runtime shared libraries" );
867
}
868
	
850
# Compiler directives.
869
# Compiler directives.
851
if ($platform eq "$Solaris") 
870
if ($platform eq $Solaris) 
852
{  $SOLARDEF          = $D."UNX".
871
{  $SOLARDEF          = $D."UNX".
853
                        $D.$COM.
872
                        $D.$COM.
854
                        $D.$GVER.
873
                        $D.$GVER.
855
                        $D."_PTHREADS".
874
                        $D."_PTHREADS".
856
			$D."NO_AUDIO".
875
                        $D."NO_AUDIO".
857
                        $D."SYSV".
876
                        $D."SYSV".
858
                        $D.$OS.
877
                        $D.$OS.
859
                        $D.$CPUNAME.
878
                        $D.$CPUNAME.
Lines 865-893 Link Here
865
                        $D."PRODUCT".
884
                        $D."PRODUCT".
866
                        $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"';
885
                        $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"';
867
}
886
}
868
elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$FreeBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64"))
887
elsif (($platform eq $Linux) || ($platform eq $NetBSD) ||
888
       ($platform eq $FreeBSD) || ($platform eq $Tru64) ||
889
	   ($platform eq $Irix) || ($platform eq $Irix64) || ($platform eq "AIX") )
869
{  $SOLARDEF          = $D."UNX".
890
{  $SOLARDEF          = $D."UNX".
870
                        $D.$COM.
891
                        $D.$COM.
871
			$D.$CVER.
892
                        $D.$CVER.
872
                        $D.$GVER.
893
                        $D.$GVER.
873
                        $D.$OS.
894
                        $D.$OS.
874
                        $D.$CPUNAME;
895
                        $D.$CPUNAME;
875
if  ($platform eq "$FreeBSD")
896
    if  ($platform eq $FreeBSD)
876
{  $SOLARDEF         .= $D."X86".
897
    {  $SOLARDEF     .= $D."X86".
877
                        $D."OSVERSION=$OSVERSION".
898
                        $D."OSVERSION=$OSVERSION".
878
			" ".$PTHREAD_CFLAGS;
899
                        " @PTHREAD_CFLAGS@";
879
}
900
    }
880
$SOLARDEF            .= $D."_REENTRANT".
901
    $SOLARDEF        .= $D."_REENTRANT".
881
                        $D."_POSIX_PTHREAD_SEMANTICS";
902
                            $D."_POSIX_PTHREAD_SEMANTICS";
882
if  (($platform ne "$Tru64") && ( $platform ne "$Irix") && ( $platform ne "$Irix64") && ( $platform ne "FreeBSD" ) && ( $platform ne "NetBSD" ))
903
    if  ($GLIBC ne "" )
883
{  $SOLARDEF         .= $D."GLIBC=".$GLIBC;
904
    {  $SOLARDEF     .= $D."GLIBC=".$GLIBC;
884
}
905
    }
885
$SOLARDEF            .= $D."SUPD=$UPD".
906
    $SOLARDEF        .= $D."SUPD=$UPD".
886
                        $D."PRODUCT".
907
                        $D."PRODUCT".
887
                        $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"';
908
                        $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"';
888
}
909
}
910
else
911
{  AddWarning( "set_soenv", "$platform not configured for compiler directives" );
912
}
913
889
# Location used by the linker to create libraries.
914
# Location used by the linker to create libraries.
890
if ($platform eq "$Solaris") 
915
if ($platform eq $Solaris) 
891
{  $SOLAREXTRALIB     = $L.$par_dir.$LIB.
916
{  $SOLAREXTRALIB     = $L.$par_dir.$LIB.
892
                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$ds."lib.solaris.2.6".
917
                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$ds."lib.solaris.2.6".
893
                        $L.$LIB.
918
                        $L.$LIB.
Lines 896-932 Link Here
896
                        $L.$USR_DT.$LIB.
921
                        $L.$USR_DT.$LIB.
897
                        $L.$USR_OPENWIN.$LIB;
922
                        $L.$USR_OPENWIN.$LIB;
898
}
923
}
899
elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") ||  ($platform eq "$Tru64") ||
924
elsif (($platform eq $Linux) || ($platform eq $NetBSD) ||
900
       ($platform eq "$Irix") || ($platform eq "$Irix64") || ($platform eq "$FreeBSD"))
925
       ($platform eq $Tru64) || ($platform eq $Irix) ||
926
	   ($platform eq $Irix64) || ($platform eq $FreeBSD) || ($platform eq "AIX"))
901
{
927
{
902
   $SOLAREXTRALIB     = $L.$par_dir.$LIB;
928
   $SOLAREXTRALIB     = $L.$par_dir.$LIB;
903
}
929
}
904
elsif ($platform eq "$Macosx") 
930
elsif ($platform eq $Macosx) 
905
{  $SOLAREXTRALIB     = $L.$LIB.
931
{  $SOLAREXTRALIB     = $L.$LIB.
906
                        $L.$USR.$LIB;
932
                        $L.$USR.$LIB;
907
}
933
}
934
else
935
{  AddWarning( "set_soenv", "$platform not configured for linkage create libraries" );
936
}
908
937
909
# Compiler include search directory paths.
938
# Compiler include search directory paths.
910
if (($platform eq "$Solaris") || ($platform eq "$Linux") || ($platform eq "$FreeBSD") ||
939
if (($platform eq $Solaris) || ($platform eq $Linux) ||
911
    ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) 
940
    ($platform eq $FreeBSD) || ($platform eq $NetBSD) ||
941
	($platform eq $Tru64)   || ($platform eq $Irix) ||
942
	($platform eq $Irix64)  || ($platform eq "AIX" )) 
912
{  $SOLARINCLUDES     = $I.'$SOLARENV'.$INC;
943
{  $SOLARINCLUDES     = $I.'$SOLARENV'.$INC;
913
}
944
}
914
elsif ($platform eq "$Winnt")
945
elsif ($platform eq $Winnt)
915
{  $SOLARINCLUDES     = $I.$SOLARVER.$INC.
946
{  $SOLARINCLUDES     = $I.$SOLARVER.$INC.
916
                        $I.$SOLARENV.$ds.$INPATH.$INC.
947
                        $I.$SOLARENV.$ds.$INPATH.$INC.
917
                        $I.$SOLARENV.$INC.
948
                        $I.$SOLARENV.$INC.
918
                        $I."'".$PSDK_HOME.$INCLUDE."'".
949
                        $I."'".$PSDK_HOME.$INCLUDE."'".
919
                        $I.'$COMPATH'.$ds."include";
950
                        $I.'$COMPATH'.$ds."include";
920
}
951
}
921
elsif ($platform eq "$Macosx")
952
elsif ($platform eq $Macosx)
922
{  $SOLARINCLUDES     = $I.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$INC.
953
{  $SOLARINCLUDES     = $I.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$INC.
923
                        $I.'$SOLARENV'.$ds.'$OUTPATH'.$INC.
954
                        $I.'$SOLARENV'.$ds.'$OUTPATH'.$INC.
924
                        $I.'$SOLARENV'.$INC.
955
                        $I.'$SOLARENV'.$INC.
925
                        $I.'$SRC_ROOT'.$ds."res";
956
                        $I.'$SRC_ROOT'.$ds."res";
926
}                        
957
}                        
958
else
959
{  AddWarning( "set_soenv", "$platform not configured for compiler search paths" );
960
}
927
                        
961
                        
928
# Windows NT only variables
962
# Windows NT only variables
929
if ($platform eq "$Winnt")
963
if ($platform eq $Winnt)
930
{  $COMP_ENV          = $OUTPATH;
964
{  $COMP_ENV          = $OUTPATH;
931
965
932
   $JAVAHOME          = '$JAVA_HOME';
966
   $JAVAHOME          = '$JAVA_HOME';
Lines 962-968 Link Here
962
}
996
}
963
     
997
     
964
# The general environment path.
998
# The general environment path.
965
if ($platform eq "$Solaris") 
999
if ($platform eq $Solaris) 
966
{  $PATH              = $cur_dir.
1000
{  $PATH              = $cur_dir.
967
                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
1001
                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
968
                        $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
1002
                        $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
Lines 977-985 Link Here
977
1011
978
   $PATH             .= $ps.$oldPATH;
1012
   $PATH             .= $ps.$oldPATH;
979
}
1013
}
980
elsif (($platform eq "$Linux") or ($platform eq "$NetBSD") 
1014
elsif (($platform eq $Linux)  || ($platform eq $NetBSD) ||
981
    or ($platform eq "$Tru64") or ($platform eq "$Irix") 
1015
       ($platform eq $Tru64)  || ($platform eq $Irix) ||
982
	or ($platform eq "$Irix64") or ($platform eq "$FreeBSD"))
1016
	   ($platform eq $Irix64) || ($platform eq $FreeBSD) || ($platform = "AIX"))
983
{  $PATH              = $cur_dir.
1017
{  $PATH              = $cur_dir.
984
                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
1018
                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
985
                        $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
1019
                        $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
Lines 1000-1006 Link Here
1000
1034
1001
}
1035
}
1002
1036
1003
elsif ($platform eq "$Winnt")
1037
elsif ($platform eq $Winnt)
1004
{ 
1038
{ 
1005
   my ( $noldPATH );
1039
   my ( $noldPATH );
1006
   $noldPATH = $oldPATH;
1040
   $noldPATH = $oldPATH;
Lines 1046-1052 Link Here
1046
	$PATH          .= $ps.'${PERL_PATH}';
1080
	$PATH          .= $ps.'${PERL_PATH}';
1047
   }
1081
   }
1048
   # Check if $TCSH_PATH is already set in PATH
1082
   # Check if $TCSH_PATH is already set in PATH
1049
   if ( ( "$USE_SHELL" eq "tcsh" ) && ( ! $noldPATH =~ /(?:[:]|\A)(?:$TCSH_PATH)(?:[:]|\Z)/ ) )
1083
   if ( ( "'@USE_SHELL@'" eq "tcsh" ) && ( ! $noldPATH =~ /(?:[:]|\A)(?:$TCSH_PATH)(?:[:]|\Z)/ ) )
1050
   {   $PATH          .= $ps.$TCSH_PATH;
1084
   {   $PATH          .= $ps.$TCSH_PATH;
1051
   }
1085
   }
1052
   if ($ASM_PATH ne "ASM_IN_PATH")
1086
   if ($ASM_PATH ne "ASM_IN_PATH")
Lines 1081-1095 Link Here
1081
                        $ps.$USR.$ds."X11R6".$BIN.
1115
                        $ps.$USR.$ds."X11R6".$BIN.
1082
                        $ps.$USR_LOCAL.$ds."sbin";
1116
                        $ps.$USR_LOCAL.$ds."sbin";
1083
                        
1117
                        
1084
# PATHEXTRA variable for Macosx.
1118
  # PATHEXTRA variable for Macosx.
1085
  $PATHEXTRA         = $USR_BIN.
1119
  $PATHEXTRA         = $USR_BIN.
1086
                        $ps.$BIN.
1120
                        $ps.$BIN.
1087
                        $ps.$USR.$ds."sbin".
1121
                        $ps.$USR.$ds."sbin".
1088
                        $ps.$ds."sbin".
1122
                        $ps.$ds."sbin".
1089
                        $ps.'$SOLARENV'.$BIN;
1123
                        $ps.'$SOLARENV'.$BIN;
1090
}
1124
}
1125
else
1126
{  AddWarning( "set_soenv", "$platform not configured for general environment paths" );
1127
}
1128
1091
# Linker library search directory paths. 
1129
# Linker library search directory paths. 
1092
if ($platform eq "$Solaris") 
1130
if ($platform eq $Solaris) 
1093
{  $SOLARLIB          = $L.$par_dir.$LIB.
1131
{  $SOLARLIB          = $L.$par_dir.$LIB.
1094
                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
1132
                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
1095
                        $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
1133
                        $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
Lines 1107-1115 Link Here
1107
                        $L_STLPORT_LIB.
1145
                        $L_STLPORT_LIB.
1108
                        $L.$XLIB;
1146
                        $L.$XLIB;
1109
}
1147
}
1110
elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64"))
1148
elsif (($platform eq $Linux)  || ($platform eq $NetBSD) ||
1149
       ($platform eq $Tru64)  || ($platform eq $Irix) ||
1150
	   ($platform eq $Irix64) || ($platform eq "AIX"))
1111
{  $SOLARLIB          = $L.$par_dir.$LIB.
1151
{  $SOLARLIB          = $L.$par_dir.$LIB.
1112
			$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
1152
                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
1113
                        $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
1153
                        $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
1114
                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
1154
                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
1115
                        $L.'$JAVA_HOME'.$LIB.
1155
                        $L.'$JAVA_HOME'.$LIB.
Lines 1119-1243 Link Here
1119
                        $L_STLPORT_LIB.
1159
                        $L_STLPORT_LIB.
1120
                        $L.$XLIB;
1160
                        $L.$XLIB;
1121
}
1161
}
1122
elsif ($platform eq "$FreeBSD")
1162
elsif ($platform eq $FreeBSD)
1123
{  $SOLARLIB          = $L.$par_dir.$LIB.
1163
{  $SOLARLIB          = $L.$par_dir.$LIB.
1124
			$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
1164
                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
1125
                        $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
1165
                        $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
1126
                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
1166
                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
1127
                        $L.'$JAVA_HOME'.$LIB.
1167
                        $L.'$JAVA_HOME'.$LIB.
1128
			$L_STLPORT_LIB.
1168
                        $L_STLPORT_LIB.
1129
                        $L.$XLIB;
1169
                        $L.$XLIB;
1130
}
1170
}
1131
elsif ($platform eq "$Winnt")
1171
elsif ($platform eq $Winnt)
1132
{  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
1172
{  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
1133
                        $L.$par_dir.$LIB.
1173
                        $L.$par_dir.$LIB.
1134
                        $L_STLPORT_LIB.
1174
                        $L_STLPORT_LIB.
1135
                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB;
1175
                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB;
1136
} 
1176
} 
1137
elsif ($platform eq "$Macosx") 
1177
elsif ($platform eq $Macosx) 
1138
{  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
1178
{  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
1139
                        $L_STLPORT_LIB.
1179
                        $L_STLPORT_LIB.
1140
                        $L.$USR_LIB;
1180
                        $L.$USR_LIB;
1141
# [ed] 6/15/02 Add in X11 libraries onto the library path
1181
    # [ed] 6/15/02 Add in X11 libraries onto the library path
1142
    if ($GUIBASE eq "unx") {
1182
    if ($GUIBASE eq "unx") {
1143
       $SOLARLIB      .= $L.$XLIB;
1183
       $SOLARLIB      .= $L.$XLIB;
1144
    }
1184
    }
1145
1185
1146
}
1186
}
1147
# Location of the compiler include search directory paths.
1187
else
1148
$SOLARINC             = $I.$cur_dir.
1188
{  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
}
1189
}
1172
1190
1173
if ($platform eq "$Linux")
1191
# Location of the compiler include search directory paths.
1192
$SOLARINC         = $I.$cur_dir.
1193
                    $I.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$INC.$ds."stl".
1194
                    $I.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$INC.$ds."external".
1195
                    $I.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$INC.
1196
                    $I.'$SOLARENV'.$ds.'$OUTPATH'.$INC.
1197
                    $I.'$SOLARENV'.$INC.
1198
                    $I.'$SRC_ROOT'.$ds."res";
1199
1200
if (($platform eq $Solaris) || ($platform eq $Linux) || ($platform eq $Tru64) ||
1201
    ($platform eq $FreeBSD) || ($platform eq $NetBSD) || ($platform eq $Irix) ||
1202
	($platform eq $Irix64)  || ($platform eq "AIX"))
1174
{
1203
{
1175
# This simply adds an include path, so even cases that break the FHS work
1204
    $SOLARINC	  .= $STLPORT_stlport;
1176
   $SOLARINC         .= $STLPORT_inc_stlport;
1205
    if ($platform eq $Linux || $platform eq $FreeBSD)
1177
}
1206
    {
1207
      # This simply adds an include path, so even cases that break the FHS work
1208
      $SOLARINC   .= $STLPORT_inc_stlport;
1209
    }
1210
    # Platform dependent include path at the top of this list of include paths
1211
    elsif ($platform eq $Solaris) 
1212
    {  $SOLARINC  .= '/SC5 '.
1213
                     $I.'$COMPATH'.$ds."include";
1214
    }
1178
1215
1179
$SOLARINC            .= $I.'$SOLARENV'.$INC.$ds."Xp31".
1216
   $SOLARINC      .= $I.'$SOLARENV'.$INC.$ds."Xp31".
1180
                        $I.'$JAVA_HOME'.$INCLUDE;
1217
                     $I.'$JAVA_HOME'.$INCLUDE;
1181
1218
1182
#include system dependent Java include directory
1219
   #include system dependent Java include directory
1183
1220
1184
if ($platform eq "$Solaris")
1221
   if ($platform eq $Solaris)
1185
{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."solaris";
1222
   {  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."solaris";
1186
}
1223
   }
1187
elsif  (($platform eq "$Linux") or ($platform eq "$Tru64"))
1224
   elsif  (($platform eq $Linux) || ($platform eq $Tru64))
1188
{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
1225
   {  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
1189
}
1226
   }
1190
elsif ($platform eq "$FreeBSD")
1227
   elsif ($platform eq $FreeBSD)
1191
{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
1228
   {  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
1192
}
1229
   }
1193
elsif ($platform eq "$NetBSD")
1230
   elsif ($platform eq $NetBSD)
1194
{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
1231
   {  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
1195
}
1232
   }
1196
elsif (($platform eq "$Irix") or ($platform eq "$Irix64"))
1233
   elsif (($platform eq $Irix) || ($platform eq $Irix64))
1197
{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."irix";
1234
   {  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."irix";
1198
}
1235
   }
1199
1236
1200
#java threads include path
1237
   #java threads include path
1201
1238
1202
if ($platform eq "$FreeBSD")
1239
   if ($platform eq $FreeBSD)
1203
{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."green_threads".$ds."include";
1240
    {  $SOLARINC  .=$I.'$JAVA_HOME'.$INCLUDE.$ds."green_threads".$ds."include";
1204
}
1241
    }
1205
else
1242
    else
1206
{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include";
1243
    {  $SOLARINC  .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include";
1207
}
1244
    }
1208
1245
1209
#The tail, if needed
1246
    #The tail, if needed
1210
if (($platform eq "$Linux") or  ($platform eq "$FreeBSD") or ($platform eq "$NetBSD"))
1247
    if (($platform eq $Linux) || ($platform eq $FreeBSD) ||
1211
{  $SOLARINC         .= $I.$XINC;
1248
	   ($platform eq $NetBSD) || ($platform eq $Irix) || ($platform eq $Irix64))
1212
}
1249
    {  $SOLARINC  .= $I.$XINC;
1213
elsif ($platform eq "$Tru64") 
1250
    }
1214
{  $SOLARINC         .= $I.$XINC.
1251
    elsif ($platform eq $Tru64) 
1215
                        $I.$USR.$INCLUDE;
1252
    {  $SOLARINC  .= $I.$XINC.
1216
}
1253
                     $I.$USR.$INCLUDE;
1217
elsif (($platform eq "$Irix") or ($platform eq "$Irix64"))
1254
    }
1218
{  $SOLARINC         .= $I.$XINC;
1219
}
1220
}
1255
}
1221
elsif ($platform eq "$Winnt")
1256
elsif ($platform eq $Winnt)
1222
{  $SOLARINC         .= $STLPORT_stlport.
1257
{  $SOLARINC         .= $STLPORT_stlport.
1223
                        $I.'$JAVA_HOME'.$ds."include".$ds."win32".
1258
                        $I.'$JAVA_HOME'.$ds."include".$ds."win32".
1224
                        $I.'$JAVA_HOME'.$ds."include".
1259
                        $I.'$JAVA_HOME'.$ds."include".
1225
                        $I."'".$PSDK_HOME.$INCLUDE."'".
1260
                        $I."'".$PSDK_HOME.$INCLUDE."'".
1226
                        $I.'$COMPATH'.$ds."include";
1261
                        $I.'$COMPATH'.$ds."include";
1227
}
1262
}
1228
elsif ($platform eq "$Macosx")
1263
elsif ($platform eq $Macosx)
1229
{  $SOLARINC         .= $STLPORT_stlport.
1264
{  $SOLARINC         .= $STLPORT_stlport.
1230
                        $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
1265
                        $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
1231
# [ed] 6/15/02 Add in X11 headers as appropriate for the build
1266
   # [ed] 6/15/02 Add in X11 headers as appropriate for the build
1232
   if ($GUIBASE eq "unx") {
1267
   if ($GUIBASE eq "unx") {
1233
      $SOLARINC      .= $I.$XINC.
1268
      $SOLARINC      .= $I.$XINC.
1234
                        $I.$XINC.$ds."freetype2";
1269
                        $I.$XINC.$ds."freetype2";
1235
   }
1270
   }
1236
}
1271
}
1237
                        
1272
else
1238
1273
{  AddWarning( "set_soenv", "$platform not configured for system dependant include dir" );
1274
}
1239
#
1275
#
1240
print "done\n";
1276
print "done\n";
1277
1241
#
1278
#
1242
# F. Setting the different aliases.
1279
# F. Setting the different aliases.
1243
#
1280
#
Lines 1358-1364 Link Here
1358
# There may be a better way to do this, like splitting unxmacxp into two, but
1395
# There may be a better way to do this, like splitting unxmacxp into two, but
1359
# hopefully this hack will work for now...
1396
# hopefully this hack will work for now...
1360
1397
1361
if ($platform eq "$Macosx")
1398
if ($platform eq $Macosx)
1362
{
1399
{
1363
    my $macosxCdefs="";
1400
    my $macosxCdefs="";
1364
    
1401
    
Lines 1529-1536 Link Here
1529
ToFile( "OS",                $OS,                "e" );
1566
ToFile( "OS",                $OS,                "e" );
1530
ToFile( "EXCEPTIONS",        $EXCEPTIONS,        "e" );
1567
ToFile( "EXCEPTIONS",        $EXCEPTIONS,        "e" );
1531
ToFile( "OSVERSION",         $OSVERSION,         "e" );
1568
ToFile( "OSVERSION",         $OSVERSION,         "e" );
1532
ToFile( "PTHREAD_CFLAGS",    $PTHREAD_CFLAGS,    "e" );
1569
ToFile( "PTHREAD_CFLAGS",    "@PTHREAD_CFLAGS@", "e" );
1533
ToFile( "PTHREAD_LIBS",      $PTHREAD_LIBS,      "e" );
1570
ToFile( "PTHREAD_LIBS",      "@PTHREAD_LIBS@",   "e" );
1534
ToFile( "OUTPATH",           $OUTPATH,           "e" );
1571
ToFile( "OUTPATH",           $OUTPATH,           "e" );
1535
ToFile( "INPATH",            $INPATH,            "e" );
1572
ToFile( "INPATH",            $INPATH,            "e" );
1536
ToFile( "GVERDIR",           $GVERDIR,           "e" );
1573
ToFile( "GVERDIR",           $GVERDIR,           "e" );
Lines 1550-1556 Link Here
1550
# Writing the variables to file.
1587
# Writing the variables to file.
1551
# (c = comment, e = environment variable, a = alias, n = newline )
1588
# (c = comment, e = environment variable, a = alias, n = newline )
1552
ToFile( "Variable values.",  $empty,             "c" );
1589
ToFile( "Variable values.",  $empty,             "c" );
1553
if ( $platform eq "$Winnt" )
1590
if ( $platform eq $Winnt )
1554
{  ToFile( "CYGWIN",            $CYGWIN,            "e" );
1591
{  ToFile( "CYGWIN",            $CYGWIN,            "e" );
1555
   ToFile( "PSDK_HOME",         $PSDK_HOME,         "e" );
1592
   ToFile( "PSDK_HOME",         $PSDK_HOME,         "e" );
1556
   ToFile( "USE_NEW_SDK",       $USE_NEW_SDK,       "e" );
1593
   ToFile( "USE_NEW_SDK",       $USE_NEW_SDK,       "e" );
Lines 1583-1593 Link Here
1583
ToFile( "DMAKEROOT",         $DMAKEROOT,         "e" );
1620
ToFile( "DMAKEROOT",         $DMAKEROOT,         "e" );
1584
ToFile( "CLASSPATH",         $CLASSPATH,         "e" );
1621
ToFile( "CLASSPATH",         $CLASSPATH,         "e" );
1585
ToFile( "XCLASSPATH",        $XCLASSPATH,        "e" );
1622
ToFile( "XCLASSPATH",        $XCLASSPATH,        "e" );
1586
if ( $platform eq "$Macosx" )
1623
if ( $platform eq $Macosx )
1587
{  ToFile( "DYLD_LIBRARY_PATH", $LD_LIBRARY_PATH,   "e" );
1624
{  ToFile( "DYLD_LIBRARY_PATH", $LD_LIBRARY_PATH,   "e" );
1588
}
1625
}
1589
else {
1626
else {
1590
  if ( $platform eq "$Irix" || $platform eq "$Irix64" ) { 
1627
  if ( $platform eq $Irix || $platform eq $Irix64 ) { 
1591
    ToFile( "LD_LIBRARYN32_PATH",   $LD_LIBRARY_PATH,   "e" );
1628
    ToFile( "LD_LIBRARYN32_PATH",   $LD_LIBRARY_PATH,   "e" );
1592
  }
1629
  }
1593
  else {
1630
  else {
Lines 1612-1627 Link Here
1612
ToFile( "ENVCFLAGSCXX",      "@ENVCFLAGSCXX@",    "e" );
1649
ToFile( "ENVCFLAGSCXX",      "@ENVCFLAGSCXX@",    "e" );
1613
ToFile( "GXX_INCLUDE_PATH",  "@GXX_INCLUDE_PATH@","e" );
1650
ToFile( "GXX_INCLUDE_PATH",  "@GXX_INCLUDE_PATH@","e" );
1614
ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );
1651
ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );
1615
if ($platform ne "$Winnt")
1652
if ($platform ne $Winnt)
1616
{  ToFile( "TEMP",              $TEMP,              "e" );
1653
{  ToFile( "TEMP",              $TEMP,              "e" );
1617
   ToFile( "TMP",               $TEMP,              "e" );
1654
   ToFile( "TMP",               $TEMP,              "e" );
1618
}
1655
}
1619
if (( $platform eq "$Winnt" ) and ( $USE_SHELL ne "4nt" )) {
1656
if (( $platform eq $Winnt ) and ( '@USE_SHELL@' ne "4nt" )) {
1620
   ToFile( "SOLARSRC",          $SOLARSRC   ,       "j" );
1657
   ToFile( "SOLARSRC",          $SOLARSRC   ,       "j" );
1621
} else {
1658
} else {
1622
   ToFile( "SOLARSRC",          $SOLARSRC,          "e" );
1659
   ToFile( "SOLARSRC",          $SOLARSRC,          "e" );
1623
}
1660
}
1624
if ( $platform eq "$Winnt" )
1661
if ( $platform eq $Winnt )
1625
{
1662
{
1626
   # these variables marked with "j" are used with cygwin only
1663
   # these variables marked with "j" are used with cygwin only
1627
   ToFile( "LIB",               $WIN_LIB,           "j" );
1664
   ToFile( "LIB",               $WIN_LIB,           "j" );
Lines 1635-1644 Link Here
1635
   ToFile( "GNUCOPY",           $WIN_GNUCOPY,       "e" );
1672
   ToFile( "GNUCOPY",           $WIN_GNUCOPY,       "e" );
1636
   ToFile( "TOUCH",             $WIN_TOUCH,         "e" );
1673
   ToFile( "TOUCH",             $WIN_TOUCH,         "e" );
1637
}
1674
}
1638
elsif ($platform eq "$Macosx" )
1675
elsif ($platform eq $Macosx )
1639
{  ToFile( "LIB",               $MAC_LIB,           "e" );
1676
{  ToFile( "LIB",               $MAC_LIB,           "e" );
1640
}
1677
}
1641
if (( $platform eq "$Winnt" ) and ( $USE_SHELL eq "4nt" )) {
1678
if (( $platform eq $Winnt ) and ( '@USE_SHELL@' eq "4nt" )) {
1642
  my ($tempstring);
1679
  my ($tempstring);
1643
  $tempstring="perl ".WinFormat(${SOLARENV}.${BIN}.${ds}."deliver.pl");
1680
  $tempstring="perl ".WinFormat(${SOLARENV}.${BIN}.${ds}."deliver.pl");
1644
  if ( $perl_os =~ /cygwin/ ) { $tempstring =~ s#\\#\\\\#g; }
1681
  if ( $perl_os =~ /cygwin/ ) { $tempstring =~ s#\\#\\\\#g; }
Lines 1657-1663 Link Here
1657
  ToFile( "ZIPDEP",            "zipdep.pl",         "e" );
1694
  ToFile( "ZIPDEP",            "zipdep.pl",         "e" );
1658
  ToFile( "GCCINSTLIB",        "gccinstlib.pl",    "e" );
1695
  ToFile( "GCCINSTLIB",        "gccinstlib.pl",    "e" );
1659
}
1696
}
1660
ToFile( "USE_SHELL",         $USE_SHELL,         "e" );
1697
ToFile( "USE_SHELL",         '@USE_SHELL@',         "e" );
1661
#
1698
#
1662
# Writing the aliases to file.
1699
# Writing the aliases to file.
1663
# (c = comment, e = environment variable, a = alias )
1700
# (c = comment, e = environment variable, a = alias )
Lines 1666-1678 Link Here
1666
ToFile( "alias deliver",     $deliver,           "a" );
1703
ToFile( "alias deliver",     $deliver,           "a" );
1667
ToFile( "alias build",       $build,             "a" );
1704
ToFile( "alias build",       $build,             "a" );
1668
ToFile( "alias zipdep",      $zipdep,            "a" );
1705
ToFile( "alias zipdep",      $zipdep,            "a" );
1669
if ( $platform ne "$Winnt" )
1706
if ( $platform ne $Winnt )
1670
{  ToFile( "alias nmake",       $nmake,             "a" );
1707
{  ToFile( "alias nmake",       $nmake,             "a" );
1671
}
1708
}
1672
# write make command for dmake for windows
1709
# write make command for dmake for windows
1673
# (x = write as is)
1710
# (x = write as is)
1674
1711
1675
if ( $platform eq "$Winnt" and $USE_SHELL eq "4nt" )
1712
if ( $platform eq $Winnt and '@USE_SHELL@' eq "4nt" )
1676
{
1713
{
1677
  ToFile( "build the dmake executable.", $empty, "c");
1714
  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");
1715
  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
#
1803
#
1767
#
1804
#
1768
print "*********************************************************".
1805
print "*********************************************************".
1769
      "******************* $newline"."*"."$newline";
1806
      "******************* $newline"."*".$newline;
1770
print "* OpenOffice.org $UPD configuration. $newline";
1807
print "* OpenOffice.org $UPD configuration. $newline";
1771
for ( $tmp = 0; $tmp < 2; $tmp++ ) 
1808
for ( $tmp = 0; $tmp < 2; $tmp++ ) 
1772
{  print "* $newline";
1809
{  print "* $newline";
Lines 1779-1791 Link Here
1779
1816
1780
if ( $Warning ne "" ) 
1817
if ( $Warning ne "" ) 
1781
{  print "$Warning*"; 
1818
{  print "$Warning*"; 
1782
   print "$newline";
1819
   print $newline;
1783
}
1820
}
1784
1821
1785
print "$newline* USAGE: $newline";
1822
print "$newline* USAGE: $newline";
1786
print "* Source $outfile (in tcsh)";
1823
print "* Source $outfile (in tcsh)";
1787
print " or $outfile.sh (in sh)" if defined($outfile_sh);
1824
print " or $outfile.sh (in sh)" if defined($outfile_sh);
1788
print "$newline";
1825
print $newline;
1789
print "* in order to set up the build-environment variables.$newline";
1826
print "* in order to set up the build-environment variables.$newline";
1790
for ( $tmp = 0; $tmp < 2; $tmp++ ) 
1827
for ( $tmp = 0; $tmp < 2; $tmp++ ) 
1791
{  print "* $newline";
1828
{  print "* $newline";
Lines 1796-1802 Link Here
1796
$bootfile = "bootstrap";
1833
$bootfile = "bootstrap";
1797
open( OUT, ">$bootfile" ) ||
1834
open( OUT, ">$bootfile" ) ||
1798
die "Cannot open $bootfile: $!\n";
1835
die "Cannot open $bootfile: $!\n";
1799
if ( $USE_SHELL eq "4nt" )
1836
if ( '@USE_SHELL@' eq "4nt" )
1800
{  $SHELL="tcsh";
1837
{  $SHELL="tcsh";
1801
}
1838
}
1802
print OUT "#!$SHELL\n";
1839
print OUT "#!$SHELL\n";
Lines 1819-1825 Link Here
1819
}
1856
}
1820
1857
1821
print "Configure completed\n";
1858
print "Configure completed\n";
1822
if ($platform ne "$Winnt") {
1859
if ($platform ne $Winnt) {
1823
	print "You may now run $tmp in $SRC_ROOT\n";
1860
	print "You may now run $tmp in $SRC_ROOT\n";
1824
}
1861
}
1825
#
1862
#
Lines 1828-1855 Link Here
1828
#-----------------
1865
#-----------------
1829
#
1866
#
1830
#-------------------------------------------------------------
1867
#-------------------------------------------------------------
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 
1868
# Function name: CheckPathExist 
1854
# Description:   Checks whether the directory that is given
1869
# Description:   Checks whether the directory that is given
1855
#                as an argument exists. If not it asks the     
1870
#                as an argument exists. If not it asks the     
Lines 1859-1865 Link Here
1859
#-------------------------------------------------------------
1874
#-------------------------------------------------------------
1860
sub CheckPathExist 
1875
sub CheckPathExist 
1861
{  my $dir = $_[ 0 ];
1876
{  my $dir = $_[ 0 ];
1862
   if ( !( -d $dir ) and $platform ne "$Winnt") 
1877
   if ( !( -d $dir ) and $platform ne $Winnt) 
1863
   {  printf "The directory $_[ 0 ] does not exist. Want to create it (y/n)?: ";
1878
   {  printf "The directory $_[ 0 ] does not exist. Want to create it (y/n)?: ";
1864
      my $answer = <STDIN>; 
1879
      my $answer = <STDIN>; 
1865
      chomp( $answer );
1880
      chomp( $answer );
Lines 1876-1882 Link Here
1876
      return "false";
1891
      return "false";
1877
   }
1892
   }
1878
   else
1893
   else
1879
   {   # Don't check under "$Winnt". The path is possibly posix and you could use a native NT perl!  
1894
   {   # Don't check under $Winnt. The path is possibly posix and you could use a native NT perl!  
1880
	   return "true";
1895
	   return "true";
1881
   }
1896
   }
1882
}
1897
}
Lines 1954-1978 Link Here
1954
   }
1969
   }
1955
   elsif ( $_[ 2 ] eq "c" ) 
1970
   elsif ( $_[ 2 ] eq "c" ) 
1956
   {  # Write a comment to file.
1971
   {  # Write a comment to file.
1957
      print "$newline";
1972
      print $newline;
1958
      print "$comment $newline";
1973
      print "$comment $newline";
1959
      print "$comment $_[ 0 ] $newline"; 
1974
      print "$comment $_[ 0 ] $newline"; 
1960
      print "$comment $newline";     
1975
      print "$comment $newline";     
1961
      print OUT "$newline";
1976
      print OUT $newline;
1962
      print OUT "$comment $newline";
1977
      print OUT "$comment $newline";
1963
      print OUT "$comment $_[ 0 ] $newline"; 
1978
      print OUT "$comment $_[ 0 ] $newline"; 
1964
      print OUT "$comment $newline";     
1979
      print OUT "$comment $newline";     
1965
#      print OUT "$newline";
1966
      if(defined($outfile_sh))
1980
      if(defined($outfile_sh))
1967
      {
1981
      {
1968
          print OUT_SH "$newline";
1982
          print OUT_SH $newline;
1969
          print OUT_SH "$comment $newline";
1983
          print OUT_SH "$comment $newline";
1970
          print OUT_SH "$comment $_[ 0 ] $newline"; 
1984
          print OUT_SH "$comment $_[ 0 ] $newline"; 
1971
          print OUT_SH "$comment $newline";     
1985
          print OUT_SH "$comment $newline";     
1972
      }
1986
      }
1973
      if(defined($outfile_bat))
1987
      if(defined($outfile_bat))
1974
      {
1988
      {
1975
          print OUT_BAT "$newline";
1989
          print OUT_BAT $newline;
1976
          print OUT_BAT "$comment4nt $newline";
1990
          print OUT_BAT "$comment4nt $newline";
1977
          print OUT_BAT "$comment4nt $_[ 0 ] $newline"; 
1991
          print OUT_BAT "$comment4nt $_[ 0 ] $newline"; 
1978
          print OUT_BAT "$comment4nt $newline";     
1992
          print OUT_BAT "$comment4nt $newline";     
Lines 1980-1988 Link Here
1980
   }
1994
   }
1981
   elsif ( $_[ 2 ] eq "n" ) 
1995
   elsif ( $_[ 2 ] eq "n" ) 
1982
   {  #Write a newline to a file
1996
   {  #Write a newline to a file
1983
      print OUT "$newline";
1997
      print OUT $newline;
1984
      print OUT_SH "$newline" if defined($outfile_sh);
1998
      print OUT_SH $newline if defined($outfile_sh);
1985
      print OUT_BAT "$newline" if defined($outfile_bat);
1999
      print OUT_BAT $newline if defined($outfile_bat);
1986
   }
2000
   }
1987
   elsif ( $_[ 2 ] eq "x" )
2001
   elsif ( $_[ 2 ] eq "x" )
1988
   {
2002
   {
Lines 1992-1998 Link Here
1992
   }
2006
   }
1993
   elsif ( $_[ 2 ] eq "j" )
2007
   elsif ( $_[ 2 ] eq "j" )
1994
   {
2008
   {
1995
      if ((defined $_[ 1 ]) and ( $platform eq "$Winnt" )) 
2009
      if ((defined $_[ 1 ]) and ( $platform eq $Winnt )) 
1996
      {  printf("%-12s %-17s %-10s %-39s\n", "The variable", $_[ 0 ], "is set to:", $_[ 1 ]) ; # to stdout
2010
      {  printf("%-12s %-17s %-10s %-39s\n", "The variable", $_[ 0 ], "is set to:", $_[ 1 ]) ; # to stdout
1997
         $win_format_var = WinFormat( $_[ 1 ] );  #Filter for Windows
2011
         $win_format_var = WinFormat( $_[ 1 ] );  #Filter for Windows
1998
         $win_format_var =~ s/\\/\\\\/g;
2012
         $win_format_var =~ s/\\/\\\\/g;
Lines 2025-2031 Link Here
2025
{  my ( $variable );
2039
{  my ( $variable );
2026
   $variable = $_[ 0 ];
2040
   $variable = $_[ 0 ];
2027
   # ToDo: Do the replacement only if "Winnt" and var contains "\" and ":"
2041
   # ToDo: Do the replacement only if "Winnt" and var contains "\" and ":"
2028
   if ( $platform eq "$Winnt" )
2042
   if ( $platform eq $Winnt )
2029
   {   $variable =~ s/(\$\{?\w+\}?)/$1/eeg ;         # expand the variables
2043
   {   $variable =~ s/(\$\{?\w+\}?)/$1/eeg ;         # expand the variables
2030
       $variable =~ s/(\$\{?\w+\}?)/$1/eeg ;         # expand the variables twice!
2044
       $variable =~ s/(\$\{?\w+\}?)/$1/eeg ;         # expand the variables twice!
2031
   	   if ( ( $variable =~ /\\/ ) and ( $variable =~ /:/ ) )
2045
   	   if ( ( $variable =~ /\\/ ) and ( $variable =~ /:/ ) )
Lines 2142-2148 Link Here
2142
sub CheckBuildEnv 
2156
sub CheckBuildEnv 
2143
{  my ( $src_root );
2157
{  my ( $src_root );
2144
   $src_root  = $_[ 0 ];
2158
   $src_root  = $_[ 0 ];
2145
   if ( !( -d $src_root ) and $platform ne "$Winnt") 
2159
   if ( !( -d $src_root ) and $platform ne $Winnt) 
2146
   {  return 0;
2160
   {  return 0;
2147
   }
2161
   }
2148
   return 1;
2162
   return 1;

Return to issue 13620