set_soenv.in (483bf1cb) | set_soenv.in (908225ed) |
---|---|
1#!@PERL@ -w 2# 3############################################################### 4# 5# Licensed to the Apache Software Foundation (ASF) under one 6# or more contributor license agreements. See the NOTICE file 7# distributed with this work for additional information 8# regarding copyright ownership. The ASF licenses this file --- 345 unchanged lines hidden (view full) --- 354 $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads"; 355 } 356 357 $INPATH = $OUTPATH.$PROEXT; 358} 359elsif ( $platform =~ m/freebsd/ ) 360{ $BIG_SVX = "TRUE"; 361 $COM = "GCC"; | 1#!@PERL@ -w 2# 3############################################################### 4# 5# Licensed to the Apache Software Foundation (ASF) under one 6# or more contributor license agreements. See the NOTICE file 7# distributed with this work for additional information 8# regarding copyright ownership. The ASF licenses this file --- 345 unchanged lines hidden (view full) --- 354 $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads"; 355 } 356 357 $INPATH = $OUTPATH.$PROEXT; 358} 359elsif ( $platform =~ m/freebsd/ ) 360{ $BIG_SVX = "TRUE"; 361 $COM = "GCC"; |
362 $COMPATH = '@COMPATH@'; | 362 $COMPATH = '@COMPATH@' . '/bin'; |
363 $CVER = "C300"; 364 $GUI = "UNX"; 365 $GUIBASE = "unx"; 366 $GVER = "VCL"; 367 $OS = "FREEBSD"; 368 $PATH_SEPERATOR = $ps; 369 $OSVERSION = '@OSVERSION@'; 370 if (($platform =~ m/^amd64/) || ($platform =~ m/^x86_64/)) --- 2241 unchanged lines hidden (view full) --- 2612 2613 return @cleanName; 2614 } 2615 2616 my $oldPath = shift; 2617 my @originalPairs = @_; 2618 my @pairs = @originalPairs; 2619 my @Path = split /$ps/, $oldPath; | 363 $CVER = "C300"; 364 $GUI = "UNX"; 365 $GUIBASE = "unx"; 366 $GVER = "VCL"; 367 $OS = "FREEBSD"; 368 $PATH_SEPERATOR = $ps; 369 $OSVERSION = '@OSVERSION@'; 370 if (($platform =~ m/^amd64/) || ($platform =~ m/^x86_64/)) --- 2241 unchanged lines hidden (view full) --- 2612 2613 return @cleanName; 2614 } 2615 2616 my $oldPath = shift; 2617 my @originalPairs = @_; 2618 my @pairs = @originalPairs; 2619 my @Path = split /$ps/, $oldPath; |
2620 my @buildPath; 2621 my @sysPath; 2622 my $elem; |
|
2620 | 2623 |
2624 for $elem (@Path) { 2625 if ($elem eq '.' || $elem =~ m'^$SOLARENV/' || 2626 $elem =~ m'/solenv/') { 2627 push @buildPath, $elem; 2628 } else { 2629 push @sysPath, $elem; 2630 } 2631 } 2632 |
|
2621 while (@pairs) { 2622 my $path = shift @pairs; 2623 my $cmd = shift @pairs; 2624 my $to_append = 1; | 2633 while (@pairs) { 2634 my $path = shift @pairs; 2635 my $cmd = shift @pairs; 2636 my $to_append = 1; |
2625 my $elem; | |
2626 2627 if (! -x "$path/$cmd") { 2628 AddWarning ("Missing executable $path/$cmd\n"); 2629 } 2630 | 2637 2638 if (! -x "$path/$cmd") { 2639 AddWarning ("Missing executable $path/$cmd\n"); 2640 } 2641 |
2631 for $elem (@Path) { | 2642 for $elem (@sysPath) { |
2632 if ($elem eq $path) { 2633# print "Hit duplicate path in path; break\n"; 2634 $to_append = 0; 2635 last; 2636 } | 2643 if ($elem eq $path) { 2644# print "Hit duplicate path in path; break\n"; 2645 $to_append = 0; 2646 last; 2647 } |
2637 if (-f "$elem/$cmd") { | 2648 if (-f "$elem/$cmd" && ! -l "$elem/$cmd") { |
2638# print "Element already in path ...\n"; | 2649# print "Element already in path ...\n"; |
2639 unshift @Path, $path; | 2650 unshift @sysPath, $path; |
2640 $to_append = 0; 2641 last; 2642 } else { 2643# print "No file $elem/$cmd\n"; 2644 } 2645 } 2646 if ($to_append) { | 2651 $to_append = 0; 2652 last; 2653 } else { 2654# print "No file $elem/$cmd\n"; 2655 } 2656 } 2657 if ($to_append) { |
2647 push @Path, $path; | 2658 push @sysPath, $path; |
2648 } 2649 } 2650 2651 @pairs = @originalPairs; 2652 while (@pairs) { 2653 my $path = shift @pairs; 2654 my $cmd = shift @pairs; 2655 my $realpath; 2656 | 2659 } 2660 } 2661 2662 @pairs = @originalPairs; 2663 while (@pairs) { 2664 my $path = shift @pairs; 2665 my $cmd = shift @pairs; 2666 my $realpath; 2667 |
2657 $realpath = PathLookup ($cmd, @Path); | 2668 $realpath = PathLookup ($cmd, @sysPath); |
2658 if (!($realpath eq $path)) { 2659 AddWarning ("Path conflict for executables " . 2660 "$path/$cmd against $realpath"); 2661 } 2662 } 2663 | 2669 if (!($realpath eq $path)) { 2670 AddWarning ("Path conflict for executables " . 2671 "$path/$cmd against $realpath"); 2672 } 2673 } 2674 |
2664 return join $ps, CleanupPath (@Path); | 2675 return join $ps, @buildPath, CleanupPath (@sysPath); |
2665} 2666 2667#------------------------------------------------------------ 2668# Function name: AddWarning 2669# Description: Adds any kind of warning for the user. 2670# The warning will be shown at the end 2671# of this script. 2672# Arguments: 1. Add the configure warnings or the set_soenv --- 24 unchanged lines hidden --- | 2676} 2677 2678#------------------------------------------------------------ 2679# Function name: AddWarning 2680# Description: Adds any kind of warning for the user. 2681# The warning will be shown at the end 2682# of this script. 2683# Arguments: 1. Add the configure warnings or the set_soenv --- 24 unchanged lines hidden --- |