[Libreoffice-commits] .: 4 commits - set_soenv.in solenv/bin solenv/inc
Tor Lillqvist
tml at kemper.freedesktop.org
Sat Dec 10 17:38:54 PST 2011
set_soenv.in | 11 -
solenv/bin/deliver.pl | 1
solenv/bin/make_installer.pl | 11 -
solenv/bin/modules/installer/control.pm | 174 -----------------------
solenv/bin/modules/installer/followme.pm | 1
solenv/bin/modules/installer/windows/property.pm | 3
solenv/bin/modules/installer/worker.pm | 40 -----
solenv/inc/_tg_shl.mk | 90 -----------
solenv/inc/installationtest.mk | 4
solenv/inc/settings.mk | 3
solenv/inc/target.mk | 2
solenv/inc/tg_java.mk | 2
solenv/inc/tg_shl.mk | 9 -
solenv/inc/wntmsc.mk | 4
14 files changed, 13 insertions(+), 342 deletions(-)
New commits:
commit 803d1ee787c9742eedf14681cbf61a0ae42dcb29
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Sun Dec 11 03:37:02 2011 +0200
Drop Hamburg RE updatepack stuff that we have no clue about anyway
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 4142561..2bfdac8 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -134,8 +134,6 @@ installer::parameter::control_required_parameter();
if (!($installer::globals::languages_defined_in_productlist)) { installer::languages::analyze_languagelist(); }
installer::parameter::outputparameter();
-installer::control::check_updatepack();
-
$installer::globals::build = uc($installer::globals::build); # using "SRC680" instead of "src680"
######################################
@@ -659,8 +657,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
$installer::globals::globalinfo_copied = 1;
my $logminor = "";
- if ( $installer::globals::updatepack ) { $logminor = $installer::globals::lastminor; }
- else { $logminor = $installer::globals::minor; }
+ $logminor = $installer::globals::minor;
my $loglanguagestring = $$languagestringref;
my $loglanguagestring_orig = $loglanguagestring;
@@ -690,12 +687,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
$installer::globals::exitlog = $loggingdir;
- ##############################################################
- # Determining the ship location, if this is an update pack
- ##############################################################
-
- if ( $installer::globals::updatepack ) { $shipinstalldir = installer::control::determine_ship_directory($languagestringref); }
-
###################################################################
# Reading an existing msi database, to prepare update and patch
###################################################################
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 72d76ef..b0824ef 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -390,180 +390,6 @@ sub check_logfile
}
#############################################################
-# Determining the ship installation directory
-#############################################################
-
-sub determine_ship_directory
-{
- my ($languagesref) = @_;
-
- if (!( $ENV{'SHIPDRIVE'} )) { installer::exiter::exit_program("ERROR: SHIPDRIVE must be set for updater!", "determine_ship_directory"); }
-
- my $shipdrive = $ENV{'SHIPDRIVE'};
-
- my $languagestring = $$languagesref;
-
- if (length($languagestring) > $installer::globals::max_lang_length )
- {
- my $number_of_languages = installer::systemactions::get_number_of_langs($languagestring);
- chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ .*//g"`);
- my $id = substr($shorter, 0, 8); # taking only the first 8 digits
- $languagestring = "lang_" . $number_of_languages . "_id_" . $id;
- }
-
- my $productstring = $installer::globals::product;
- my $productsubdir = "";
-
- if ( $productstring =~ /^\s*(.+?)\_\_(.+?)\s*$/ )
- {
- $productstring = $1;
- $productsubdir = $2;
- }
-
- if ( $installer::globals::languagepack ) { $productstring = $productstring . "_languagepack"; }
- if ( $installer::globals::helppack ) { $productstring = $productstring . "_helppack"; }
- if ( $installer::globals::patch ) { $productstring = $productstring . "_patch"; }
-
- my $destdir = $shipdrive . $installer::globals::separator . $installer::globals::compiler .
- $installer::globals::productextension . $installer::globals::separator .
- $productstring . $installer::globals::separator;
-
- if ( $productsubdir ) { $destdir = $destdir . $productsubdir . $installer::globals::separator; }
-
- $destdir = $destdir . $installer::globals::installertypedir . $installer::globals::separator .
- $installer::globals::build . "_" . $installer::globals::lastminor . "_" .
- "native_inprogress-number_" . $languagestring . "\." . $installer::globals::buildid;
-
- my $infoline = "\nSetting ship directory: $destdir\n";
- push(@installer::globals::globallogfileinfo, $infoline);
-
- return $destdir;
-}
-
-#############################################################
-# Controlling if this is an official RE pack process
-#############################################################
-
-sub check_updatepack
-{
- my $shipdrive = "";
- my $filename = "";
- my $infoline = "";
-
- # the environment variable UPDATER was always set
- {
- $infoline = "\nEnvironment variable UPDATER set\n";
- push(@installer::globals::globallogfileinfo, $infoline);
-
- # There are no CWSes any more, no environment variable CWS_WORK_STAMP
- {
- if ( $ENV{'SHIPDRIVE'} ) # the environment variable SHIPDRIVE must be set
- {
- $shipdrive = $ENV{'SHIPDRIVE'};
- $infoline = "Ship drive defined: $shipdrive\n";
- push(@installer::globals::globallogfileinfo, $infoline);
-
- if ( -d $shipdrive ) # SHIPDRIVE must be a directory
- {
- $infoline = "Ship drive exists\n";
- push(@installer::globals::globallogfileinfo, $infoline);
-
- # try to write into $shipdrive
-
- $directory = $installer::globals::product . "_" . $installer::globals::compiler . "_" . $installer::globals::buildid . "_" . $installer::globals::languageproducts[0] . "_test_$$";
- $directory =~ s/\,/\_/g; # for the list of languages
- $directory =~ s/\-/\_/g; # for en-US, pt-BR, ...
- $directory = $shipdrive . $installer::globals::separator . $directory;
-
- $infoline = "Try to create directory: $directory\n";
- push(@installer::globals::globallogfileinfo, $infoline);
-
- # saving this directory for later removal
- $installer::globals::shiptestdirectory = $directory;
-
- if ( installer::systemactions::try_to_create_directory($directory))
- {
- $infoline = "Write access on Ship drive\n";
- push(@installer::globals::globallogfileinfo, $infoline);
- $infoline = "Ship test directory $installer::globals::shiptestdirectory was successfully created\n";
- push(@installer::globals::globallogfileinfo, $infoline);
- my $systemcall = "rmdir $directory";
- my $returnvalue = system($systemcall);
-
- # 5th condition: No local build environment.
- # In this case the content of SOLARENV starts with the content of SOL_TMP
-
- my $solarenv = "";
- my $sol_tmp;
- if ( $ENV{'SOLARENV'} ) { $solarenv = $ENV{'SOLARENV'}; }
-
- $infoline = "Environment variable SOLARENV: $solarenv\n";
- push(@installer::globals::globallogfileinfo, $infoline);
-
- if ( $ENV{'SOL_TMP'} )
- {
- $sol_tmp = $ENV{'SOL_TMP'};
- $infoline = "Environment variable SOL_TMP: $sol_tmp\n";
- } else {
- $infoline = "Environment variable SOL_TMP not set\n";
- }
- push(@installer::globals::globallogfileinfo, $infoline);
-
- if ( defined $sol_tmp && ( $solarenv =~ /^\s*\Q$sol_tmp\E/ ))
- {
- $infoline = "Content of SOLARENV starts with the content of SOL_TMP\: Local environment -\> No Updatepack\n";
- push(@installer::globals::globallogfileinfo, $infoline);
- }
- else
- {
- $infoline = "Content of SOLARENV does not start with the content of SOL_TMP: No local environment\n";
- push(@installer::globals::globallogfileinfo, $infoline);
-
- $installer::globals::updatepack = 1; # That's it
- }
-
- # Additional logging information for the temporary ship directory
-
- if ( -d $installer::globals::shiptestdirectory )
- {
- $infoline = "Ship test directory $installer::globals::shiptestdirectory still exists. Trying removal later again.\n";
- push(@installer::globals::globallogfileinfo, $infoline);
- }
- else
- {
- $infoline = "Ship test directory $installer::globals::shiptestdirectory was successfully removed.\n";
- push(@installer::globals::globallogfileinfo, $infoline);
- }
- }
- else
- {
- $infoline = "No write access on Ship drive\n";
- push(@installer::globals::globallogfileinfo, $infoline);
- $infoline = "Failed to create directory $directory\n";
- push(@installer::globals::globallogfileinfo, $infoline);
- }
- }
- else
- {
- $infoline = "Ship drive not found: No updatepack\n";
- push(@installer::globals::globallogfileinfo, $infoline);
- }
- }
- else
- {
- $infoline = "Environment variable SHIPDRIVE not set: No updatepack\n";
- push(@installer::globals::globallogfileinfo, $infoline);
- }
- }
- }
-
- if ( $installer::globals::updatepack ) { $infoline = "Setting updatepack true\n\n"; }
- else { $infoline = "\nNo updatepack\n"; }
- push(@installer::globals::globallogfileinfo, $infoline);
-
-}
-
-#############################################################
# Reading the Windows list file for language encodings
#############################################################
diff --git a/solenv/bin/modules/installer/followme.pm b/solenv/bin/modules/installer/followme.pm
index f7b1890..f36b8e9 100644
--- a/solenv/bin/modules/installer/followme.pm
+++ b/solenv/bin/modules/installer/followme.pm
@@ -44,7 +44,6 @@ sub save_followme_info
my ($finalinstalldir, $includepatharrayref, $allvariableshashref, $downloadname, $languagestringref, $languagesarrayref, $current_install_number, $loggingdir, $installlogdir) = @_;
my $downloadinfofilename = $installer::globals::logfilename;
- if ( $installer::globals::updatepack ) { $downloadinfofilename =~ s/log_/log_$current_install_number\_/; }
$downloadinfofilename =~ s/log_/follow_me_/;
# Creating directory
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index 1e6e921..6319276 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -69,8 +69,7 @@ sub get_arpcomments_for_property_table
$comment = $comment . " ($languagestring)";
my $localminor = "";
- if ( $installer::globals::updatepack ) { $localminor = $installer::globals::lastminor; }
- else { $localminor = $installer::globals::minor; }
+ $localminor = $installer::globals::minor;
my $buildidstring = "(" . $installer::globals::build . $localminor . "(Build:" . $installer::globals::buildid . "))";
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index a7da80f..7959274 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -373,23 +373,12 @@ sub create_installation_directory
my $languageref = $languagestringref;
- if ( $installer::globals::updatepack )
- {
- $installdir = $shipinstalldir;
- installer::systemactions::create_directory_structure($installdir);
- $$current_install_number_ref = installer::systemactions::determine_maximum_number($installdir, $languageref);
- $installdir = installer::systemactions::rename_string_in_directory($installdir, "number", $$current_install_number_ref);
- remove_old_ship_installation_sets($installdir);
- }
- else
- {
- $installdir = installer::systemactions::create_directories("install", $languageref);
- installer::logger::print_message( "... creating installation set in $installdir ...\n" );
- remove_old_installation_sets($installdir);
- my $inprogressinstalldir = $installdir . "_inprogress";
- installer::systemactions::rename_directory($installdir, $inprogressinstalldir);
- $installdir = $inprogressinstalldir;
- }
+ $installdir = installer::systemactions::create_directories("install", $languageref);
+ installer::logger::print_message( "... creating installation set in $installdir ...\n" );
+ remove_old_installation_sets($installdir);
+ my $inprogressinstalldir = $installdir . "_inprogress";
+ installer::systemactions::rename_directory($installdir, $inprogressinstalldir);
+ $installdir = $inprogressinstalldir;
$installer::globals::saveinstalldir = $installdir; # saving directory globally, in case of exiting
@@ -431,20 +420,7 @@ sub analyze_and_save_logfile
{
my $destdir = "";
- if ( $installer::globals::updatepack )
- {
- if ( $installdir =~ /_download_inprogress/ ) { $destdir = installer::systemactions::rename_string_in_directory($installdir, "_download_inprogress", "_download"); }
- elsif ( $installdir =~ /_msp_inprogress/ ) { $destdir = installer::systemactions::rename_string_in_directory($installdir, "_msp_inprogress", "_msp"); }
- else
- {
- if ( $installdir =~ /_packed/ ) { $destdir = installer::systemactions::rename_string_in_directory($installdir, "_inprogress", ""); }
- else { $destdir = installer::systemactions::rename_string_in_directory($installdir, "_inprogress", "_packed"); }
- }
- }
- else
- {
- $destdir = installer::systemactions::rename_string_in_directory($installdir, "_inprogress", "");
- }
+ $destdir = installer::systemactions::rename_string_in_directory($installdir, "_inprogress", "");
$finalinstalldir = $destdir;
}
@@ -452,7 +428,6 @@ sub analyze_and_save_logfile
# Saving the logfile in the log file directory and additionally in a log directory in the install directory
my $numberedlogfilename = $installer::globals::logfilename;
- if ( $installer::globals::updatepack ) { $numberedlogfilename =~ s /log_/log_$current_install_number\_/; }
installer::logger::print_message( "... creating log file $numberedlogfilename \n" );
installer::files::save_file($loggingdir . $numberedlogfilename, \@installer::globals::logfileinfo);
installer::files::save_file($installlogdir . $installer::globals::separator . $numberedlogfilename, \@installer::globals::logfileinfo);
@@ -484,7 +459,6 @@ sub save_logfile_after_linking
# Saving the logfile in the log file directory and additionally in a log directory in the install directory
my $numberedlogfilename = $installer::globals::logfilename;
- if ( $installer::globals::updatepack ) { $numberedlogfilename =~ s /log_/log_$current_install_number\_/; }
installer::logger::print_message( "... creating log file $numberedlogfilename \n" );
installer::files::save_file($loggingdir . $numberedlogfilename, \@installer::globals::logfileinfo);
installer::files::save_file($installlogdir . $installer::globals::separator . $numberedlogfilename, \@installer::globals::logfileinfo);
commit 7ab121c2524f1378438b73aea077f37dca00ca16
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Sun Dec 11 03:25:12 2011 +0200
UPDATER, whatever it means, was fixed at YES, so factor out
diff --git a/set_soenv.in b/set_soenv.in
index 9671c6c..3233417 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -46,7 +46,7 @@ my ( $oldoutfile, $outfile, $bootfile, $newline, $comment,
#
# Platform independent constant values.
my ( $SOLAR_JAVA,
- $UPDATER, $VCL,
+ $VCL,
$CC, $CXX);
#
# Platform dependent constant values.
@@ -165,7 +165,6 @@ chomp( $oldPATH ); # cut off new line
# Setting platform independent constant values.
# NB: Language options now set at 'ToFile' stage.
$SOLAR_JAVA = "@SOLAR_JAVA@";
-$UPDATER = "YES";
$VCL = "TRUE";
$comment = "#"; # UNIX script comment character
$TARFILE_LOCATION = "@TARFILE_LOCATION@"; # where to find tarballs with external sources
@@ -1430,7 +1429,6 @@ ToFile( "OOODMAKEMODE", "YES", "e" );
ToFile( "PRODUCTVERSION", "@PRODUCTVERSION@", "e" );
ToFile( "WITH_POOR_HELP_LOCALIZATIONS", $WITH_POOR_HELP_LOCALIZATIONS, "e" );
-ToFile( "UPDATER", $UPDATER, "e" );
ToFile( "VCL", $VCL, "e" );
if ("@ENABLE_DEBUG@" eq "TRUE") {
ToFile( "debug", "true", "e" );
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 58664e3..05c4540 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -438,7 +438,6 @@ sub init_globals
my $common_outdir = $ENV{'COMMON_OUTDIR'};
my $inpath = $ENV{'INPATH'};
my $solarversion = $ENV{'SOLARVERSION'};
- my $updater = $ENV{'UPDATER'};
my $work_stamp = $ENV{'WORK_STAMP'};
# do we have a valid environment?
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 0234b7c..72d76ef 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -450,7 +450,7 @@ sub check_updatepack
my $filename = "";
my $infoline = "";
- if ( $ENV{'UPDATER'} ) # the environment variable UPDATER has to be set
+ # the environment variable UPDATER was always set
{
$infoline = "\nEnvironment variable UPDATER set\n";
push(@installer::globals::globallogfileinfo, $infoline);
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index 91ac861..e666042 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -29,13 +29,11 @@ SHL1DEF*=$(MISC)/$(SHL1TARGET).def
.ENDIF # "$(SHL1USE_EXPORTS)"==""
EXTRALIBPATHS1=$(EXTRALIBPATHS)
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL1NOCHECK)"==""
.IF "$(SOLAR_STLLIBPATH)"!=""
EXTRALIBPATHS1+=-L$(SOLAR_STLLIBPATH)
.ENDIF
.ENDIF # "$(SHL1NOCHECK)"!=""
-.ENDIF
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -448,11 +446,9 @@ $(SHL1TARGETN) : \
@echo "Making: " $(@:f).jnilib
@macosx-create-bundle $@
.ENDIF # "$(SHL1CREATEJNILIB)"!=""
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL1NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN)
.ENDIF # "$(SHL1NOCHECK)"!=""
-.ENDIF
.ELIF "$(OS)"=="IOS"
$(COMMAND_ECHO)$(AR) $(LIB1FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL1OBJS)) $(shell cat /dev/null $(LIB1TARGET) $(SHL1LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
$(COMMAND_ECHO)$(RANLIB) $@
@@ -466,7 +462,6 @@ $(SHL1TARGETN) : \
@cat $(MISC)/$(TARGET).$(@:b)_1.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_1.cmd
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL1NOCHECK)"==""
$(COMMAND_ECHO)-$(RM) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
$(COMMAND_ECHO)$(RENAME) $(SHL1TARGETN) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
@@ -476,7 +471,6 @@ $(SHL1TARGETN) : \
$(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) -- -s $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
.ENDIF
.ENDIF # "$(SHL1NOCHECK)"!=""
-.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
$(COMMAND_ECHO)$(RM) $(LB)/$(SHL1TARGETN:b)
@@ -520,13 +514,11 @@ SHL2DEF*=$(MISC)/$(SHL2TARGET).def
.ENDIF # "$(SHL2USE_EXPORTS)"==""
EXTRALIBPATHS2=$(EXTRALIBPATHS)
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL2NOCHECK)"==""
.IF "$(SOLAR_STLLIBPATH)"!=""
EXTRALIBPATHS2+=-L$(SOLAR_STLLIBPATH)
.ENDIF
.ENDIF # "$(SHL2NOCHECK)"!=""
-.ENDIF
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -939,11 +931,9 @@ $(SHL2TARGETN) : \
@echo "Making: " $(@:f).jnilib
@macosx-create-bundle $@
.ENDIF # "$(SHL2CREATEJNILIB)"!=""
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL2NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN)
.ENDIF # "$(SHL2NOCHECK)"!=""
-.ENDIF
.ELIF "$(OS)"=="IOS"
$(COMMAND_ECHO)$(AR) $(LIB2FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL2OBJS)) $(shell cat /dev/null $(LIB2TARGET) $(SHL2LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
$(COMMAND_ECHO)$(RANLIB) $@
@@ -957,7 +947,6 @@ $(SHL2TARGETN) : \
@cat $(MISC)/$(TARGET).$(@:b)_2.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_2.cmd
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL2NOCHECK)"==""
$(COMMAND_ECHO)-$(RM) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
$(COMMAND_ECHO)$(RENAME) $(SHL2TARGETN) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
@@ -967,7 +956,6 @@ $(SHL2TARGETN) : \
$(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) -- -s $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
.ENDIF
.ENDIF # "$(SHL2NOCHECK)"!=""
-.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
$(COMMAND_ECHO)$(RM) $(LB)/$(SHL2TARGETN:b)
@@ -1011,13 +999,11 @@ SHL3DEF*=$(MISC)/$(SHL3TARGET).def
.ENDIF # "$(SHL3USE_EXPORTS)"==""
EXTRALIBPATHS3=$(EXTRALIBPATHS)
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL3NOCHECK)"==""
.IF "$(SOLAR_STLLIBPATH)"!=""
EXTRALIBPATHS3+=-L$(SOLAR_STLLIBPATH)
.ENDIF
.ENDIF # "$(SHL3NOCHECK)"!=""
-.ENDIF
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -1430,11 +1416,9 @@ $(SHL3TARGETN) : \
@echo "Making: " $(@:f).jnilib
@macosx-create-bundle $@
.ENDIF # "$(SHL3CREATEJNILIB)"!=""
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL3NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN)
.ENDIF # "$(SHL3NOCHECK)"!=""
-.ENDIF
.ELIF "$(OS)"=="IOS"
$(COMMAND_ECHO)$(AR) $(LIB3FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL3OBJS)) $(shell cat /dev/null $(LIB3TARGET) $(SHL3LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
$(COMMAND_ECHO)$(RANLIB) $@
@@ -1448,7 +1432,6 @@ $(SHL3TARGETN) : \
@cat $(MISC)/$(TARGET).$(@:b)_3.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_3.cmd
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL3NOCHECK)"==""
$(COMMAND_ECHO)-$(RM) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
$(COMMAND_ECHO)$(RENAME) $(SHL3TARGETN) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
@@ -1458,7 +1441,6 @@ $(SHL3TARGETN) : \
$(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) -- -s $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
.ENDIF
.ENDIF # "$(SHL3NOCHECK)"!=""
-.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
$(COMMAND_ECHO)$(RM) $(LB)/$(SHL3TARGETN:b)
@@ -1502,13 +1484,11 @@ SHL4DEF*=$(MISC)/$(SHL4TARGET).def
.ENDIF # "$(SHL4USE_EXPORTS)"==""
EXTRALIBPATHS4=$(EXTRALIBPATHS)
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL4NOCHECK)"==""
.IF "$(SOLAR_STLLIBPATH)"!=""
EXTRALIBPATHS4+=-L$(SOLAR_STLLIBPATH)
.ENDIF
.ENDIF # "$(SHL4NOCHECK)"!=""
-.ENDIF
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -1921,11 +1901,9 @@ $(SHL4TARGETN) : \
@echo "Making: " $(@:f).jnilib
@macosx-create-bundle $@
.ENDIF # "$(SHL4CREATEJNILIB)"!=""
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL4NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN)
.ENDIF # "$(SHL4NOCHECK)"!=""
-.ENDIF
.ELIF "$(OS)"=="IOS"
$(COMMAND_ECHO)$(AR) $(LIB4FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL4OBJS)) $(shell cat /dev/null $(LIB4TARGET) $(SHL4LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
$(COMMAND_ECHO)$(RANLIB) $@
@@ -1939,7 +1917,6 @@ $(SHL4TARGETN) : \
@cat $(MISC)/$(TARGET).$(@:b)_4.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_4.cmd
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL4NOCHECK)"==""
$(COMMAND_ECHO)-$(RM) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
$(COMMAND_ECHO)$(RENAME) $(SHL4TARGETN) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
@@ -1949,7 +1926,6 @@ $(SHL4TARGETN) : \
$(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) -- -s $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
.ENDIF
.ENDIF # "$(SHL4NOCHECK)"!=""
-.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
$(COMMAND_ECHO)$(RM) $(LB)/$(SHL4TARGETN:b)
@@ -1993,13 +1969,11 @@ SHL5DEF*=$(MISC)/$(SHL5TARGET).def
.ENDIF # "$(SHL5USE_EXPORTS)"==""
EXTRALIBPATHS5=$(EXTRALIBPATHS)
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL5NOCHECK)"==""
.IF "$(SOLAR_STLLIBPATH)"!=""
EXTRALIBPATHS5+=-L$(SOLAR_STLLIBPATH)
.ENDIF
.ENDIF # "$(SHL5NOCHECK)"!=""
-.ENDIF
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -2412,11 +2386,9 @@ $(SHL5TARGETN) : \
@echo "Making: " $(@:f).jnilib
@macosx-create-bundle $@
.ENDIF # "$(SHL5CREATEJNILIB)"!=""
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL5NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN)
.ENDIF # "$(SHL5NOCHECK)"!=""
-.ENDIF
.ELIF "$(OS)"=="IOS"
$(COMMAND_ECHO)$(AR) $(LIB5FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL5OBJS)) $(shell cat /dev/null $(LIB5TARGET) $(SHL5LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
$(COMMAND_ECHO)$(RANLIB) $@
@@ -2430,7 +2402,6 @@ $(SHL5TARGETN) : \
@cat $(MISC)/$(TARGET).$(@:b)_5.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_5.cmd
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL5NOCHECK)"==""
$(COMMAND_ECHO)-$(RM) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
$(COMMAND_ECHO)$(RENAME) $(SHL5TARGETN) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
@@ -2440,7 +2411,6 @@ $(SHL5TARGETN) : \
$(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) -- -s $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
.ENDIF
.ENDIF # "$(SHL5NOCHECK)"!=""
-.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
$(COMMAND_ECHO)$(RM) $(LB)/$(SHL5TARGETN:b)
@@ -2484,13 +2454,11 @@ SHL6DEF*=$(MISC)/$(SHL6TARGET).def
.ENDIF # "$(SHL6USE_EXPORTS)"==""
EXTRALIBPATHS6=$(EXTRALIBPATHS)
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL6NOCHECK)"==""
.IF "$(SOLAR_STLLIBPATH)"!=""
EXTRALIBPATHS6+=-L$(SOLAR_STLLIBPATH)
.ENDIF
.ENDIF # "$(SHL6NOCHECK)"!=""
-.ENDIF
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -2903,11 +2871,9 @@ $(SHL6TARGETN) : \
@echo "Making: " $(@:f).jnilib
@macosx-create-bundle $@
.ENDIF # "$(SHL6CREATEJNILIB)"!=""
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL6NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN)
.ENDIF # "$(SHL6NOCHECK)"!=""
-.ENDIF
.ELIF "$(OS)"=="IOS"
$(COMMAND_ECHO)$(AR) $(LIB6FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL6OBJS)) $(shell cat /dev/null $(LIB6TARGET) $(SHL6LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
$(COMMAND_ECHO)$(RANLIB) $@
@@ -2921,7 +2887,6 @@ $(SHL6TARGETN) : \
@cat $(MISC)/$(TARGET).$(@:b)_6.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_6.cmd
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL6NOCHECK)"==""
$(COMMAND_ECHO)-$(RM) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
$(COMMAND_ECHO)$(RENAME) $(SHL6TARGETN) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
@@ -2931,7 +2896,6 @@ $(SHL6TARGETN) : \
$(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) -- -s $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
.ENDIF
.ENDIF # "$(SHL6NOCHECK)"!=""
-.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
$(COMMAND_ECHO)$(RM) $(LB)/$(SHL6TARGETN:b)
@@ -2975,13 +2939,11 @@ SHL7DEF*=$(MISC)/$(SHL7TARGET).def
.ENDIF # "$(SHL7USE_EXPORTS)"==""
EXTRALIBPATHS7=$(EXTRALIBPATHS)
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL7NOCHECK)"==""
.IF "$(SOLAR_STLLIBPATH)"!=""
EXTRALIBPATHS7+=-L$(SOLAR_STLLIBPATH)
.ENDIF
.ENDIF # "$(SHL7NOCHECK)"!=""
-.ENDIF
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -3394,11 +3356,9 @@ $(SHL7TARGETN) : \
@echo "Making: " $(@:f).jnilib
@macosx-create-bundle $@
.ENDIF # "$(SHL7CREATEJNILIB)"!=""
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL7NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN)
.ENDIF # "$(SHL7NOCHECK)"!=""
-.ENDIF
.ELIF "$(OS)"=="IOS"
$(COMMAND_ECHO)$(AR) $(LIB7FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL7OBJS)) $(shell cat /dev/null $(LIB7TARGET) $(SHL7LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
$(COMMAND_ECHO)$(RANLIB) $@
@@ -3412,7 +3372,6 @@ $(SHL7TARGETN) : \
@cat $(MISC)/$(TARGET).$(@:b)_7.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_7.cmd
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL7NOCHECK)"==""
$(COMMAND_ECHO)-$(RM) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
$(COMMAND_ECHO)$(RENAME) $(SHL7TARGETN) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
@@ -3422,7 +3381,6 @@ $(SHL7TARGETN) : \
$(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) -- -s $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
.ENDIF
.ENDIF # "$(SHL7NOCHECK)"!=""
-.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
$(COMMAND_ECHO)$(RM) $(LB)/$(SHL7TARGETN:b)
@@ -3466,13 +3424,11 @@ SHL8DEF*=$(MISC)/$(SHL8TARGET).def
.ENDIF # "$(SHL8USE_EXPORTS)"==""
EXTRALIBPATHS8=$(EXTRALIBPATHS)
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL8NOCHECK)"==""
.IF "$(SOLAR_STLLIBPATH)"!=""
EXTRALIBPATHS8+=-L$(SOLAR_STLLIBPATH)
.ENDIF
.ENDIF # "$(SHL8NOCHECK)"!=""
-.ENDIF
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -3885,11 +3841,9 @@ $(SHL8TARGETN) : \
@echo "Making: " $(@:f).jnilib
@macosx-create-bundle $@
.ENDIF # "$(SHL8CREATEJNILIB)"!=""
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL8NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN)
.ENDIF # "$(SHL8NOCHECK)"!=""
-.ENDIF
.ELIF "$(OS)"=="IOS"
$(COMMAND_ECHO)$(AR) $(LIB8FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL8OBJS)) $(shell cat /dev/null $(LIB8TARGET) $(SHL8LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
$(COMMAND_ECHO)$(RANLIB) $@
@@ -3903,7 +3857,6 @@ $(SHL8TARGETN) : \
@cat $(MISC)/$(TARGET).$(@:b)_8.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_8.cmd
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL8NOCHECK)"==""
$(COMMAND_ECHO)-$(RM) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
$(COMMAND_ECHO)$(RENAME) $(SHL8TARGETN) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
@@ -3913,7 +3866,6 @@ $(SHL8TARGETN) : \
$(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) -- -s $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
.ENDIF
.ENDIF # "$(SHL8NOCHECK)"!=""
-.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
$(COMMAND_ECHO)$(RM) $(LB)/$(SHL8TARGETN:b)
@@ -3957,13 +3909,11 @@ SHL9DEF*=$(MISC)/$(SHL9TARGET).def
.ENDIF # "$(SHL9USE_EXPORTS)"==""
EXTRALIBPATHS9=$(EXTRALIBPATHS)
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL9NOCHECK)"==""
.IF "$(SOLAR_STLLIBPATH)"!=""
EXTRALIBPATHS9+=-L$(SOLAR_STLLIBPATH)
.ENDIF
.ENDIF # "$(SHL9NOCHECK)"!=""
-.ENDIF
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -4376,11 +4326,9 @@ $(SHL9TARGETN) : \
@echo "Making: " $(@:f).jnilib
@macosx-create-bundle $@
.ENDIF # "$(SHL9CREATEJNILIB)"!=""
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL9NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN)
.ENDIF # "$(SHL9NOCHECK)"!=""
-.ENDIF
.ELIF "$(OS)"=="IOS"
$(COMMAND_ECHO)$(AR) $(LIB9FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL9OBJS)) $(shell cat /dev/null $(LIB9TARGET) $(SHL9LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
$(COMMAND_ECHO)$(RANLIB) $@
@@ -4394,7 +4342,6 @@ $(SHL9TARGETN) : \
@cat $(MISC)/$(TARGET).$(@:b)_9.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_9.cmd
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL9NOCHECK)"==""
$(COMMAND_ECHO)-$(RM) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
$(COMMAND_ECHO)$(RENAME) $(SHL9TARGETN) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
@@ -4404,7 +4351,6 @@ $(SHL9TARGETN) : \
$(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) -- -s $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
.ENDIF
.ENDIF # "$(SHL9NOCHECK)"!=""
-.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
$(COMMAND_ECHO)$(RM) $(LB)/$(SHL9TARGETN:b)
@@ -4448,13 +4394,11 @@ SHL10DEF*=$(MISC)/$(SHL10TARGET).def
.ENDIF # "$(SHL10USE_EXPORTS)"==""
EXTRALIBPATHS10=$(EXTRALIBPATHS)
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL10NOCHECK)"==""
.IF "$(SOLAR_STLLIBPATH)"!=""
EXTRALIBPATHS10+=-L$(SOLAR_STLLIBPATH)
.ENDIF
.ENDIF # "$(SHL10NOCHECK)"!=""
-.ENDIF
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -4867,11 +4811,9 @@ $(SHL10TARGETN) : \
@echo "Making: " $(@:f).jnilib
@macosx-create-bundle $@
.ENDIF # "$(SHL10CREATEJNILIB)"!=""
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL10NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN)
.ENDIF # "$(SHL10NOCHECK)"!=""
-.ENDIF
.ELIF "$(OS)"=="IOS"
$(COMMAND_ECHO)$(AR) $(LIB10FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL10OBJS)) $(shell cat /dev/null $(LIB10TARGET) $(SHL10LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
$(COMMAND_ECHO)$(RANLIB) $@
@@ -4885,7 +4827,6 @@ $(SHL10TARGETN) : \
@cat $(MISC)/$(TARGET).$(@:b)_10.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_10.cmd
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL10NOCHECK)"==""
$(COMMAND_ECHO)-$(RM) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
$(COMMAND_ECHO)$(RENAME) $(SHL10TARGETN) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
@@ -4895,7 +4836,6 @@ $(SHL10TARGETN) : \
$(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) -- -s $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
.ENDIF
.ENDIF # "$(SHL10NOCHECK)"!=""
-.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
$(COMMAND_ECHO)$(RM) $(LB)/$(SHL10TARGETN:b)
@@ -4912,10 +4852,7 @@ $(SHL10TARGETN) : \
.IF "$(SHL1IMPLIBN)" != ""
-.IF "$(UPDATER)"=="YES"
USELIB1DEPN+=$(SHL1LIBS)
-.ELSE
-.ENDIF
.IF "$(USE_DEFFILE)"!=""
USE_SHL1TARGET=$(SHL1TARGETN)
@@ -4955,10 +4892,7 @@ $(SHL1IMPLIBN): \
.IF "$(SHL2IMPLIBN)" != ""
-.IF "$(UPDATER)"=="YES"
USELIB2DEPN+=$(SHL2LIBS)
-.ELSE
-.ENDIF
.IF "$(USE_DEFFILE)"!=""
USE_SHL2TARGET=$(SHL2TARGETN)
@@ -4998,10 +4932,7 @@ $(SHL2IMPLIBN): \
.IF "$(SHL3IMPLIBN)" != ""
-.IF "$(UPDATER)"=="YES"
USELIB3DEPN+=$(SHL3LIBS)
-.ELSE
-.ENDIF
.IF "$(USE_DEFFILE)"!=""
USE_SHL3TARGET=$(SHL3TARGETN)
@@ -5041,10 +4972,7 @@ $(SHL3IMPLIBN): \
.IF "$(SHL4IMPLIBN)" != ""
-.IF "$(UPDATER)"=="YES"
USELIB4DEPN+=$(SHL4LIBS)
-.ELSE
-.ENDIF
.IF "$(USE_DEFFILE)"!=""
USE_SHL4TARGET=$(SHL4TARGETN)
@@ -5084,10 +5012,7 @@ $(SHL4IMPLIBN): \
.IF "$(SHL5IMPLIBN)" != ""
-.IF "$(UPDATER)"=="YES"
USELIB5DEPN+=$(SHL5LIBS)
-.ELSE
-.ENDIF
.IF "$(USE_DEFFILE)"!=""
USE_SHL5TARGET=$(SHL5TARGETN)
@@ -5127,10 +5052,7 @@ $(SHL5IMPLIBN): \
.IF "$(SHL6IMPLIBN)" != ""
-.IF "$(UPDATER)"=="YES"
USELIB6DEPN+=$(SHL6LIBS)
-.ELSE
-.ENDIF
.IF "$(USE_DEFFILE)"!=""
USE_SHL6TARGET=$(SHL6TARGETN)
@@ -5170,10 +5092,7 @@ $(SHL6IMPLIBN): \
.IF "$(SHL7IMPLIBN)" != ""
-.IF "$(UPDATER)"=="YES"
USELIB7DEPN+=$(SHL7LIBS)
-.ELSE
-.ENDIF
.IF "$(USE_DEFFILE)"!=""
USE_SHL7TARGET=$(SHL7TARGETN)
@@ -5213,10 +5132,7 @@ $(SHL7IMPLIBN): \
.IF "$(SHL8IMPLIBN)" != ""
-.IF "$(UPDATER)"=="YES"
USELIB8DEPN+=$(SHL8LIBS)
-.ELSE
-.ENDIF
.IF "$(USE_DEFFILE)"!=""
USE_SHL8TARGET=$(SHL8TARGETN)
@@ -5256,10 +5172,7 @@ $(SHL8IMPLIBN): \
.IF "$(SHL9IMPLIBN)" != ""
-.IF "$(UPDATER)"=="YES"
USELIB9DEPN+=$(SHL9LIBS)
-.ELSE
-.ENDIF
.IF "$(USE_DEFFILE)"!=""
USE_SHL9TARGET=$(SHL9TARGETN)
@@ -5299,10 +5212,7 @@ $(SHL9IMPLIBN): \
.IF "$(SHL10IMPLIBN)" != ""
-.IF "$(UPDATER)"=="YES"
USELIB10DEPN+=$(SHL10LIBS)
-.ELSE
-.ENDIF
.IF "$(USE_DEFFILE)"!=""
USE_SHL10TARGET=$(SHL10TARGETN)
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
index cf88139..3c5cf32 100644
--- a/solenv/inc/installationtest.mk
+++ b/solenv/inc/installationtest.mk
@@ -45,10 +45,10 @@ my_file = file:///
my_file = file://
.END
-# The following conditional is an approximation of: UPDATER set to YES and
+# The following conditional is an approximation of:
# SHIPDRIVE set and either SOL_TMP not set or
# SOLARENV set to a pathname of which SOL_TMP is not a prefix:
-.IF "$(UPDATER)" == "YES" && "$(SHIPDRIVE)" != "" && \
+.IF "$(SHIPDRIVE)" != "" && \
"$(SOLARENV:s/$(SOL_TMP)//" == "$(SOLARENV)"
my_instsets = $(shell ls -dt \
$(SHIPDRIVE)/$(INPATH)/LibreOffice/archive/$(WORK_STAMP)_$(LAST_MINOR)_native_packed-*_$(defaultlangiso).$(BUILD))
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index c8adc34..592290d 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -47,8 +47,6 @@ force_dmake_to_error
PLATFORMID = $(RTL_OS:l)_$(RTL_ARCH:l)
EXTNAME*=$(EXTENSIONNAME)_in
-.IF "$(UPDATER)"!=""
-
.IF "$(SOURCEVERSION)"!="$(WORK_STAMP)"
.ERROR : ; @echo Forced error: minor.mk in solenv/inc does not match your version!
WRONG_SOURCEVERSION
@@ -59,7 +57,6 @@ WRONG_SOURCEVERSION
@@-$(MKDIRHIER) $(SOLARVERSION)/$(INPATH)/inc
@@$(COPY) $(SOLARENV)/inc/minor.mk $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk
@@$(TOUCH) $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg
-.ENDIF # "$(UPDATER)"!=""
# Force creation of $(SOLARVERSION)/$(INPATH)/inc/
# $(UPD)minor.mk could be empty as it's contents were already included from minor.mk
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 07a79f2..bdf8ca2 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -1372,7 +1372,6 @@ $(SCP_PRODUCT_TYPE):
$(TOUCH) $@
.IF "$(COMPVERMK)"!=""
-.IF "$(UPDATER)"!=""
.IF "$(COMPATH:s!\!/!)"!="$(COMPATH_STORED)"
COMPVERMK_PHONY:=.PHONY
.ENDIF # "$(COMPATH:s!\!/!)"!="$(COMPATH_STORED)"
@@ -1399,7 +1398,6 @@ COMPVTMP:=$(mktmp iii)
.ENDIF # "$(CCNUMVER)"!=""
.ENDIF # "$(COMPVERMK)"!=""
-.ENDIF # "$(UPDATER)"!=""
.IF "$(JAVAVERMK)"!=""
.IF "$(JAVALOCATION)"!="$(JAVA_HOME)"
diff --git a/solenv/inc/tg_java.mk b/solenv/inc/tg_java.mk
index 054dcc5..9893950 100644
--- a/solenv/inc/tg_java.mk
+++ b/solenv/inc/tg_java.mk
@@ -71,11 +71,9 @@ $(JAVATARGET) : $(JAVAFILES) $(JAVACLASSFILES)
.ENDIF # "$(javauno)"!=""
.ENDIF # "$(use_jdep)"!=""
.ENDIF # "$(JAVARESPONSE)"!=""
-.IF "$(UPDATER)"!=""
.IF "$(OS)$(CPU)"=="SOLARISS"
@@-find $(CLASSDIR) -type d -user $(USER) \! -perm -5 -print | xargs chmod a+r $$1
.ENDIF
-.ENDIF
@$(TOUCH) $@
.ENDIF # "$(JAVATARGET)"!=""
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index f28f55a..3686b19 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -58,13 +58,11 @@ SHL$(TNR)DEF*=$(MISC)/$(SHL$(TNR)TARGET).def
.ENDIF # "$(SHL$(TNR)USE_EXPORTS)"==""
EXTRALIBPATHS$(TNR)=$(EXTRALIBPATHS)
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL$(TNR)NOCHECK)"==""
.IF "$(SOLAR_STLLIBPATH)"!=""
EXTRALIBPATHS$(TNR)+=-L$(SOLAR_STLLIBPATH)
.ENDIF
.ENDIF # "$(SHL$(TNR)NOCHECK)"!=""
-.ENDIF
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -477,11 +475,9 @@ $(SHL$(TNR)TARGETN) : \
@echo "Making: " $(@:f).jnilib
@macosx-create-bundle $@
.ENDIF # "$(SHL$(TNR)CREATEJNILIB)"!=""
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL$(TNR)NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN)
.ENDIF # "$(SHL$(TNR)NOCHECK)"!=""
-.ENDIF
.ELIF "$(OS)"=="IOS"
$(COMMAND_ECHO)$(AR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL$(TNR)OBJS)) $(shell cat /dev/null $(LIB$(TNR)TARGET) $(SHL$(TNR)LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
$(COMMAND_ECHO)$(RANLIB) $@
@@ -495,7 +491,6 @@ $(SHL$(TNR)TARGETN) : \
@cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-.IF "$(UPDATER)"=="YES"
.IF "$(SHL$(TNR)NOCHECK)"==""
$(COMMAND_ECHO)-$(RM) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
$(COMMAND_ECHO)$(RENAME) $(SHL$(TNR)TARGETN) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
@@ -505,7 +500,6 @@ $(SHL$(TNR)TARGETN) : \
$(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) -- -s $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
.ENDIF
.ENDIF # "$(SHL$(TNR)NOCHECK)"!=""
-.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
$(COMMAND_ECHO)$(RM) $(LB)/$(SHL$(TNR)TARGETN:b)
@@ -529,10 +523,7 @@ $(SHL$(TNR)TARGETN) : \
.IF "$(SHL$(TNR)IMPLIBN)" != ""
-.IF "$(UPDATER)"=="YES"
USELIB$(TNR)DEPN+=$(SHL$(TNR)LIBS)
-.ELSE
-.ENDIF
.IF "$(USE_DEFFILE)"!=""
USE_SHL$(TNR)TARGET=$(SHL$(TNR)TARGETN)
commit 858423e99c0f348562dd9147bc07b9e353365585
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Sun Dec 11 03:07:32 2011 +0200
CALL_CDECL is always TRUE
diff --git a/set_soenv.in b/set_soenv.in
index 44528dc..9671c6c 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -45,8 +45,7 @@ my ( $oldoutfile, $outfile, $bootfile, $newline, $comment,
#-------------------------------------------------
#
# Platform independent constant values.
-my ( $CALL_CDECL,
- $SOLAR_JAVA,
+my ( $SOLAR_JAVA,
$UPDATER, $VCL,
$CC, $CXX);
#
@@ -165,7 +164,6 @@ chomp( $oldPATH ); # cut off new line
#
# Setting platform independent constant values.
# NB: Language options now set at 'ToFile' stage.
-$CALL_CDECL = "TRUE";
$SOLAR_JAVA = "@SOLAR_JAVA@";
$UPDATER = "YES";
$VCL = "TRUE";
@@ -1432,7 +1430,6 @@ ToFile( "OOODMAKEMODE", "YES", "e" );
ToFile( "PRODUCTVERSION", "@PRODUCTVERSION@", "e" );
ToFile( "WITH_POOR_HELP_LOCALIZATIONS", $WITH_POOR_HELP_LOCALIZATIONS, "e" );
-ToFile( "CALL_CDECL", $CALL_CDECL, "e" );
ToFile( "UPDATER", $UPDATER, "e" );
ToFile( "VCL", $VCL, "e" );
if ("@ENABLE_DEBUG@" eq "TRUE") {
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index a86b78b..f7b2dbe 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -124,11 +124,7 @@ CFLAGS_NO_EXCEPTIONS=
CDEFS+=-DBOOST_MEM_FN_ENABLE_CDECL
.ENDIF
-.IF "$(CALL_CDECL)"=="TRUE"
CFLAGSCALL=-Gd
-.ELSE # "$(CALL_CDECL)"=="TRUE"
-CFLAGSCALL=-Gz
-.ENDIF # "$(CALL_CDECL)"=="TRUE"
CFLAGSCC=$(ARCH_FLAGS)
.IF "$(DYNAMIC_CRT)"!=""
commit f92b52d1bbdc59b450d3024f94de3250d353661d
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Sun Dec 11 03:03:49 2011 +0200
COMMON_OUTDIR is always empty here anyway
diff --git a/set_soenv.in b/set_soenv.in
index 5042d88..44528dc 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -45,7 +45,7 @@ my ( $oldoutfile, $outfile, $bootfile, $newline, $comment,
#-------------------------------------------------
#
# Platform independent constant values.
-my ( $CALL_CDECL, $COMMON_OUTDIR,
+my ( $CALL_CDECL,
$SOLAR_JAVA,
$UPDATER, $VCL,
$CC, $CXX);
@@ -166,7 +166,6 @@ chomp( $oldPATH ); # cut off new line
# Setting platform independent constant values.
# NB: Language options now set at 'ToFile' stage.
$CALL_CDECL = "TRUE";
-$COMMON_OUTDIR = "";
$SOLAR_JAVA = "@SOLAR_JAVA@";
$UPDATER = "YES";
$VCL = "TRUE";
@@ -1434,7 +1433,6 @@ ToFile( "PRODUCTVERSION", "@PRODUCTVERSION@", "e" );
ToFile( "WITH_POOR_HELP_LOCALIZATIONS", $WITH_POOR_HELP_LOCALIZATIONS, "e" );
ToFile( "CALL_CDECL", $CALL_CDECL, "e" );
-ToFile( "COMMON_OUTDIR", $COMMON_OUTDIR, "e" );
ToFile( "UPDATER", $UPDATER, "e" );
ToFile( "VCL", $VCL, "e" );
if ("@ENABLE_DEBUG@" eq "TRUE") {
More information about the Libreoffice-commits
mailing list