diff options
| -rwxr-xr-x | set_soenv.in | 4 | ||||
| -rwxr-xr-x | solenv/bin/build.pl | 1 | ||||
| -rwxr-xr-x | solenv/bin/deliver.pl | 3 |
3 files changed, 2 insertions, 6 deletions
diff --git a/set_soenv.in b/set_soenv.in index f0719011c4aa..69bc6602c078 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -52,7 +52,7 @@ my ( $CALL_CDECL, $COMMON_OUTDIR, $BMP_WRITES_FLAG, $common_build, $NO_REC_RES, $SO3, $SOLAR_JAVA, $SOLAR_PLUGIN, $UPDATER, $BUILD_DELIVER, $VCL, $CC, $CXX, - $BUILD_SOSL, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC); + $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC); # # Platform dependent constant values. my ( $BIG_SVX, $COM, $ARCH, $CPU, $CPUNAME, $GLIBC, $GUI, $GUIBASE, @@ -181,7 +181,6 @@ $SOLAR_PLUGIN = "TRUE"; $UPDATER = "YES"; $BUILD_DELIVER = "true"; $VCL = "TRUE"; -$BUILD_SOSL = "true"; $ENABLEUNICODE = "TRUE"; $NEW_JAR_PACK = "TRUE"; $NO_BSYMBOLIC = "TRUE"; @@ -1493,7 +1492,6 @@ ToFile( "ANT_LIB", PathFormat("@ANT_LIB@"), "e" ); ToFile( "ANT", PathFormat("@ANT@"), "e" ); ToFile( "JDKLIB", $JAVA_LIB, "e" ); ToFile( "ASM_PATH", $ASM_PATH, "e" ); -ToFile( "BUILD_SOSL", $BUILD_SOSL, "e" ); ToFile( "FRAMEWORKSHOME", $FRAMEWORKSHOME, "e" ); ToFile( "Empty", $empty, "n" ); diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index e47d6b275e7e..f1fda6430bf6 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -225,7 +225,6 @@ if ($prepare) { get_platforms(\%platforms); - $deliver_env{'BUILD_SOSL'}++; $deliver_env{'COMMON_OUTDIR'}++; $deliver_env{'GUI'}++; $deliver_env{'INPATH'}++; diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl index 22ec376af8f7..43f826ba9ec3 100755 --- a/solenv/bin/deliver.pl +++ b/solenv/bin/deliver.pl @@ -458,7 +458,6 @@ sub init_globals $umask = 22; } - my $build_sosl = $ENV{'BUILD_SOSL'}; my $common_outdir = $ENV{'COMMON_OUTDIR'}; my $inpath = $ENV{'INPATH'}; my $solarversion = $ENV{'SOLARVERSION'}; @@ -466,7 +465,7 @@ sub init_globals my $work_stamp = $ENV{'WORK_STAMP'}; # special security check for release engineers - if ( defined($updater) && !defined($build_sosl) && !$opt_force) { + if ( defined($updater) && !$opt_force) { my $path = getcwd(); if ( $path !~ /$work_stamp/io ) { print_error("can't deliver from local directory to SOLARVERSION"); |