From dbcf68f61e36bde0228357f48d40a28beb0e2f52 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@novell.com>
Date: Mon, 18 Apr 2011 14:03:23 +0300
Subject: Kill UPDMINOR and UPDMINOREXT stuff

As far as I know we have no intention to use that stuff. Do we ever
have any idea what it means? But sure, if it turns out that we do want
to, this commit will have to be reverted.
---
 solenv/bin/build.pl                            |  6 ++----
 solenv/bin/checkdll.sh                         |  2 +-
 solenv/bin/createpdbrelocators.pl              | 15 +++------------
 solenv/bin/deliver.pl                          | 17 -----------------
 solenv/bin/gsicheck                            | 11 +++--------
 solenv/bin/localize                            | 11 +++--------
 solenv/bin/localize_sl                         | 11 +++--------
 solenv/bin/modules/CreatePDBRelocators.pm      |  5 -----
 solenv/bin/modules/SourceConfig.pm             |  6 ------
 solenv/bin/modules/installer/downloadsigner.pm |  5 +++++
 solenv/bin/modules/installer/environment.pm    |  1 -
 solenv/bin/modules/installer/ziplist.pm        | 13 ++-----------
 solenv/bin/receditor                           |  2 +-
 13 files changed, 23 insertions(+), 82 deletions(-)
 mode change 100644 => 100755 solenv/bin/createpdbrelocators.pl
 mode change 100755 => 100644 solenv/bin/modules/SourceConfig.pm

(limited to 'solenv/bin')

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 22db4032b39d..d6664a44530a 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -2298,7 +2298,6 @@ sub retrieve_build_list {
     my $solver_inc_dir = "$ENV{SOLARVER}/$ENV{OUTPATH}";
     $solver_inc_dir .= $ENV{PROEXT} if (defined $ENV{PROEXT});
     $solver_inc_dir .= '/inc';
-    $solver_inc_dir .= $ENV{UPDMINOREXT} if (defined $ENV{UPDMINOREXT});
     $solver_inc_dir .= "/$module";
     $solver_inc_dir = correct_path($solver_inc_dir);
     $dead_parents{$module}++;
@@ -2572,12 +2571,11 @@ sub read_ssolar_vars {
         $platform = $`;
     };
 
-    my ($verswitch, $source_root, $cwsname);
-    $verswitch = "-ver $ENV{UPDMINOR}" if (defined $ENV{UPDMINOR});
+    my ($source_root, $cwsname);
     $source_root = '-sourceroot' if (defined $ENV{SOURCE_ROOT_USED});
     my $cws_name = "-cwsname $ENV{CWS_WORK_STAMP}" if (defined $ENV{CWS_WORK_STAMP});
 
-    my $param = "-$ENV{WORK_STAMP} $verswitch $source_root $cws_name $pro $platform";
+    my $param = "-$ENV{WORK_STAMP} $source_root $cws_name $pro $platform";
     my $ss_command = "$perl $setsolar -file $tmp_file $param $nul";
     if (system($ss_command)) {
         unlink $tmp_file;
diff --git a/solenv/bin/checkdll.sh b/solenv/bin/checkdll.sh
index b7ad3d4628f0..42a6725750a4 100755
--- a/solenv/bin/checkdll.sh
+++ b/solenv/bin/checkdll.sh
@@ -33,7 +33,7 @@ set -- `getopt "L:" "$@"` ||  {
     exit 1
 }
 
-checkdll="$SOLARVERSION/$INPATH/bin$UPDMINOREXT/checkdll"
+checkdll="$SOLARVERSION/$INPATH/bin/checkdll"
 
 if [ -x $checkdll ]; then
     while :
diff --git a/solenv/bin/createpdbrelocators.pl b/solenv/bin/createpdbrelocators.pl
old mode 100644
new mode 100755
index 75047f3952f5..d32dd7d84508
--- a/solenv/bin/createpdbrelocators.pl
+++ b/solenv/bin/createpdbrelocators.pl
@@ -57,22 +57,13 @@ $id_str =~ /Revision:\s+(\S+)\s+\$/
 print "$script_name -- version: $script_rev\n";
 
 my $inpath    = $ENV{INPATH};
-my $milestone = $ENV{UPDMINOR};
-my $milestoneext = $ENV{UPDMINOREXT};
 
-if ( $ARGV[0] ) {
-    if ( $milestone && ( $milestone ne $ARGV[0] ) ) {
-        die "Error: specified milestone $ARGV[0] does not match your environment";
-    }
-    $milestone = $ARGV[0];
-}
-
-if ( !$inpath || !$milestone ) {
-    print STDERR "$script_name: INAPTH or UPDMINOR not set!\n";
+if ( !$inpath ) {
+    print STDERR "$script_name: INAPTH not set!\n";
     exit(1);
 }
 my $relocators = CreatePDBRelocators->new();
-my $rc = $relocators->create_pdb_relocators($inpath, $milestoneext, "");
+my $rc = $relocators->create_pdb_relocators($inpath, "", "");
 
 if ( !$rc ) {
     print STDERR "$script_name: creating PDB relocators failed!\n";
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 0a945bc4e408..55f6a9e6f0ab 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -463,8 +463,6 @@ sub init_globals
     my $inpath        = $ENV{'INPATH'};
     my $solarversion  = $ENV{'SOLARVERSION'};
     my $updater       = $ENV{'UPDATER'};
-    my $updminor      = $ENV{'UPDMINOR'};
-    my $updminorext   = $ENV{'UPDMINOREXT'};
     my $work_stamp    = $ENV{'WORK_STAMP'};
 
     # special security check for release engineers
@@ -486,9 +484,6 @@ sub init_globals
     }
 
     $ext = "";
-    if ( ($updminor) && !$dest ) {
-        $ext = "$updminorext";
-    }
 
     # Do we have common trees?
     if ( defined($ENV{'common_build'}) && $ENV{'common_build'} eq 'TRUE' ) {
@@ -1119,20 +1114,8 @@ sub push_on_ziplist
     return if ( $opt_check );
     # strip $dest from path since we don't want to record it in zip file
     if ( $file =~ s#^\Q$dest\E/##o ) {
-        if ( $updminor ){
-            # strip minor from path
-            my $ext = "%_EXT%";
-            $ext = expand_macros($ext);
-            $file =~ s#^$ext##o;
-        }
         push(@zip_list, $file);
     } elsif ( $file =~ s#^\Q$common_dest\E/##o ) {
-        if ( $updminor ){
-            # strip minor from path
-            my $ext = "%_EXT%";
-            $ext = expand_macros($ext);
-            $file =~ s#^$ext##o;
-        }
         push(@common_zip_list, $file);
     }
 }
diff --git a/solenv/bin/gsicheck b/solenv/bin/gsicheck
index fb2f65cbe01d..5a09880b9014 100755
--- a/solenv/bin/gsicheck
+++ b/solenv/bin/gsicheck
@@ -5,14 +5,9 @@ exit 1
 fi
 
 if [ "${OS?}" = MACOSX ]; then
-    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
 else
-    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
-fi
-
-if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
-    exec $SOLARVERSION/$INPATH/bin/gsicheck "$@"
-else
-    exec $SOLARVERSION/$INPATH/bin$UPDMINOREXT/gsicheck "$@"
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
 fi
 
+exec $SOLARVERSION/$INPATH/bin/gsicheck "$@"
diff --git a/solenv/bin/localize b/solenv/bin/localize
index ef5550e72e67..9504e8ee37ed 100755
--- a/solenv/bin/localize
+++ b/solenv/bin/localize
@@ -7,14 +7,9 @@ fi
 # localize.pl calls localize_sl in solver bin directory which depends on dynamic
 # libraries in solver lib directory but has no correct RPATH (or equivalent):
 if [ "${OS?}" = MACOSX ]; then
-    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
 else
-    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
-fi
-
-if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
-    exec perl -w $SOLARVERSION/$INPATH/bin/localize.pl "$@"
-else
-    exec perl -w $SOLARVERSION/$INPATH/bin$UPDMINOREXT/localize.pl "$@"
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
 fi
 
+exec perl -w $SOLARVERSION/$INPATH/bin/localize.pl "$@"
diff --git a/solenv/bin/localize_sl b/solenv/bin/localize_sl
index af7f8351406c..d0db56084a19 100755
--- a/solenv/bin/localize_sl
+++ b/solenv/bin/localize_sl
@@ -5,14 +5,9 @@ exit 1
 fi
 
 if [ "${OS?}" = MACOSX ]; then
-    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
 else
-    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
-fi
-
-if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
-    exec $SOLARVERSION/$INPATH/bin/localize_sl "$@"
-else
-    exec $SOLARVERSION/$INPATH/bin$UPDMINOREXT/localize_sl "$@"
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
 fi
 
+exec $SOLARVERSION/$INPATH/bin/localize_sl "$@"
diff --git a/solenv/bin/modules/CreatePDBRelocators.pm b/solenv/bin/modules/CreatePDBRelocators.pm
index 753075a2bfea..fc488ca3b037 100644
--- a/solenv/bin/modules/CreatePDBRelocators.pm
+++ b/solenv/bin/modules/CreatePDBRelocators.pm
@@ -76,11 +76,6 @@ sub new
     }
     my $SourceConfigObj = SourceConfig->new();
     @repos = $SourceConfigObj->get_repositories();
-    if ( defined $ENV{UPDMINOREXT} ) {
-        foreach my $onedir ( @repos ) {
-            push( @basedirs, $onedir.$ENV{UPDMINOREXT} );
-        }
-    }
     # basdirs is repositories (dmake) + workdir (gnu make)
     push(@basedirs, $relworkdir);
     if (!scalar @basedirs) {
diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
old mode 100755
new mode 100644
index 5861ece08967..5ca61b5c2c9f
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@ -317,12 +317,6 @@ sub read_config_file {
             if (/\s*(\S+)=active\s*(\s+#)*/) {
                 if ($repository_section) {
                     my $repository_source_path = $self->{SOURCE_ROOT} . "/$1";
-                    if (defined $ENV{UPDMINOREXT}) {
-                        $repository_source_path .= $ENV{UPDMINOREXT};
-                        if (defined ${$self->{REPOSITORIES}}{$1.$ENV{UPDMINOREXT}}) {
-                            delete ${$self->{REPOSITORIES}}{$1.$ENV{UPDMINOREXT}};
-                        };
-                    };
                     ${$self->{REPOSITORIES}}{$1} = $repository_source_path;
                     ${$self->{ACTIVATED_REPOSITORIES}}{$1}++;
                     next;
diff --git a/solenv/bin/modules/installer/downloadsigner.pm b/solenv/bin/modules/installer/downloadsigner.pm
index a01658959c44..8a63242e0685 100644
--- a/solenv/bin/modules/installer/downloadsigner.pm
+++ b/solenv/bin/modules/installer/downloadsigner.pm
@@ -411,6 +411,11 @@ sub filter_all_files_with_correct_settings
     my $workstamp = "";
 
     if ( $ENV{'WORK_STAMP'} ) { $workstamp = $ENV{'WORK_STAMP'}; }
+
+    # This is broken, we don't want to support any UPDMINOR
+    # complexities in LibreOffice. (Or do we?) This needs updating if
+    # we want to actually use this file for signing.
+
     if ( $ENV{'UPDMINOR'} ) { $minor = $ENV{'UPDMINOR'}; }
 
     if ( $minor eq "" ) { installer::exiter::exit_program("ERROR: Environment variable \"UPDMINOR\" not set!", "filter_all_files_with_correct_settings"); }
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index 5c8c4ab25e40..c80d8375f3c2 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -111,7 +111,6 @@ sub set_global_environment_variables
     $installer::globals::build = $environment->{'WORK_STAMP'};
     $installer::globals::compiler = $environment->{'OUTPATH'};
 
-    if ( $ENV{'UPDMINOR'} ) { $installer::globals::minor = $ENV{'UPDMINOR'}; }
     if ( $ENV{'LAST_MINOR'} ) { $installer::globals::lastminor = $ENV{'LAST_MINOR'}; }
 
     if ( $ENV{'PROEXT'} ) { $installer::globals::pro = 1; }
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index 629f947b3e3c..d52e97bf4e87 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -489,17 +489,8 @@ sub replace_minor_in_pathes
     {
         my $line = ${$patharrayref}[$i];
 
-        if ( ! defined $ENV{CWS_WORK_STAMP} and defined $ENV{UPDMINOR} )
-        {
-            $line =~ s/\{minor\}/$installer::globals::minor/g;
-            # no difference for minor and minornonpre (ToDo ?)
-            $line =~ s/\{minornonpre\}/$installer::globals::minor/g;
-        }
-        else    # building without a minor
-        {
-            $line =~ s/\.\{minor\}//g;
-            $line =~ s/\.\{minornonpre\}//g;
-        }
+        $line =~ s/\.\{minor\}//g;
+        $line =~ s/\.\{minornonpre\}//g;
 
         ${$patharrayref}[$i] = $line;
     }
diff --git a/solenv/bin/receditor b/solenv/bin/receditor
index 1b4046010485..d0549c6c79ab 100755
--- a/solenv/bin/receditor
+++ b/solenv/bin/receditor
@@ -3,4 +3,4 @@ if [ x${SOLARENV}x = xx ]; then
     echo No environment found, please use 'configure' or 'setsolar'
     exit 1
 fi
-exec java -DSOLARSRC=${SOLARSRC} -DWORK_STAMP=${WORK_STAMP} -jar ${SOLARVER}/${INPATH}/bin${UPDMINOREXT}/receditor.jar
+exec java -DSOLARSRC=${SOLARSRC} -DWORK_STAMP=${WORK_STAMP} -jar ${SOLARVER}/${INPATH}/bin/receditor.jar
-- 
cgit