summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--instsetoo_native/util/makefile.mk5
-rwxr-xr-xsolenv/bin/build.pl25
-rwxr-xr-xsolenv/bin/build_client.pl6
-rwxr-xr-xsolenv/bin/deliver.pl2
-rw-r--r--solenv/bin/modules/installer/control.pm10
-rw-r--r--solenv/bin/modules/installer/download.pm12
-rw-r--r--solenv/bin/modules/installer/scriptitems.pm3
-rw-r--r--solenv/bin/modules/installer/windows/msp.pm9
-rw-r--r--solenv/bin/modules/installer/windows/property.pm3
-rw-r--r--solenv/bin/modules/installer/worker.pm3
-rw-r--r--solenv/bin/modules/installer/ziplist.pm3
-rw-r--r--solenv/bin/modules/packager/work.pm11
-rw-r--r--solenv/gbuild/Deliver.mk3
-rw-r--r--solenv/inc/installationtest.mk4
-rw-r--r--solenv/inc/rules.mk4
-rw-r--r--solenv/inc/settings.mk4
-rw-r--r--solenv/inc/target.mk4
17 files changed, 20 insertions, 91 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 20cd85fe2b97..92be378811fc 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -42,12 +42,7 @@ PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$(SOLARLIBDIR)$
.ENDIF # "$(GUI)"=="WNT"
.EXPORT: PYTHONPATH
-.IF "$(CWS_WORK_STAMP)"=="" || "$(UPDATER)"!=""
ENABLE_DOWNLOADSETS*=TRUE
-.ENDIF # "$(CWS_WORK_STAMP)"=="" || "$(UPDATER)"!=""
-.IF "$(FORCE_DOWNLOADSETS)"!=""
-ENABLE_DOWNLOADSETS=TRUE
-.ENDIF # "$(FORCE_DOWNLOADSETS)"!=""
.EXPORT: ENABLE_DOWNLOADSETS
.EXPORT: LAST_MINOR
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 896d0095e4ac..cc53a5dcc477 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -248,7 +248,6 @@
exit 0;
}
get_module_and_buildlist_paths();
- provide_consistency() if (defined $ENV{CWS_WORK_STAMP} && defined($ENV{COMMON_ENV_TOOLS}));
$deliver_command .= ' -verbose' if ($html || $verbose);
$deliver_command .= ' '. $dlv_switch if ($dlv_switch);
@@ -2191,22 +2190,6 @@ sub modules_classify {
};
#
-# This procedure provides consistency for cws
-# and optimized build (ie in case of --with_branches, -all:prj_name
-# and -since switches)
-#
-sub provide_consistency {
- check_dir();
- foreach my $var_ref (\$build_all_cont, \$build_since) {
- if ($$var_ref) {
- return if (defined $module_paths{$$var_ref});
- print_error("Cannot find module '$$var_ref'", 9);
- return;
- };
- };
-};
-
-#
# Procedure clears up module for incompatible build
#
sub ensure_clear_module {
@@ -2359,7 +2342,7 @@ sub prepare_incompatible_build {
@modules_built = keys %$deps_hash;
%add_to_config = %$deps_hash;
if ($prepare) {
- if ((!(defined $ENV{UPDATER} && (!defined $ENV{CWS_WORK_STAMP}))) || (defined $ENV{CWS_WORK_STAMP})) {
+ if (!(defined $ENV{UPDATER})) {
$source_config->add_active_modules([keys %add_to_config], 0);
}
clear_delivered();
@@ -2570,9 +2553,8 @@ sub read_ssolar_vars {
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} $source_root $cws_name $pro $platform";
+ my $param = "-$ENV{WORK_STAMP} $source_root $pro $platform";
my $ss_command = "$perl $setsolar -file $tmp_file $param $nul";
if (system($ss_command)) {
unlink $tmp_file;
@@ -2720,8 +2702,7 @@ sub generate_html_file {
my $build_duration = get_time_line(time - $build_time);
my $temp_html_file = File::Temp::tmpnam($tmp_dir);
my $title;
- $title = $ENV{CWS_WORK_STAMP} . ': ' if (defined $ENV{CWS_WORK_STAMP});
- $title .= $ENV{INPATH};
+ $title = $ENV{INPATH};
die("Cannot open $temp_html_file") if (!open(HTML, ">$temp_html_file"));
print HTML '<html><head>';
print HTML '<TITLE id=MainTitle>' . $title . '</TITLE>';
diff --git a/solenv/bin/build_client.pl b/solenv/bin/build_client.pl
index f518f8198dcc..2b1bf1461e9a 100755
--- a/solenv/bin/build_client.pl
+++ b/solenv/bin/build_client.pl
@@ -357,11 +357,7 @@ sub do_job {
delete $ENV{$_} foreach (keys %ENV);
$ENV{$_} = $$solar_vars{$_} foreach (keys %$solar_vars);
print 'Workspace: ';
- if (defined $ENV{CWS_WORK_STAMP}) {
- print $ENV{CWS_WORK_STAMP};
- } else {
- print $ENV{SOLARSRC};
- };
+ print $ENV{SOLARSRC};
print "\nplatform: $ENV{INPATH} $^O";
print "\ndir: $job_hash{job_dir}\n";
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index c9f7a2d6f9af..aba400453c0e 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -120,7 +120,7 @@ if ($^O ne 'cygwin') { # iz59477 - cygwin needes a dot "." at the e
$tempcounter = 0;
# zip is default for RE master builds
-$opt_zip = 1 if ( defined($ENV{DELIVER_TO_ZIP}) && uc($ENV{DELIVER_TO_ZIP}) eq 'TRUE' && ! defined($ENV{CWS_WORK_STAMP}));
+$opt_zip = 1 if ( defined($ENV{DELIVER_TO_ZIP}) && uc($ENV{DELIVER_TO_ZIP}) eq 'TRUE');
$has_symlinks = 0; # system supports symlinks
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 3f6b43f563fb..def9869ba706 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -478,11 +478,8 @@ sub check_updatepack
$infoline = "\nEnvironment variable UPDATER set\n";
push(@installer::globals::globallogfileinfo, $infoline);
- if ( ! $ENV{'CWS_WORK_STAMP'} ) # the environment variable CWS_WORK_STAMP must not be set (set only in CWS)
+ # There are no CWSes any more, no environment variable CWS_WORK_STAMP
{
- $infoline = "Environment variable CWS_WORK_STAMP not set\n";
- push(@installer::globals::globallogfileinfo, $infoline);
-
if ( $ENV{'SHIPDRIVE'} ) # the environment variable SHIPDRIVE must be set
{
$shipdrive = $ENV{'SHIPDRIVE'};
@@ -584,11 +581,6 @@ sub check_updatepack
push(@installer::globals::globallogfileinfo, $infoline);
}
}
- else
- {
- $infoline = "Environment variable CWS_WORK_STAMP defined: No updatepack\n";
- push(@installer::globals::globallogfileinfo, $infoline);
- }
}
if ( $installer::globals::updatepack ) { $infoline = "Setting updatepack true\n\n"; }
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 604f7574cc95..a21fdad0bb62 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -490,11 +490,7 @@ sub get_download_version
my $devproduct = 0;
if (( $allvariables->{'DEVELOPMENTPRODUCT'} ) && ( $allvariables->{'DEVELOPMENTPRODUCT'} == 1 )) { $devproduct = 1; }
- my $cwsproduct = 0;
- # the environment variable CWS_WORK_STAMP is set only in CWS
- if ( $ENV{'CWS_WORK_STAMP'} ) { $cwsproduct = 1; }
-
- if (( $cwsproduct ) || ( $devproduct )) # use "DEV300m75"
+ if ( $devproduct ) # use "DEV300m75"
{
my $source = uc($installer::globals::build); # DEV300
my $localminor = "";
@@ -525,14 +521,10 @@ sub set_date_string
my $devproduct = 0;
if (( $allvariables->{'DEVELOPMENTPRODUCT'} ) && ( $allvariables->{'DEVELOPMENTPRODUCT'} == 1 )) { $devproduct = 1; }
- my $cwsproduct = 0;
- # the environment variable CWS_WORK_STAMP is set only in CWS
- if ( $ENV{'CWS_WORK_STAMP'} ) { $cwsproduct = 1; }
-
my $releasebuild = 1;
if (( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) && ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ne "" )) { $releasebuild = 0; }
- if (( ! $devproduct ) && ( ! $cwsproduct ) && ( ! $releasebuild ))
+ if (( ! $devproduct ) && ( ! $releasebuild ))
{
my @timearray = localtime(time);
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index bc7d9572d5e3..34f16ec0be64 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -810,9 +810,6 @@ sub replace_setup_variables
$buildidstring = substr($buildidstring, 0, -1);
}
- # the environment variable CWS_WORK_STAMP is set only in CWS
- if ( $ENV{'CWS_WORK_STAMP'} ) { $buildidstring = $buildidstring . "\[CWS\:" . $ENV{'CWS_WORK_STAMP'} . "\]"; }
-
if ( $localminor =~ /^\s*\w(\d+)\w*\s*$/ ) { $localminor = $1; }
my $updateid = $productname . "_" . $userdirproductversion . "_" . $$languagestringref;
diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm
index 7593c96a6ea8..c62e9923d5fb 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -524,7 +524,6 @@ sub set_mspfilename
my $hotfixaddon = "hotfix_";
$hotfixaddon = $hotfixaddon . $installer::globals::buildid;
my $cwsname = "";
- if ( $ENV{'CWS_WORK_STAMP'} ) { $hotfixaddon = $ENV{'CWS_WORK_STAMP'}; }
if ( $allvariables->{'OVERWRITE_CWSNAME'} ) { $hotfixaddon = $allvariables->{'OVERWRITE_CWSNAME'}; }
$databasename = $databasename . "_" . $hotfixaddon;
}
@@ -904,10 +903,6 @@ sub change_patchmetadata_table
my $displayaddon = "";
if ( $allvariables->{'PATCHDISPLAYADDON'} ) { $displayaddon = $allvariables->{'PATCHDISPLAYADDON'}; }
- my $cwsname = "";
- if ( $ENV{'CWS_WORK_STAMP'} ) { $cwsname = $ENV{'CWS_WORK_STAMP'}; }
- if (( $cwsname ne "" ) && ( $allvariables->{'OVERWRITE_CWSNAME'} )) { $cwsname = $allvariables->{'OVERWRITE_CWSNAME'}; }
-
my $patchsequence = get_patchsequence($allvariables);
if (( $allvariables->{'SERVICEPACK'} ) && ( $allvariables->{'SERVICEPACK'} == 1 ))
@@ -917,8 +912,8 @@ sub change_patchmetadata_table
}
else
{
- $displaynamevalue = $base . " Hotfix " . $cwsname . " " . $displayaddon . " " . $patchsequence . " Build: " . $installer::globals::buildid;
- $descriptionvalue = $base . " Hotfix " . $cwsname . " " . $displayaddon . " " . $patchsequence . " Build: " . $installer::globals::buildid;
+ $displaynamevalue = $base . " Hotfix " . $displayaddon . " " . $patchsequence . " Build: " . $installer::globals::buildid;
+ $descriptionvalue = $base . " Hotfix " . $displayaddon . " " . $patchsequence . " Build: " . $installer::globals::buildid;
$displaynamevalue =~ s/ / /g;
$descriptionvalue =~ s/ / /g;
$displaynamevalue =~ s/ / /g;
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index 5cfa674dd7c0..7a2bc5193d25 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -74,9 +74,6 @@ sub get_arpcomments_for_property_table
my $buildidstring = "(" . $installer::globals::build . $localminor . "(Build:" . $installer::globals::buildid . "))";
- # the environment variable CWS_WORK_STAMP is set only in CWS
- if ( $ENV{'CWS_WORK_STAMP'} ) { $buildidstring = $buildidstring . "\[CWS\:" . $ENV{'CWS_WORK_STAMP'} . "\]"; }
-
$comment = $comment . " " . $buildidstring;
return $comment;
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index d3b96d155e59..ada43720fc75 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -1611,9 +1611,6 @@ sub prepare_windows_patchfiles
if ( ! $allvariableshashref->{'WINDOWSPATCHLEVEL'} ) { installer::exiter::exit_program("ERROR: No Windows patch level defined in list file (WINDOWSPATCHLEVEL) !", "prepare_windows_patchfiles"); }
my $windowspatchlevel = $installer::globals::buildid;
- # the environment variable CWS_WORK_STAMP is set only in CWS
- if ( $ENV{'CWS_WORK_STAMP'} ) { $windowspatchlevel = $ENV{'CWS_WORK_STAMP'} . $windowspatchlevel; }
-
for ( my $i = 0; $i <= $#{$filesref}; $i++ )
{
my $onefile = ${$filesref}[$i];
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index d52e97bf4e87..f0ea1acaddc7 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -734,9 +734,6 @@ sub replace_variables_in_ziplist_variables
my $buildidstringcws = $installer::globals::build . $localminor . "(Build:" . $installer::globals::buildid . ")";
- # the environment variable CWS_WORK_STAMP is set only in CWS
- if ( $ENV{'CWS_WORK_STAMP'} ) { $buildidstringcws = $buildidstringcws . "\[CWS\:" . $ENV{'CWS_WORK_STAMP'} . "\]"; }
-
for ( my $i = 0; $i <= $#{$blockref}; $i++ )
{
if ($installer::globals::lastminor) { ${$blockref}[$i] =~ s/\{milestone\}/$milestonevariable/; }
diff --git a/solenv/bin/modules/packager/work.pm b/solenv/bin/modules/packager/work.pm
index 014d53b19efe..f84ae22355f4 100644
--- a/solenv/bin/modules/packager/work.pm
+++ b/solenv/bin/modules/packager/work.pm
@@ -268,7 +268,6 @@ sub do_broadcast
if ( ! $ENV{'WORK_STAMP'} ) { packager::exiter::exit_program("ERROR: Environment variable WORK_STAMP not set!", "do_broadcast"); }
my $workstamp = $ENV{WORK_STAMP};
- my $cwsworkstamp = $ENV{CWS_WORK_STAMP};
my $prjdir = $tempdir;
$prjdir =~ s/$prj/$prjname/;
@@ -280,14 +279,8 @@ sub do_broadcast
if ( ! $tmpfile_handle ) {
packager::exiter::exit_program("ERROR: Couldn't open temporary file \"$tmpfile_name\"!", "do_broadcast");
}
- if (defined($cwsworkstamp)) {
- print $tmpfile_handle "\"$cwsworkstamp;$platform;$prjname;$prjdir;nobase;$prjdep\"";
- print "to tmpfile: \"$cwsworkstamp;$platform;$prjname;$prjdir;nobase;$prjdep\"\n";
- }
- else {
- print $tmpfile_handle "\"$workstamp;$platform;$prjname;$prjdir;nobase;$prjdep\"";
- print "to tmpfile: \"$workstamp;$platform;$prjname;$prjdir;nobase;$prjdep\"\n";
- }
+ print $tmpfile_handle "\"$workstamp;$platform;$prjname;$prjdir;nobase;$prjdep\"";
+ print "to tmpfile: \"$workstamp;$platform;$prjname;$prjdir;nobase;$prjdep\"\n";
close $tmpfile_handle;
my $returnvalue = system("cmd_bcst -s 18 \@$tmpfile_name");
print "cmd_bcst -s 18 \@$tmpfile_name\n";
diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk
index aa5835ae42a1..cbf840b6678b 100644
--- a/solenv/gbuild/Deliver.mk
+++ b/solenv/gbuild/Deliver.mk
@@ -50,11 +50,8 @@ define gb_Deliver_add_deliverable
ifeq ($(MAKECMDGOALS),showdeliverables)
$(call gb_Deliver_do_add,$(OUTDIR)/$(1),$(2),$(3))
else
-ifneq ($(CWS_WORK_STAMP),)
-else
$(call gb_Deliver_do_add,$(OUTDIR)/$(1),$(2),$(3))
endif
-endif
endef
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
index bc4baa85bb12..69e57381da1c 100644
--- a/solenv/inc/installationtest.mk
+++ b/solenv/inc/installationtest.mk
@@ -46,10 +46,10 @@ my_file = file://
.END
# The following conditional is an approximation of: UPDATER set to YES and
-# SHIPDRIVE set and CWS_WORK_STAMP not set and either SOL_TMP not set or
+# 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)" != "" && \
- "$(CWS_WORK_STAMP)" == "" && "$(SOLARENV:s/$(SOL_TMP)//" == "$(SOLARENV)"
+ "$(SOLARENV:s/$(SOL_TMP)//" == "$(SOLARENV)"
my_instsets = $(shell ls -dt \
$(SHIPDRIVE)/$(INPATH)/LibreOffice/archive/$(WORK_STAMP)_$(LAST_MINOR)_native_packed-*_$(defaultlangiso).$(BUILD))
installationtest_instset = $(my_instsets:1)
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 0ff659c7ec1b..ca816d8e664b 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -97,8 +97,8 @@ $(OBJ)/%.obj : %.cc
PCHOUTDIR=$(SLO)/pch
PCHEXOUTDIR=$(SLO)/pch_ex
.ELSE # "$(NETWORK_BUILD)"==""
-PCHOUTDIR=$(TMP)/$(BUILD)$(CWS_WORK_STAMP)$(PRJNAME)$(PROEXT)
-PCHEXOUTDIR=$(TMP)/$(BUILD)$(CWS_WORK_STAMP)$(PRJNAME)_ex$(PROEXT)
+PCHOUTDIR=$(TMP)/$(BUILD)$(PRJNAME)$(PROEXT)
+PCHEXOUTDIR=$(TMP)/$(BUILD)$(PRJNAME)_ex$(PROEXT)
.ENDIF # "$(NETWORK_BUILD)"==""
$(SLO)/precompiled.% .PHONY:
-$(MKDIRHIER) $(SLO)/pch
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 61e7ba050173..352b8503b5ec 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -57,7 +57,7 @@ NETWORK_BUILD:=TRUE
PLATFORMID = $(RTL_OS:l)_$(RTL_ARCH:l)
EXTNAME*=$(EXTENSIONNAME)_in
-.IF "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!=""
+.IF "$(UPDATER)"!=""
.IF "$(SOURCEVERSION)"!="$(WORK_STAMP)"
.ERROR : ; @echo Forced error: minor.mk in solenv/inc does not match your version!
@@ -69,7 +69,7 @@ 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)"!="" || "$(CWS_WORK_STAMP)"!=""
+.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 2eccf8261cb4..4ef0a232a1f7 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -1417,7 +1417,7 @@ $(SCP_PRODUCT_TYPE):
$(TOUCH) $@
.IF "$(COMPVERMK)"!=""
-.IF "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!=""
+.IF "$(UPDATER)"!=""
.IF "$(COMPATH:s!\!/!)"!="$(COMPATH_STORED)"
COMPVERMK_PHONY:=.PHONY
.ENDIF # "$(COMPATH:s!\!/!)"!="$(COMPATH_STORED)"
@@ -1444,7 +1444,7 @@ COMPVTMP:=$(mktmp iii)
.ENDIF # "$(CCNUMVER)"!=""
.ENDIF # "$(COMPVERMK)"!=""
-.ENDIF # "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!=""
+.ENDIF # "$(UPDATER)"!=""
.IF "$(JAVAVERMK)"!=""
.IF "$(JAVALOCATION)"!="$(JAVA_HOME)"
generated by cgit (git 2.34.1) at 2025-01-18 18:25:38 +0000