Merge branch 'master' of /home/bjoern/.jenkins/jobs/repo-mirror/workspace/core

24 files changed, 97 insertions, 182 deletions

diff --git a/solenv/bin/add-modelines b/solenv/bin/add-modelines
index e7491c24ac08..f9a831bcc118 100755
--- a/solenv/bin/add-modelines
+++ b/solenv/bin/add-modelines
@@ -31,7 +31,7 @@ set -o posix
 # Change these to taste
 FirstLine='/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */'
 LastLine='/* vim:set shiftwidth=4 softtabstop=4 expandtab: */'
-SourceFiles='*.cxx *.cpp *.hxx *.hpp *.c *.h *.mm'
+SourceFiles='*.cxx *.cpp *.hxx *.hpp *.c *.h *.m *.mm'
 
 # Set defaults (don't change these)
 ModelineReplace="false"
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index 3606dcae7082..b4dcd0d84b9f 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -29,6 +29,7 @@
 GDBDIR="${SOLARENV}/gdb"
 SOLVERLIBDIR="${SOLARVER}/${INPATH}/lib"
 INSTALLDIR="${SOLARVER}/${INPATH}/installation/opt"
+[ "$(uname)" = Darwin ] && INSTALLDIR=$INSTALLDIR/LibreOffice.app/Contents
 
 die() {
     echo "$1" >&2
@@ -82,7 +83,8 @@ make_autoload() {
     local lib="${dir}/$3"
 
     if ! ${flat}; then
-        lib="$(readlink -f "${DESTDIR}${installdir}/$2/$3")"
+        local resolved="$(readlink "${DESTDIR}${installdir}/$2/$3")"
+        [ -n "$resolved" ] && lib=$resolved
         dir="${lib%/*}"
     fi
 
@@ -163,10 +165,10 @@ if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then
     cp -r "${GDBDIR}/libreoffice" "${DESTDIR}${pythondir}"
 fi
 
-make_autoload cppu basis-link/ure-link/lib libuno_cppu.so.3
-make_autoload sal basis-link/ure-link/lib libuno_sal.so.3
-make_autoload svl basis-link/program libsvllo.so
-make_autoload sw basis-link/program libswlo.so
-make_autoload tl basis-link/program libtllo.so
+make_autoload cppu basis-link/ure-link/lib libuno_cppu.{dylib,so}.3
+make_autoload sal basis-link/ure-link/lib libuno_sal.{dylib,so}.3
+make_autoload svl program libsvllo.{dylib,so}
+make_autoload sw program libswlo.{dylib,so}
+make_autoload tl program libtllo.{dylib,so}
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index d8997a829e82..5da680ce0633 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -69,6 +69,46 @@ my $LIBVER;
 my $OOO_BUILD;
 my $OOO_INSTALL;
 
+# process options
+for my $a (@ARGV) {
+
+    # options
+    if ($a =~ /--dry-run/) {
+        $dry_run = 1;
+    } elsif (($a eq '--help') || ($a eq '-h')) {
+	$usage = 1;
+
+    # ordered arguments
+    } elsif (!defined $OOO_INSTALL) {
+	$OOO_INSTALL = $a;
+    } elsif (!defined $OOO_BUILD) {
+	$OOO_BUILD = $a;
+    } else {
+	print "Unknown argument '$a'\n";
+	$usage = 1;
+    }
+}
+
+if (!defined $OOO_BUILD && defined $ENV{SRC_ROOT}) {
+    $OOO_BUILD = $ENV{SRC_ROOT};
+}
+
+if ($usage || !defined $OOO_INSTALL || !defined $OOO_BUILD) {
+    printf "Usage: linkoo </path/to/ooo/install> [</path/to/ooo/build/tree>] [--dry-run]\n";
+    exit (1);
+}
+
+substr ($OOO_INSTALL, 0, 1) eq '/' || die "linkoo requires absolute paths ($OOO_INSTALL does not qualify)";
+substr ($OOO_BUILD, 0, 1)   eq '/' || die "linkoo requires absolute paths ($OOO_BUILD does not qualify)";
+
+-d $OOO_INSTALL || die "No such directory $OOO_INSTALL";
+-w $OOO_INSTALL || die "You need write access to $OOO_INSTALL";
+-d $OOO_BUILD || die "No such directory $OOO_BUILD";
+
+($TARGET, $LIBVER, $LANG) = sniff_target ($OOO_BUILD);
+
+
+# setup global variables
 my $basis_dir = 'basis-link/program';
 my $win_basis_dir = 'Basis/program';
 my $brand_program_dir = 'program';
@@ -356,43 +396,6 @@ sub link_pagein_files()
     print "\n";
 }
 
-for my $a (@ARGV) {
-
-# options
-    if ($a =~ /--dry-run/) {
-        $dry_run = 1;
-    } elsif (($a eq '--help') || ($a eq '-h')) {
-	$usage = 1;
-
-# ordered arguments
-    } elsif (!defined $OOO_INSTALL) {
-	$OOO_INSTALL = $a;
-    } elsif (!defined $OOO_BUILD) {
-	$OOO_BUILD = $a;
-    } else {
-	print "Unknown argument '$a'\n";
-	$usage = 1;
-    }
-}
-
-if (!defined $OOO_BUILD && defined $ENV{SRC_ROOT}) {
-    $OOO_BUILD = $ENV{SRC_ROOT};
-}
-
-if ($usage || !defined $OOO_INSTALL || !defined $OOO_BUILD) {
-    printf "Usage: linkoo </path/to/ooo/install> [</path/to/ooo/build/tree>] [--dry-run]\n";
-    exit (1);
-}
-
-substr ($OOO_INSTALL, 0, 1) eq '/' || die "linkoo requires absolute paths ($OOO_INSTALL does not qualify)";
-substr ($OOO_BUILD, 0, 1)   eq '/' || die "linkoo requires absolute paths ($OOO_BUILD does not qualify)";
-
--d $OOO_INSTALL || die "No such directory $OOO_INSTALL";
--w $OOO_INSTALL || die "You need write access to $OOO_INSTALL";
--d $OOO_BUILD || die "No such directory $OOO_BUILD";
-
-($TARGET, $LIBVER, $LANG) = sniff_target ($OOO_BUILD);
-
 evilness ('undo');
 
 my $installed_files = build_installed_list ($OOO_INSTALL);
diff --git a/solenv/bin/localize b/solenv/bin/localize
index 732cf85c86c6..fc1ae47b1bd8 100755
--- a/solenv/bin/localize
+++ b/solenv/bin/localize
@@ -5,12 +5,12 @@ exit 1
 fi
 
 if [ "${OS?}" = MACOSX ]; then
-    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
+    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH_FOR_BUILD?}/lib
 else
-    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH_FOR_BUILD?}/lib
 fi
 
 pushd $(pwd)
 cd ${SRC_ROOT}
-exec $SOLARVERSION/$INPATH/bin/localize_sl "$@"
+exec $SOLARVERSION/$INPATH_FOR_BUILD/bin/localize_sl "$@"
 popd
diff --git a/solenv/bin/modules/installer/languages.pm b/solenv/bin/modules/installer/languages.pm
index 8f0b6e929356..8c7fc7e3b17d 100644
--- a/solenv/bin/modules/installer/languages.pm
+++ b/solenv/bin/modules/installer/languages.pm
@@ -171,51 +171,6 @@ sub get_all_languages_for_one_product
     return \@languagearray;
 }
 
-####################################################################################
-# FAKE: The languages string may contain only "de", "en-US", instead of "01", ...
-# But this has to be removed as soon as possible.
-# In the future the languages are determined with "en-US" instead "01"
-# already on the command line and in the zip list file.
-####################################################################################
-
-sub fake_languagesstring
-{
-    my ($stringref) = @_;
-
-    # ATTENTION: This function has to be removed as soon as possible!
-
-    $$stringref =~ s/01/en-US/;
-    $$stringref =~ s/03/pt/;
-    $$stringref =~ s/07/ru/;
-    $$stringref =~ s/30/el/;
-    $$stringref =~ s/31/nl/;
-    $$stringref =~ s/33/fr/;
-    $$stringref =~ s/34/es/;
-    $$stringref =~ s/35/fi/;
-    $$stringref =~ s/36/hu/;
-    $$stringref =~ s/37/ca/;
-    $$stringref =~ s/39/it/;
-    $$stringref =~ s/42/cs/;
-    $$stringref =~ s/43/sk/;
-    $$stringref =~ s/44/en-GB/;
-    $$stringref =~ s/45/da/;
-    $$stringref =~ s/46/sv/;
-    $$stringref =~ s/47/no/;
-    $$stringref =~ s/48/pl/;
-    $$stringref =~ s/49/de/;
-    $$stringref =~ s/55/pt-BR/;
-    $$stringref =~ s/66/th/;
-    $$stringref =~ s/77/et/;
-    $$stringref =~ s/81/ja/;
-    $$stringref =~ s/82/ko/;
-    $$stringref =~ s/86/zh-CN/;
-    $$stringref =~ s/88/zh-TW/;
-    $$stringref =~ s/90/tr/;
-    $$stringref =~ s/91/hi-IN/;
-    $$stringref =~ s/96/ar/;
-    $$stringref =~ s/97/he/;
-}
-
 ##########################################################
 # Converting the language array into a string for output
 ##########################################################
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 34f16ec0be64..9189b109bd6f 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -783,8 +783,6 @@ sub replace_setup_variables
 
     my $languagesstring = $$languagestringref;
     $languagesstring =~ s/\_/ /g;   # replacing underscore with whitespace
-    # $languagesstring is "01 49" instead of "en-US de"
-    installer::languages::fake_languagesstring(\$languagesstring);
 
     my $productname = $hashref->{'PRODUCTNAME'};
     my $productversion = $hashref->{'PRODUCTVERSION'};
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index b322b9e14496..a820cd967e1b 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -668,13 +668,6 @@ sub set_default_productversion_if_required
     {
         $allvariables->{'PRODUCTVERSION'} = 1;  # FAKE
     }
-
-    # Creating differentiators for BUILD_SPECIAL in layering
-    if ( ! $ENV{'BUILD_SPECIAL'} )
-    {
-        if ( $allvariables->{'REGISTRYLAYERNAME'} ) { $allvariables->{'REGISTRYLAYERNAME'} = $allvariables->{'REGISTRYLAYERNAME'} . "_"; }
-        if (( $installer::globals::iswindowsbuild ) && ( $allvariables->{'BASISROOTNAME'} )) { $allvariables->{'BASISROOTNAME'} = $allvariables->{'BASISROOTNAME'} . "_"; }
-    }
 }
 
 ####################################################
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index a3bcc8dd4bdd..10bee87f89a1 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -60,7 +60,6 @@ $$(eval $$(call gb_Output_error,Library $(1) must be registered in Repository.mk
 endif
 $(call gb_Library_get_target,$(1)) : AUXTARGETS :=
 $(call gb_Library__Library_impl,$(1),$(call gb_Library_get_linktargetname,$(1)))
-$(call gb_Library_add_default_nativeres,$(1),default)
 
 endef
 
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index e5a398ffca7b..4f9cc96c30b2 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -97,8 +97,8 @@ gb_OBJCXXFLAGS := -x objective-c++ $(gb_OBJC_OBJCXX_COMMON_FLAGS)
 gb_OBJCFLAGS := -x objective-c $(gb_OBJC_OBJCXX_COMMON_FLAGS)
 
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
-gb_CFLAGS_WERROR := -Werror
-gb_CXXFLAGS_WERROR := -Werror
+gb_CFLAGS_WERROR := -Werror -DLIBO_WERROR
+gb_CXXFLAGS_WERROR := -Werror -DLIBO_WERROR
 endif
 
 gb_LinkTarget_EXCEPTIONFLAGS := \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 6e72767a5035..b9347d194130 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -116,8 +116,8 @@ gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
 gb_OBJCFLAGS := -x objective-c
 
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
-gb_CFLAGS_WERROR := -Werror
-gb_CXXFLAGS_WERROR := -Werror
+gb_CFLAGS_WERROR := -Werror -DLIBO_WERROR
+gb_CXXFLAGS_WERROR := -Werror -DLIBO_WERROR
 endif
 
 ifeq ($(ENABLE_LTO),TRUE)
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 2317fc074acf..e64079c69573 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -120,8 +120,8 @@ gb_CXXFLAGS += -fno-strict-aliasing
 endif
 
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
-gb_CFLAGS_WERROR := -Werror
-gb_CXXFLAGS_WERROR := -Werror
+gb_CFLAGS_WERROR := -Werror -DLIBO_WERROR
+gb_CXXFLAGS_WERROR := -Werror -DLIBO_WERROR
 endif
 
 ifeq ($(HAVE_CXX0X),TRUE)
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 873c6fb71bf3..cd2a07f07724 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -181,8 +181,8 @@ gb_STDLIBS := \
 	advapi32 \
 
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
-gb_CFLAGS_WERROR := -WX
-gb_CXXFLAGS_WERROR := -WX
+gb_CFLAGS_WERROR := -WX -DLIBO_WERROR
+gb_CXXFLAGS_WERROR := -WX -DLIBO_WERROR
 endif
 
 gb_LinkTarget_EXCEPTIONFLAGS := \
@@ -508,6 +508,8 @@ $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS +=  \
 		$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))) \
 		$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))) \
 
+$(call gb_Library_add_default_nativeres,$(1),$(1)/default)
+
 endif
 
 $(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))
@@ -518,22 +520,22 @@ $(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_g
 endef
 
 define gb_Library_add_default_nativeres
-$(call gb_WinResTarget_WinResTarget_init,$(1)/$(2))
-$(call gb_WinResTarget_add_file,$(1)/$(2),solenv/inc/shlinfo)
-$(call gb_WinResTarget_set_defs,$(1)/$(2),\
+$(call gb_WinResTarget_WinResTarget_init,$(2))
+$(call gb_WinResTarget_add_file,$(2),solenv/inc/shlinfo)
+$(call gb_WinResTarget_set_defs,$(2),\
 		$$(DEFS) \
 		-DADDITIONAL_VERINFO1 \
 		-DADDITIONAL_VERINFO2 \
 		-DADDITIONAL_VERINFO3 \
 )
 $(call gb_Library_add_nativeres,$(1),$(2))
-$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(1)/$(2))
+$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(2))
 
 endef
 
 define gb_LinkTarget_add_nativeres
-$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(1)/$(2))
-$(call gb_LinkTarget_get_target,$(1)) : NATIVERES += $(call gb_WinResTarget_get_target,$(1)/$(2))
+$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(2))
+$(call gb_LinkTarget_get_target,$(1)) : NATIVERES += $(call gb_WinResTarget_get_target,$(2))
 
 endef
 
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 2187a8527cd2..4f0a188ce2d7 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -91,8 +91,8 @@ gb_CXXFLAGS := \
 	-pipe \
 
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
-gb_CFLAGS_WERROR := -Werror
-gb_CXXFLAGS_WERROR := -Werror
+gb_CFLAGS_WERROR := -Werror -DLIBO_WERROR
+gb_CXXFLAGS_WERROR := -Werror -DLIBO_WERROR
 endif
 
 ifneq ($(SYSBASE),)
@@ -516,25 +516,27 @@ $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir
 
 $(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))
 
+$(call gb_Library_add_default_nativeres,$(1),$(1)/default)
+
 endef
 
 define gb_Library_add_default_nativeres
-$(call gb_WinResTarget_WinResTarget_init,$(1)/$(2))
-$(call gb_WinResTarget_add_file,$(1)/$(2),solenv/inc/shlinfo)
-$(call gb_WinResTarget_set_defs,$(1)/$(2),\
+$(call gb_WinResTarget_WinResTarget_init,$(2))
+$(call gb_WinResTarget_add_file,$(2),solenv/inc/shlinfo)
+$(call gb_WinResTarget_set_defs,$(2),\
 		$$(DEFS) \
-		-DADDITIONAL_VERINFO1 \
-		-DADDITIONAL_VERINFO2 \
-		-DADDITIONAL_VERINFO3 \
+		-DADDITIONAL_VERINFO1="" \
+		-DADDITIONAL_VERINFO2="" \
+		-DADDITIONAL_VERINFO3="" \
 )
 $(call gb_Library_add_nativeres,$(1),$(2))
-$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(1)/$(2))
+$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(2))
 
 endef
 
 define gb_LinkTarget_add_nativeres
-$(call gb_LinkTarget_get_target,$(call gb_Library__get_linktargetname,$(1))) : $(call gb_WinResTarget_get_target,$(1)/$(2))
-$(call gb_LinkTarget_get_target,$(call gb_Library__get_linktargetname,$(1))) : NATIVERES += $(call gb_WinResTarget_get_target,$(1)/$(2))
+$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(2))
+$(call gb_LinkTarget_get_target,$(1)) : NATIVERES += $(call gb_WinResTarget_get_target,$(2))
 
 endef
 
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index dffd6f405db5..c6e89b99d70c 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -309,7 +309,8 @@ PYUNOLIB=-lpyuno
 LPSOLVELIB=-llpsolve55
 SOFFICELIB=-lsofficeapp
 UNOPKGAPPLIB=-lunopkgapp
-TESTLIB=-ltest
+TESTLIB=-lunotest
+UNOTESTLIB=-lunotest
 XMLREADERLIB=-lxmlreader
 
 .IF "$(OS)" == "IOS"
@@ -522,6 +523,7 @@ LPSOLVELIB=lpsolve55.lib
 SOFFICELIB=isofficeapp.lib
 UNOPKGAPPLIB=iunopkgapp.lib
 TESTLIB=itest.lib
+UNOTESTLIB=iunotest.lib
 BOOSTTHREADLIB=boostthread.lib
 XMLREADERLIB=ixmlreader.lib
 
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index ca816d8e664b..cc2d8dfa62c5 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -92,31 +92,13 @@ $(OBJ)/%.obj : %.cc
 .ENDIF
 
 .IF "$(ENABLE_PCH)"!=""
-# workaround for file locking problems on network volumes
-.IF "$(NETWORK_BUILD)"==""
 PCHOUTDIR=$(SLO)/pch
 PCHEXOUTDIR=$(SLO)/pch_ex
-.ELSE			# "$(NETWORK_BUILD)"==""
-PCHOUTDIR=$(TMP)/$(BUILD)$(PRJNAME)$(PROEXT)
-PCHEXOUTDIR=$(TMP)/$(BUILD)$(PRJNAME)_ex$(PROEXT)
-.ENDIF			# "$(NETWORK_BUILD)"==""
+
 $(SLO)/precompiled.% .PHONY:
     -$(MKDIRHIER) $(SLO)/pch
 .IF "$(COM)"=="MSC"
-.IF "$(NETWORK_BUILD)"!=""
-    -$(MKDIRHIER) $(PCHOUTDIR)
-.IF "$(HAVE_BIG_TMP)"==""
-    $(COMMAND_ECHO)-$(COPY) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) 
-.ENDIF			# "$(HAVE_BIG_TMP)"==""
-.ENDIF			# "$(NETWORK_BUILD)"!=""
     $(COMMAND_ECHO)$(CXX) @$(mktmp -Fp$(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx)
-.IF "$(NETWORK_BUILD)"!=""
-    $(COMMAND_ECHO)$(COPY) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST)
-.IF "$(HAVE_BIG_TMP)"==""
-    $(COMMAND_ECHO)$(RM) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST)
-    $(COMMAND_ECHO)$(RMDIR) $(PCHOUTDIR)
-.ENDIF			# "$(HAVE_BIG_TMP)"==""
-.ENDIF			# "$(NETWORK_BUILD)"!=""
 .ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000"
     $(COMMAND_ECHO)$(CXX) -o$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx
     @echo "#error Tried to use wrong precompiled header" > $(SLO)/pch/precompiled_$(PRJNAME).hxx
@@ -128,20 +110,7 @@ $(SLO)/precompiled.% .PHONY:
 $(SLO)/precompiled_ex.% .PHONY:
     -$(MKDIRHIER) $(SLO)/pch_ex
 .IF "$(COM)"=="MSC"
-.IF "$(NETWORK_BUILD)"!=""
-    -$(MKDIRHIER) $(PCHEXOUTDIR)
-.IF "$(HAVE_BIG_TMP)"==""
-    $(COMMAND_ECHO)-$(COPY) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) 
-.ENDIF			# "$(HAVE_BIG_TMP)"==""
-.ENDIF			# "$(NETWORK_BUILD)"!=""
     $(COMMAND_ECHO)$(CXX) @$(mktmp -Fp$(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH:s/pchname/pchname_ex/) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx)
-.IF "$(NETWORK_BUILD)"!=""
-    $(COMMAND_ECHO)$(COPY) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST)
-.IF "$(HAVE_BIG_TMP)"==""
-    $(COMMAND_ECHO)$(RM) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST)
-    $(COMMAND_ECHO)$(RMDIR) $(PCHEXOUTDIR)
-.ENDIF			# "$(HAVE_BIG_TMP)"==""
-.ENDIF			# "$(NETWORK_BUILD)"!=""
 .ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000"
     $(COMMAND_ECHO)$(CXX) -o$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx
     @echo "#error Tried to use wrong precompiled header" > $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 661861b9b8b7..6030f138a5a5 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -42,12 +42,6 @@ force_dmake_to_error
 ENABLE_PCH=TRUE
 .ENDIF			# "$(USE_PCH)"!=""
 
-.IF "$(ENABLE_PCH)"!="" && "$(BUILD_SPECIAL)"!=""
-.IF "$(SOLARSRC)"=="$(SRC_ROOT)"
-NETWORK_BUILD:=TRUE
-.ENDIF			# "$(SOLARSRC)"=="$(SRC_ROOT)"
-.ENDIF			# "$(ENABLE_PCH)"!="" && "$(BUILD_SPECIAL)"!=""
-
 .INCLUDE : unitools.mk
 
 .INCLUDE : minor.mk
@@ -973,10 +967,6 @@ RSCUPDVERDEF=-DUPDVER="$(RSCUPDVER)"
 RSCFLAGS=-s
 RSCDEFS=-D$(GUI) -D$(GVER) -D$(COM) $(JAVADEF)
 
-.IF "$(BUILD_SPECIAL)"!=""
-RSCDEFS+=-DBUILD_SPECIAL=$(BUILD_SPECIAL)
-.ENDIF
-
 RSCDEFIMG*=default_images
 
 RSCEXTINC=.
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index a7eeaa4d91cf..028e954c127a 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -138,7 +138,7 @@ CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
     -Wno-non-virtual-dtor -Woverloaded-virtual
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
+CFLAGSWERRCC=-Werror -DLIBO_WERROR
 
 COMPILER_WARN_ERRORS=TRUE
 
diff --git a/solenv/inc/unxiosr.mk b/solenv/inc/unxiosr.mk
index 773457a0d786..06f11687f6b0 100644
--- a/solenv/inc/unxiosr.mk
+++ b/solenv/inc/unxiosr.mk
@@ -95,7 +95,7 @@ CFLAGSWARNCC=-Wall -Wendif-labels
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
+CFLAGSWERRCC=-Werror -DLIBO_WERROR
 
 LINK*=$(CXX)
 LINKC*=$(CC)
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index b5351cbb567d..17575ad741f5 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -149,7 +149,7 @@ CFLAGSWARNCC=-Wall -Wendif-labels
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
+CFLAGSWERRCC=-Werror -DLIBO_WERROR
 
 # All modules on this platform compile without warnings.
 # If you need to set MODULES_WITH_WARNINGS here, comment
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index 8fce32c2e039..c21c36237e87 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -100,8 +100,8 @@ CFLAGSWARNCC=
 CFLAGSWARNCXX=+w2 -erroff=doubunder,identexpected,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn,wnoretvalue,anonnotype
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-errwarn=%all
-CFLAGSWERRCXX=-xwe
+CFLAGSWERRCC=-errwarn=%all -DLIBO_WERROR
+CFLAGSWERRCXX=-xwe -DLIBO_WERROR
 
 # Once all modules on this platform compile without warnings, set
 # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index 02c01f40cc4e..b609951f6800 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -106,8 +106,8 @@ CFLAGSWARNCC=
 CFLAGSWARNCXX=+w2 -erroff=doubunder,identexpected,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn,wnoretvalue,anonnotype
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-errwarn=%all
-CFLAGSWERRCXX=-xwe
+CFLAGSWERRCC=-errwarn=%all -DLIBO_WERROR
+CFLAGSWERRCXX=-xwe -DLIBO_WERROR
 
 # Once all modules on this platform compile without warnings, set
 # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk
index 91a6c8968fda..ab276cb0504f 100644
--- a/solenv/inc/unxsolu4.mk
+++ b/solenv/inc/unxsolu4.mk
@@ -105,8 +105,8 @@ CFLAGSWARNCC=
 CFLAGSWARNCXX=+w2 -erroff=doubunder,identexpected,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn,wnoretvalue,hidef,anonnotype,unassigned,badargtype2w
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-errwarn=%all
-CFLAGSWERRCXX=-xwe
+CFLAGSWERRCC=-errwarn=%all -DLIBO_WERROR
+CFLAGSWERRCXX=-xwe -DLIBO_WERROR
 
 # Once all modules on this platform compile without warnings, set
 # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index 85b6a91b9a5c..f62c96aaabec 100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -84,8 +84,8 @@ CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
     -Wno-non-virtual-dtor
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
-CFLAGSWERRCXX=-Werror
+CFLAGSWERRCC=-Werror -DLIBO_WERROR
+CFLAGSWERRCXX=-Werror -DLIBO_WERROR
 
 MODULES_WITH_WARNINGS := \
     b_server \
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index bf94a0f04fa9..efb53298de13 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -201,7 +201,7 @@ CFLAGSWARNCXX=-Wall -wd4061 -wd4127 -wd4191 -wd4217 -wd4250 -wd4251 -wd4275 \
 CFLAGSWARNCC=$(CFLAGSWARNCXX) -wd4255
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-WX
+CFLAGSWERRCC=-WX -DLIBO_WERROR
 
 # Once all modules on this platform compile without warnings, set
 # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see