summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-01-26 17:06:30 +0200
committerTor Lillqvist <tlillqvist@novell.com>2011-01-26 17:09:25 +0200
commitba0c6830cba0d4e73aee8cd933d83fe82addf357 (patch)
treed19dd8b0a7a3bff31f28bf4ca3ce316700f95a36
parent9537cbf1895a8b6ee77c431d067dcd24be8e679d (diff)
Drop CWS-related and "Heiner's proprietary" code
-rwxr-xr-xsolenv/bin/build.pl61
1 files changed, 0 insertions, 61 deletions
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 5865dda2d0dd..77c8b1b39b0b 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -53,10 +53,6 @@
unshift(@INC, "$ENV{COMMON_ENV_TOOLS}/modules");
$in_so_env++;
};
- if (defined $ENV{CWS_WORK_STAMP}) {
- require GenInfoParser; import GenInfoParser;
- require IO::Handle; import IO::Handle;
- };
my $verbose_mode = 0;
if (defined $ENV{verbose} || defined $ENV{VERBOSE}) {
$verbose_mode = ($ENV{verbose} =~ /^t\S*$/i);
@@ -2206,21 +2202,6 @@ sub provide_consistency {
};
#
-# Get the workspace list ('stand.lst'), either from 'localini'
-# or, if this is not possible, from 'globalini.
-# (Heiner's proprietary :)
-#
-sub get_workspace_lst
-{
- my $home = $ENV{HOME};
- my $inifile = $ENV{HOME}. '/localini/stand.lst';
- if (-f $inifile) {
- return $inifile;
- };
- return '';
-}
-
-#
# Procedure clears up module for incompatible build
#
sub ensure_clear_module {
@@ -2504,27 +2485,6 @@ sub get_modules_passed {
};
};
-sub get_workspace_platforms {
- my $workspace_patforms = shift;
- my $solver_path = $ENV{SOLARVERSION};
- opendir(SOLVERDIR, $solver_path);
- @dir_list = readdir(SOLVERDIR);
- close SOLVERDIR;
- foreach (@dir_list) {
- next if /^common/;
- next if /^\./;
- if (open(LS, "ls $solver_path/$_/inc/*minor.mk 2>$nul |")) {
- foreach my $string (<LS>) {
- chomp $string;
- if ($string =~ /minor.mk$/) {
- $$workspace_patforms{$_}++
- };
- };
- close LS;
- };
- };
-};
-
sub get_platforms {
my $platforms_ref = shift;
if ($only_platform) {
@@ -2534,27 +2494,6 @@ sub get_platforms {
$platforms_ref = \%platforms_to_copy;
};
- my $workspace_lst = get_workspace_lst();
- if ($workspace_lst) {
- my $workspace_db;
- eval { $workspace_db = GenInfoParser->new(); };
- if (!$@) {
- my $success = $workspace_db->load_list($workspace_lst);
- if ( !$success ) {
- print_error("Can't load workspace list '$workspace_lst'.", 4);
- }
- my $access_path = $ENV{WORK_STAMP} . '/Environments';
- my @platforms_available = $workspace_db->get_keys($access_path);
- my $solver = $ENV{SOLARVERSION};
- foreach (@platforms_available) {
- my $s_path = $solver . '/' . $_;
- $$platforms_ref{$_}++ if (-d $s_path);
- };
- } else {
- get_workspace_platforms(\%platforms);
- };
- };
-
if (!scalar keys %platforms) {
# An Auses wish - fallback to INPATH for new platforms
if (defined $ENV{INPATH}) {