strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Kill "BUILD_SOSL", some Hamburg thing

Browse source
This commit is contained in:
Tor Lillqvist 2011-05-14 22:02:25 +03:00 committed by Tor Lillqvist
parent 5f0b89e382
commit 4e011da922
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
set_soenv.in
View file

@ -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" );

1
solenv/bin/build.pl
View file

@ -225,7 +225,6 @@
if ($prepare) {
get_platforms(\%platforms);
$deliver_env{'BUILD_SOSL'}++;
$deliver_env{'COMMON_OUTDIR'}++;
$deliver_env{'GUI'}++;
$deliver_env{'INPATH'}++;

3
solenv/bin/deliver.pl
View file

@ -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");