[Libreoffice-commits] .: 12 commits - configure.in set_soenv.in solenv/bin solenv/inc stlport/makefile.mk
Tor Lillqvist
tml at kemper.freedesktop.org
Sat May 14 13:36:45 PDT 2011
configure.in | 37 +++-------------------------------
set_soenv.in | 54 +++++++++-----------------------------------------
solenv/bin/build.pl | 1
solenv/bin/deliver.pl | 13 ------------
solenv/inc/target.mk | 6 -----
solenv/inc/tg_jar.mk | 10 ---------
stlport/makefile.mk | 2 -
7 files changed, 14 insertions(+), 109 deletions(-)
New commits:
commit a34834e758027378da02f33cfad079f557190070
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat May 14 23:26:26 2011 +0300
Kill USE_NEW_SDK and adapt to it being always TRUE
diff --git a/set_soenv.in b/set_soenv.in
index 9e039a1..8ef87ff 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -81,7 +81,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
$MSPDB_PATH, $MIDL_PATH, $CSC_PATH,
$PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, $JAVALIB,
$SOLARINC, $LOCALINI, $FRAMEWORKSHOME, $COMEX, $PERL,
- $COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK, $DOTNET_FRAMEWORK_HOME,
+ $COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $DOTNET_FRAMEWORK_HOME,
$USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $TMPDIR,
$COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
$WIN_GNUCOPY, $WIN_TOUCH, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD,
@@ -637,7 +637,6 @@ elsif ( $platform =~ m/cygwin/ )
$DIRECTXSDK_LIB = PathFormat('@DIRECTXSDK_LIB@');
$USE_DIRECTX5 = "";
$DOTNET_FRAMEWORK_HOME = PathFormat('@DOTNET_FRAMEWORK_HOME@');
- $USE_NEW_SDK = "TRUE";
$CPUNAME = "INTEL";
$CPUNAME = "X86_64" if $CL_X64;
$CPU = "I";
@@ -1644,7 +1643,6 @@ if ( $platform =~ m/cygwin/ )
ToFile( "NSIS_PATH", $NSIS_PATH, "e" );
ToFile( "DISABLE_ACTIVEX", "@DISABLE_ACTIVEX@","e" );
ToFile( "DISABLE_ATL", "@DISABLE_ATL@","e" );
- ToFile( "USE_NEW_SDK", $USE_NEW_SDK, "e" );
# Variables used when building the parts that needs to be available
# also as 64-bit versions in a 32-bit LibreOffice build, like
# the Explorer extension. If the configure script hasn't
diff --git a/stlport/makefile.mk b/stlport/makefile.mk
index 3c74d22..2d3c6b5 100644
--- a/stlport/makefile.mk
+++ b/stlport/makefile.mk
@@ -209,12 +209,10 @@ $(PACKAGE_DIR)$/so_custom_patch : $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE)
$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_custom_patch
-.IF "$(USE_NEW_SDK)"!=""
$(PACKAGE_DIR)$/win32_sdk_patch : $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE)
win32_sdk.bat $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@
$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/win32_sdk_patch
-.ENDIF # "$(USE_NEW_SDK)"!=""
.ENDIF # COMVER<=001300000000
.ENDIF "$(COM)"=="GCC"
.ENDIF # "$(GUI)"=="WNT"
commit 76c3d3053e0ab17931899ad0d4ea9a5f0969cd25
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat May 14 23:14:05 2011 +0300
Kill SET_EXCEPTIONS, not used anywhere as far as I could see
diff --git a/set_soenv.in b/set_soenv.in
index 28cb628..9e039a1 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -57,7 +57,7 @@ my ( $CALL_CDECL, $COMMON_OUTDIR,
# Platform dependent constant values.
my ( $COM, $ARCH, $CPU, $CPUNAME, $GLIBC, $GUI, $GUIBASE,
$GVER, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR,
- $DYNAMIC_CRT, $SET_EXCEPTIONS, $use_shl_versions, $JRELIBDIR,
+ $DYNAMIC_CRT, $use_shl_versions, $JRELIBDIR,
$JRETOOLKITDIR, $JRETHREADDIR,
$FLIPCMD );
#
@@ -647,7 +647,6 @@ elsif ( $platform =~ m/cygwin/ )
$GVER = "NT351";
$OS = "WNT";
$DYNAMIC_CRT = "TRUE";
- $SET_EXCEPTIONS = "TRUE";
$use_shl_versions = "TRUE";
$wps = ';'; # Windows style path seperator
if ( $MINGW eq "yes" )
@@ -1614,7 +1613,6 @@ ToFile( "INPATH", $INPATH, "e" );
ToFile( "PATH_SEPERATOR", $PATH_SEPERATOR, "e" );
ToFile( "COMEX", $COMEX, "e" );
ToFile( "DYNAMIC_CRT", $DYNAMIC_CRT, "e" );
-ToFile( "SET_EXCEPTIONS", $SET_EXCEPTIONS, "e" );
ToFile( "use_shl_versions", $use_shl_versions, "e" );
ToFile( "FLIPCMD", $FLIPCMD, "e" );
if ( $platform =~ m/darwin/ && $platform !~ m/^arm/)
commit a16edc1206288603f1b3f35abf2b68d9810cc53b
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat May 14 23:04:24 2011 +0300
Kill CDPATHx, not used anywhere as far as I could see
diff --git a/set_soenv.in b/set_soenv.in
index 4d4a7e3..28cb628 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -57,7 +57,7 @@ my ( $CALL_CDECL, $COMMON_OUTDIR,
# Platform dependent constant values.
my ( $COM, $ARCH, $CPU, $CPUNAME, $GLIBC, $GUI, $GUIBASE,
$GVER, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR,
- $DYNAMIC_CRT, $SET_EXCEPTIONS, $use_shl_versions, $CDPATHx, $JRELIBDIR,
+ $DYNAMIC_CRT, $SET_EXCEPTIONS, $use_shl_versions, $JRELIBDIR,
$JRETOOLKITDIR, $JRETHREADDIR,
$FLIPCMD );
#
@@ -1613,7 +1613,6 @@ ToFile( "OUTPATH", $OUTPATH, "e" );
ToFile( "INPATH", $INPATH, "e" );
ToFile( "PATH_SEPERATOR", $PATH_SEPERATOR, "e" );
ToFile( "COMEX", $COMEX, "e" );
-ToFile( "CDPATHx", $CDPATHx, "e" );
ToFile( "DYNAMIC_CRT", $DYNAMIC_CRT, "e" );
ToFile( "SET_EXCEPTIONS", $SET_EXCEPTIONS, "e" );
ToFile( "use_shl_versions", $use_shl_versions, "e" );
commit f405f10602f9d8c639afc2ae58175117e1f3cb9f
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat May 14 22:56:07 2011 +0300
Fix fallout from BUILD_SOSL removal
As set_soenv.in used to always put BUILD_SOSL="true" in the
environment, we can delete the block completely that was to be
executed only if BUILD_SOSL was undefined.
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 8e2610c..534accb 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -463,18 +463,6 @@ sub init_globals
my $solarversion = $ENV{'SOLARVERSION'};
my $updater = $ENV{'UPDATER'};
my $work_stamp = $ENV{'WORK_STAMP'};
-
- # special security check for release engineers
- if ( defined($updater) && !$opt_force) {
- my $path = getcwd();
- if ( $path !~ /$work_stamp/io ) {
- print_error("can't deliver from local directory to SOLARVERSION");
- print STDERR "\nDANGER! Release Engineer:\n";
- print STDERR "do you really want to deliver from $path to SOLARVERSION?\n";
- print STDERR "If so, please use the -force switch\n\n";
- exit(7);
- }
- }
# do we have a valid environment?
if ( !defined($inpath) ) {
commit 9f4452bf1725e1810114f68c042e8b1b2ad597bf
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat May 14 22:55:09 2011 +0300
Kill BIG_SVX, not used anywhere as far as I could see
diff --git a/set_soenv.in b/set_soenv.in
index aeb69b0..4d4a7e3 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -55,7 +55,7 @@ my ( $CALL_CDECL, $COMMON_OUTDIR,
$ENABLEUNICODE, $NO_BSYMBOLIC);
#
# Platform dependent constant values.
-my ( $BIG_SVX, $COM, $ARCH, $CPU, $CPUNAME, $GLIBC, $GUI, $GUIBASE,
+my ( $COM, $ARCH, $CPU, $CPUNAME, $GLIBC, $GUI, $GUIBASE,
$GVER, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR,
$DYNAMIC_CRT, $SET_EXCEPTIONS, $use_shl_versions, $CDPATHx, $JRELIBDIR,
$JRETOOLKITDIR, $JRETHREADDIR,
@@ -220,7 +220,6 @@ if ( $platform =~ m/solaris/ )
}
$COM = "GCC";
- $BIG_SVX = "TRUE";
$COMPATH = '@COMPATH@';
$GUI = "UNX";
$GUIBASE = "unx";
@@ -278,7 +277,6 @@ elsif ( $platform =~ m/netbsd/ )
}
# General NetBSD settings:
$OUTPATH = $OUTPATH."3";
- $BIG_SVX = "TRUE";
$COM = "GCC";
$COMPATH = '@COMPATH@';
$GUI = "UNX";
@@ -291,7 +289,6 @@ elsif ( $platform =~ m/netbsd/ )
elsif ( $platform =~ m/kfreebsd/ )
{
# General GNU/kFreeBSD settings:
- $BIG_SVX = "TRUE";
$COM = "GCC";
$COMPATH = '@COMPATH@';
$GLIBC = "2REDHAT60";
@@ -329,8 +326,7 @@ elsif ( $platform =~ m/kfreebsd/ )
$INPATH = $OUTPATH.$PROEXT;
}
elsif ( $platform =~ m/freebsd/ )
-{ $BIG_SVX = "TRUE";
- $COM = "GCC";
+{ $COM = "GCC";
$COMPATH = '@COMPATH@';
$GUI = "UNX";
$GUIBASE = "unx";
@@ -375,8 +371,7 @@ elsif ( $platform =~ m/freebsd/ )
$INPATH = $OUTPATH.$PROEXT;
}
elsif ( $platform =~ m/openbsd/ )
-{ $BIG_SVX = "TRUE";
- $COM = "GCC";
+{ $COM = "GCC";
$COMPATH = '@COMPATH@';
$GUI = "UNX";
$GUIBASE = "unx";
@@ -412,7 +407,6 @@ elsif ( $platform =~ m/openbsd/ )
elsif ( $platform =~ m/linux/ )
{
# General Linux settings:
- $BIG_SVX = "TRUE";
$COM = "GCC";
$COMPATH = '@COMPATH@';
$GLIBC = "2REDHAT60";
@@ -699,8 +693,7 @@ elsif ( $platform =~ m/cygwin/ )
}
}
elsif ( $platform =~ m/darwin/ )
-{ $BIG_SVX = "TRUE";
- $COM = "GCC";
+{ $COM = "GCC";
$COMPATH = '@COMPATH@';
if ($platform =~ m/^arm/)
{
@@ -761,7 +754,6 @@ elsif ( $platform =~ m/dragonfly/ )
exit 1;
}
# General DragonFly settings:
- $BIG_SVX = "TRUE";
$COM = "GCC";
$COMPATH = '@COMPATH@';
$GUI = "UNX";
@@ -783,7 +775,6 @@ elsif ( $platform =~ m/aix/ )
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
- $BIG_SVX = "TRUE";
$COM = "GCC";
$COMPATH = '@COMPATH@';
$GUI = "UNX";
@@ -1606,7 +1597,6 @@ ToFile( "GIT_REPO_NAMES", "@GIT_REPO_NAMES@", "e" );
# (c = comment, e = environment variable, a = alias )
ToFile( "Platform dependent constant values.", $empty, "c" );
ToFile( "SOLAR_JAVA", $SOLAR_JAVA, "e" );
-ToFile( "BIG_SVX", $BIG_SVX, "e" );
ToFile( "COM", $COM, "e" );
ToFile( "COMPATH", $COMPATH, "e" );
ToFile( "CPU", $CPU, "e" );
commit 667e1b60b02a608b520f6f2b12a0f477923726cc
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat May 14 22:43:13 2011 +0300
Kill build_deliver, not used anywhere as far as I could see
diff --git a/set_soenv.in b/set_soenv.in
index 375502a..aeb69b0 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -50,7 +50,7 @@ my ( $outfile, $bootfile, $newline, $comment,
# Platform independent constant values.
my ( $CALL_CDECL, $COMMON_OUTDIR,
$common_build, $NO_REC_RES, $SO3, $SOLAR_JAVA,
- $SOLAR_PLUGIN, $UPDATER, $BUILD_DELIVER, $VCL,
+ $SOLAR_PLUGIN, $UPDATER, $VCL,
$CC, $CXX,
$ENABLEUNICODE, $NO_BSYMBOLIC);
#
@@ -178,7 +178,6 @@ $SO3 = "TRUE";
$SOLAR_JAVA = "@SOLAR_JAVA@";
$SOLAR_PLUGIN = "TRUE";
$UPDATER = "YES";
-$BUILD_DELIVER = "true";
$VCL = "TRUE";
$ENABLEUNICODE = "TRUE";
$NO_BSYMBOLIC = "TRUE";
@@ -1512,7 +1511,6 @@ ToFile( "NO_REC_RES", $NO_REC_RES, "e" );
ToFile( "SO3", $SO3, "e" );
ToFile( "SOLAR_PLUGIN", $SOLAR_PLUGIN, "e" );
ToFile( "UPDATER", $UPDATER, "e" );
-ToFile( "build_deliver", $BUILD_DELIVER, "e" );
ToFile( "VCL", $VCL, "e" );
ToFile( "ENABLEUNICODE", $ENABLEUNICODE, "e" );
ToFile( "NO_BSYMBOLIC", $NO_BSYMBOLIC, "e" );
commit a3f5d5711296af71e8bbf6ef3c61bd1ed1dac1c0
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat May 14 22:40:23 2011 +0300
Kill "TF_FILTER"
No idea what it is, not used anywhere as far as I could see.
diff --git a/set_soenv.in b/set_soenv.in
index ee93570..375502a 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1516,7 +1516,6 @@ ToFile( "build_deliver", $BUILD_DELIVER, "e" );
ToFile( "VCL", $VCL, "e" );
ToFile( "ENABLEUNICODE", $ENABLEUNICODE, "e" );
ToFile( "NO_BSYMBOLIC", $NO_BSYMBOLIC, "e" );
-ToFile( "TF_FILTER", "TRUE", "e" );
if ("@ENABLE_DEBUG@" eq "TRUE") {
ToFile( "debug", "true", "e" );
}
commit 8bd3bc7f46598f0c972bd6b77c71b2008da32e1a
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat May 14 22:38:27 2011 +0300
Kill "NEW_JAR_PACK"
It was fixed as TRUE, so unconditionally change its uses according to
that.
diff --git a/set_soenv.in b/set_soenv.in
index ba799f3..ee93570 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -52,7 +52,7 @@ my ( $CALL_CDECL, $COMMON_OUTDIR,
$common_build, $NO_REC_RES, $SO3, $SOLAR_JAVA,
$SOLAR_PLUGIN, $UPDATER, $BUILD_DELIVER, $VCL,
$CC, $CXX,
- $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC);
+ $ENABLEUNICODE, $NO_BSYMBOLIC);
#
# Platform dependent constant values.
my ( $BIG_SVX, $COM, $ARCH, $CPU, $CPUNAME, $GLIBC, $GUI, $GUIBASE,
@@ -181,7 +181,6 @@ $UPDATER = "YES";
$BUILD_DELIVER = "true";
$VCL = "TRUE";
$ENABLEUNICODE = "TRUE";
-$NEW_JAR_PACK = "TRUE";
$NO_BSYMBOLIC = "TRUE";
$comment = "#"; # UNIX script comment character
$TARFILE_LOCATION = "@TARFILE_LOCATION@"; # where to find tarballs with external sources
@@ -1516,7 +1515,6 @@ ToFile( "UPDATER", $UPDATER, "e" );
ToFile( "build_deliver", $BUILD_DELIVER, "e" );
ToFile( "VCL", $VCL, "e" );
ToFile( "ENABLEUNICODE", $ENABLEUNICODE, "e" );
-ToFile( "NEW_JAR_PACK", $NEW_JAR_PACK, "e" );
ToFile( "NO_BSYMBOLIC", $NO_BSYMBOLIC, "e" );
ToFile( "TF_FILTER", "TRUE", "e" );
if ("@ENABLE_DEBUG@" eq "TRUE") {
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 3824bdf..8665624 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -341,14 +341,8 @@ JAVATARGET:=$(MISC)/$(TARGET)_dummy.java
.IF "$(JARTARGET)"!=""
JARCLASSDIRS*=.
-.IF "$(NEW_JAR_PACK)"!=""
JARMANIFEST*=$(CLASSDIR)/$(TARGET)/META-INF/MANIFEST.MF
-.ENDIF # "$(NEW_JAR_PACK)"!=""
JARTARGETN=$(CLASSDIR)/$(JARTARGET)
-.IF "$(NOJARDEP)$(NEW_JAR_PACK)"==""
-JARTARGETDEP=$(JARTARGET).dep
-JARTARGETDEPN=$(MISC)/$(JARTARGET).dep
-.ENDIF # "$(NOJARDEP)$(NEW_JAR_PACK)"==""
.ENDIF # "$(JARTARGET)"!=""
.ELSE # "$(SOLAR_JAVA)"!=""
JAVACLASSFILES:=
diff --git a/solenv/inc/tg_jar.mk b/solenv/inc/tg_jar.mk
index 5c6101d..df39ba6 100644
--- a/solenv/inc/tg_jar.mk
+++ b/solenv/inc/tg_jar.mk
@@ -36,11 +36,8 @@ ZIP_VERBOSITY=-q
JARCOMPRESS_FLAG=0
.ENDIF
-.IF "$(NEW_JAR_PACK)"!=""
$(JARTARGETN) : $(JARMANIFEST) $(JAVACLASSFILES) $(JAVATARGET)
-.ENDIF # "$(NEW_JAR_PACK)"!=""
-.IF "$(NEW_JAR_PACK)"!=""
.IF "$(JARMANIFEST)"!=""
.IF "$(CUSTOMMANIFESTFILE)"!=""
@@ -65,7 +62,6 @@ $(JARMANIFEST) .PHONY : $(CUSTOMMANIFESTFILEDEP)
$(COMMAND_ECHO)$(TYPE) $(MISC)/$(TARGET)_$(CUSTOMMANIFESTFILE:f) >> $@
.ENDIF # "$(CUSTOMMANIFESTFILE)"!=""
.ENDIF # "$(JARMANIFEST)"!=""
-.ENDIF # "$(NEW_JAR_PACK)"!=""
.IF "$(JARCLASSEXCLUDES)" == ""
ZIPJAR_EXCLUDE=
@@ -78,14 +74,8 @@ ZIPJAR_EXCLUDE=$(foreach,i,$(JARCLASSEXCLUDES) -x "$i")
#
# build jar
#
-.IF "$(NOJARDEP)"!="" || "$(NEW_JAR_PACK)"!=""
$(JARTARGETN) .PHONY :
# $(JARMANIFEST)
-.ELSE # "$(NOJARDEP)"!="" || "$(NEW_JAR_PACK)"!=""
-.DIRCACHE = no
-$(JARTARGETN) :
-#$(JARTARGETN) .SETDIR=$(CLASSDIR) .SEQUENTIAL : $(JARTARGETDEP) $(shell @-cat -s $(MISC)/$(JARTARGETN).dep )
-.ENDIF # "$(NOJARDEP)"!="" || "$(NEW_JAR_PACK)"!=""
.IF "$(OS)$(CPU)"=="SOLARISS"
@-find . -type d -user $(USER) ! -perm -5 -print | xargs test "$$1" != "" && chmod +r $$1
.ENDIF
commit 528fd30630a1d91e10966e80e91d1cf204d81b5b
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat May 14 22:29:20 2011 +0300
Kill "BMP_WRITES_FLAG"
Not used anywhere as far as I can see.
diff --git a/set_soenv.in b/set_soenv.in
index 69bc660..ba799f3 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -48,7 +48,7 @@ my ( $outfile, $bootfile, $newline, $comment,
#-------------------------------------------------
#
# Platform independent constant values.
-my ( $CALL_CDECL, $COMMON_OUTDIR, $BMP_WRITES_FLAG,
+my ( $CALL_CDECL, $COMMON_OUTDIR,
$common_build, $NO_REC_RES, $SO3, $SOLAR_JAVA,
$SOLAR_PLUGIN, $UPDATER, $BUILD_DELIVER, $VCL,
$CC, $CXX,
@@ -170,7 +170,6 @@ chomp( $oldPATH ); # cut off new line
#
# Setting platform independent constant values.
# NB: Language options now set at 'ToFile' stage.
-$BMP_WRITES_FLAG = "TRUE";
$CALL_CDECL = "TRUE";
$COMMON_OUTDIR = "";
$common_build = "";
@@ -1510,7 +1509,6 @@ ToFile( "WITH_POOR_HELP_LOCALIZATIONS", $WITH_POOR_HELP_LOCALIZATIONS, "e" );
ToFile( "CALL_CDECL", $CALL_CDECL, "e" );
ToFile( "COMMON_OUTDIR", $COMMON_OUTDIR, "e" );
ToFile( "common_build", $common_build, "e" );
-ToFile( "BMP_WRITES_FLAG", $BMP_WRITES_FLAG, "e" );
ToFile( "NO_REC_RES", $NO_REC_RES, "e" );
ToFile( "SO3", $SO3, "e" );
ToFile( "SOLAR_PLUGIN", $SOLAR_PLUGIN, "e" );
commit df162af720410b730ad9816fb92e6eb780ddc5f7
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat May 14 22:02:25 2011 +0300
Kill "BUILD_SOSL", some Hamburg thing
diff --git a/set_soenv.in b/set_soenv.in
index f071901..69bc660 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 b03ebd4..22ab1f0 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 70d3c8f..8e2610c 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");
commit 6e449169a5cb138b82f2148eea06cd9b175e7263
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat May 14 21:58:06 2011 +0300
Kill "BUILD_SOSL_RELEASE"
No idea what it is, doesn't occur anywhere else in the sources.
diff --git a/set_soenv.in b/set_soenv.in
index e98b6eb..f071901 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -52,8 +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,
- $BUILD_SOSL_RELEASE);
+ $BUILD_SOSL, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC);
#
# Platform dependent constant values.
my ( $BIG_SVX, $COM, $ARCH, $CPU, $CPUNAME, $GLIBC, $GUI, $GUIBASE,
@@ -172,7 +171,6 @@ chomp( $oldPATH ); # cut off new line
# Setting platform independent constant values.
# NB: Language options now set at 'ToFile' stage.
$BMP_WRITES_FLAG = "TRUE";
-$BUILD_SOSL_RELEASE = "TRUE";
$CALL_CDECL = "TRUE";
$COMMON_OUTDIR = "";
$common_build = "";
@@ -1515,7 +1513,6 @@ ToFile( "CALL_CDECL", $CALL_CDECL, "e" );
ToFile( "COMMON_OUTDIR", $COMMON_OUTDIR, "e" );
ToFile( "common_build", $common_build, "e" );
ToFile( "BMP_WRITES_FLAG", $BMP_WRITES_FLAG, "e" );
-ToFile( "BUILD_SOSL_RELEASE", $BUILD_SOSL_RELEASE, "e" );
ToFile( "NO_REC_RES", $NO_REC_RES, "e" );
ToFile( "SO3", $SO3, "e" );
ToFile( "SOLAR_PLUGIN", $SOLAR_PLUGIN, "e" );
commit d47aad5bc491a21c97db3942f30217b463959d33
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat May 14 21:52:22 2011 +0300
Kill "local solenv"
No idea in what circumstance one would want to use that.
diff --git a/configure.in b/configure.in
index cf6f039..89df92e 100755
--- a/configure.in
+++ b/configure.in
@@ -1160,14 +1160,6 @@ AC_ARG_WITH(mozilla-build,
MOZILLABUILD=$withval ,
)
-AC_ARG_WITH(local-solenv,
- AS_HELP_STRING([--with-local-solenv],
- [If you have solenv in a location other than ./solenv, please supply the path here.])
- [
- Usage: --with-local-solenv=<abs. path to solenv>
- ],
-,)
-
AC_ARG_WITH(local-solver,
AS_HELP_STRING([--with-local-solver],
[If you have solver in a location other than ./solver, please supply the path here.])
@@ -1713,35 +1705,14 @@ AC_SUBST(CXX_FOR_BUILD)
AC_SUBST(GXX_INCLUDE_PATH_FOR_BUILD)
AC_SUBST(MACOSX_DEPLOYMENT_TARGET_FOR_BUILD)
-dnl ===================================================================
-dnl Checks for --with-local-solenv invocation
-dnl TODO: Is this still required?
-dnl ===================================================================
-AC_MSG_CHECKING([for solenv environment])
-if test -z "$with_local_solenv"; then
- LOCAL_SOLENV="DEFAULT"
- AC_MSG_RESULT([default])
-else
- LOCAL_SOLENV=$with_local_solenv
- AC_MSG_RESULT([$with_local_solenv])
-fi
-AC_SUBST(LOCAL_SOLENV)
-
-if test "$LOCAL_SOLENV" = "DEFAULT"; then
- _solenv="./solenv"
-else
- _solenv="$LOCAL_SOLENV"
-fi
-AC_SUBST(_solenv)
-
-if test -e $_solenv/inc/minor.mk; then
+if test -e solenv/inc/minor.mk; then
# Get UPD number from ./solenv/inc/minor.mk
- UPD="`grep RSCVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
+ UPD="`grep RSCVERSION= solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
AC_SUBST(UPD)
- SOURCEVERSION="`grep SOURCEVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
+ SOURCEVERSION="`grep SOURCEVERSION= solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
AC_SUBST(SOURCEVERSION)
else
- AC_MSG_ERROR([$_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation...])
+ AC_MSG_ERROR([solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation...])
fi
dnl ===================================================================
diff --git a/set_soenv.in b/set_soenv.in
index 005aafb..e98b6eb 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -965,14 +965,7 @@ if ('@TARFILE_LOCATION@' eq "DEFAULT")
#
$DEVROOT = '$SRC_ROOT';
-# Set solenv and solver to given or default values.
-# Location of the solenv tree.
-if ('@LOCAL_SOLENV@' eq "DEFAULT")
-{ $SOLARENV = PathFormat($SRC_ROOT.$SOLENV);
-}
-else
-{ $SOLARENV = PathFormat('@LOCAL_SOLENV@');
-}
+$SOLARENV = PathFormat($SRC_ROOT.$SOLENV);
# Location of the solver tree.
if ('@LOCAL_SOLVER@' eq "DEFAULT")
{ $SOLARVER = $SRC_ROOT.$SOLVER.$ds.$UPD;
More information about the Libreoffice-commits
mailing list