solver doesn't solve anything...

... it is an abbreviation of "Solar Version".

Since nobody can remember that:

remove OUTDIR OUTDIR_FOR_BUILD SOLARVER SOLARVERSION solarpath
and any mention thereof.

Change-Id: Idb3031c4f25a76ac05b22ec67e3ca3e1e8e512ad
Reviewed-on: https://gerrit.libreoffice.org/6515
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

.gitignore

@@ -12,7 +12,7 @@
 # can be listed here... These must be deleted by maek distclean
 #
 # Files that are generated by the build but deleted by make clean
-# should all be under workdir or solver
+# should all be under workdir or instdir
 # if that is not the case, don't hide it here, but try to fix it
 #
 # The intent is that after a make distclean, .gitignore
@@ -22,7 +22,6 @@
 # where stuff are built
 /instdir
 /workdir
-/solver
 
 # where the external downloads maybe located
 /src

Makefile.in

@@ -149,14 +149,13 @@ clean: clean-host clean-build
 clean-host:
 	rm -fr $(TESTINSTALLDIR)
 	rm -fr $(INSTDIR)
-	rm -fr $(OUTDIR)
 	rm -fr $(WORKDIR)
+	rm -fr solver
 	rm -fr install
 
 clean-build:
 ifeq ($(CROSS_COMPILING),YES)
 	rm -fr $(INSTDIR_FOR_BUILD)
-	rm -fr $(OUTDIR_FOR_BUILD)
 	rm -fr $(WORKDIR_FOR_BUILD)
 endif
 

compilerplugins/clang/plugin.cxx

@@ -56,8 +56,7 @@ bool Plugin::ignoreLocation( SourceLocation loc )
     const char* bufferName = compiler.getSourceManager().getPresumedLoc( expansionLoc ).getFilename();
     if( bufferName == NULL )
         return true;
-    if( strncmp( bufferName, OUTDIR, strlen( OUTDIR )) == 0
+    if( strncmp( bufferName, WORKDIR, strlen( WORKDIR )) == 0
-        || strncmp( bufferName, WORKDIR, strlen( WORKDIR )) == 0
         || strncmp( bufferName, BUILDDIR, strlen( BUILDDIR )) == 0
         || strncmp( bufferName, SRCDIR, strlen( SRCDIR )) == 0 )
         return false; // ok

compilerplugins/clang/pluginhandler.cxx

@@ -162,30 +162,12 @@ void PluginHandler::HandleTranslationUnit( ASTContext& context )
             continue; // Failed modification because of a macro expansion?
         /* Check where the file actually is, and warn about cases where modification
            most probably doesn't matter (generated files in workdir).
-           The order here is important, as OUTDIR and WORKDIR are often in SRCDIR/BUILDDIR,
+           The order here is important, as INSTDIR and WORKDIR are often in SRCDIR/BUILDDIR,
            and BUILDDIR is sometimes in SRCDIR. */
         string modifyFile;
         const char* pathWarning = NULL;
         bool skip = false;
-        if( strncmp( e->getName(), OUTDIR "/", strlen( OUTDIR "/" )) == 0 )
+        if( strncmp( e->getName(), WORKDIR "/", strlen( WORKDIR "/" )) == 0 )
-            {
-            /* Try to find a matching file for a file in solver/ (include files
-               are usually included from there rather than from the source dir) if possible. */
-            if( strncmp( e->getName(), OUTDIR "/inc/", strlen( OUTDIR ) + strlen( "/inc/" )) == 0 )
-                {
-                string filename( e->getName());
-                int modulePos = strlen( OUTDIR ) + strlen( "/inc/" );
-                size_t moduleEnd = filename.find( '/', modulePos );
-                if( moduleEnd != string::npos )
-                    {
-                    modifyFile = SRCDIR "/" + filename.substr( modulePos, moduleEnd - modulePos )
-                        + "/inc/" + filename.substr( modulePos );
-                    }
-                }
-            if( modifyFile.empty())
-                pathWarning = "modified source in solver/ : %0";
-            }
-        else if( strncmp( e->getName(), WORKDIR "/", strlen( WORKDIR "/" )) == 0 )
             pathWarning = "modified source in workdir/ : %0";
         else if( strcmp( SRCDIR, BUILDDIR ) != 0 && strncmp( e->getName(), BUILDDIR "/", strlen( BUILDDIR "/" )) == 0 )
             pathWarning = "modified source in build dir : %0";
@@ -198,8 +180,7 @@ void PluginHandler::HandleTranslationUnit( ASTContext& context )
             }
         if( modifyFile.empty())
             modifyFile = e->getName();
-        // Check whether the modified file is in the wanted scope (done after path checking above), so
+        // Check whether the modified file is in the wanted scope
-        // that files mapped from OUTDIR to SRCDIR are included.
         if( scope == "mainfile" )
             {
             if( it->first != context.getSourceManager().getMainFileID())

config_host.mk.in

@@ -423,8 +423,6 @@ export ORCUS_LIBS=$(gb_SPACE)@ORCUS_LIBS@
 export OS=@OS@
 export OSVERSION=@OSVERSION@
 export OS_FOR_BUILD=@OS_FOR_BUILD@
-export OUTDIR=@OUTDIR@
-export OUTDIR_FOR_BUILD=@OUTDIR_FOR_BUILD@
 export OUTPATH=@OUTPATH@
 export PATH=@LO_PATH@
 export LIBO_PATH_SEPARATOR=@P_SEP@
@@ -475,8 +473,6 @@ export SHOWINCLUDES_PREFIX=@SHOWINCLUDES_PREFIX@
 export SOLARENV=@SRC_ROOT@/solenv
 export SOLARINC=@SOLARINC@
 export SOLARLIB=@SOLARLIB@
-export SOLARVER=@SOLARVER@
-export SOLARVERSION=@SOLARVER@
 export SPLIT_APP_MODULES=@SPLIT_APP_MODULES@
 export SPLIT_OPT_FEATURES=@SPLIT_OPT_FEATURES@
 export SRCDIR=@SRC_ROOT@

config_host/config_clang.h.in

@@ -8,7 +8,6 @@ Settings related to Clang compiler plugins.
 #define CONFIG_CLANG_H
 
 #undef BUILDDIR
-#undef OUTDIR
 #undef SRCDIR
 #undef WORKDIR
 

configure.ac

@@ -2334,8 +2334,6 @@ else
 fi
 AC_SUBST(DISABLE_DYNLOADING)
 
-SOLARVER="${BUILDDIR}/solver"
-
 # remenber SYSBASE value
 AC_SUBST(SYSBASE)
 
@@ -3869,7 +3867,6 @@ aix*)
     PLATFORMID=aix_powerpc
     OUTPATH=unxaigppc
     P_SEP=:
-    SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     ;;
 
 cygwin*)
@@ -3901,7 +3898,6 @@ cygwin*)
         ;;
     esac
     SCPDEFS="$SCPDEFS -D_MSC_VER"
-    SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     ;;
 
 darwin*)
@@ -3950,7 +3946,6 @@ darwin*)
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
-    SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     ;;
 
 dragonfly*)
@@ -3978,7 +3973,6 @@ dragonfly*)
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
-    SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     ;;
 
 freebsd*)
@@ -4007,7 +4001,6 @@ freebsd*)
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
-    SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     ;;
 
 kfreebsd*)
@@ -4038,7 +4031,6 @@ kfreebsd*)
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
-    SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     ;;
 
 linux-gnu*)
@@ -4181,7 +4173,6 @@ linux-gnu*)
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
-    SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     ;;
 
 linux-android*)
@@ -4218,7 +4209,6 @@ linux-android*)
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
-    SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     ;;
 
 mingw*)
@@ -4251,7 +4241,6 @@ mingw*)
         ;;
     esac
 
-    SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     ;;
 
 *netbsd*)
@@ -4292,7 +4281,6 @@ mingw*)
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
-    SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     ;;
 
 openbsd*)
@@ -4321,7 +4309,6 @@ openbsd*)
         ;;
     esac
     SOLARINC="$SOLARINC -I/usr/local/include"
-    SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     SOLARLIB="$SOLARLIB -L/usr/local/lib"
 
     ;;
@@ -4354,7 +4341,6 @@ solaris*)
         ;;
     esac
     SOLARINC="$SOLARINC -I/usr/local/include"
-    SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     SOLARLIB="$SOLARLIB -L$COMPATH/lib"
     SOLARLIB="$SOLARLIB -L/usr/local/bin -L/usr/dt/lib -L/usr/openwin/lib"
     ;;
@@ -4375,7 +4361,6 @@ INPATH="${OUTPATH}${PROEXT}"
 WORKDIR="${BUILDDIR}/workdir/${INPATH}"
 INSTDIR="${BUILDDIR}/instdir/${INPATH}"
 INSTROOT="${INSTDIR}${INSTROOTSUFFIX}"
-OUTDIR="${SOLARVER}/${INPATH}"
 SOLARINC="-I. -I$SRC_ROOT/include $SOLARINC"
 AC_SUBST(COM)
 AC_SUBST(CPU)
@@ -4388,13 +4373,10 @@ AC_SUBST(INPATH)
 AC_SUBST([INSTDIR])
 AC_SUBST([INSTROOT])
 AC_SUBST(OS)
-AC_SUBST(OUTDIR)
 AC_SUBST(OUTPATH)
 AC_SUBST(P_SEP)
-AC_SUBST(SOLARVER)
 AC_SUBST(WORKDIR)
 AC_SUBST(PLATFORMID)
-AC_DEFINE_UNQUOTED(OUTDIR,"$OUTDIR")
 AC_DEFINE_UNQUOTED(WORKDIR,"$WORKDIR")
 
 dnl ===================================================================
@@ -4513,7 +4495,7 @@ if test "$cross_compiling" = "yes"; then
     mv config.log ../config.Build.log
     mkdir -p ../config_build
     mv config_host/*.h ../config_build
-    . ./bin/get_config_variables CC CXX INPATH INSTDIR INSTROOT LIBO_BIN_FOLDER LIBO_LIB_FOLDER LIBO_URE_LIB_FOLDER OS OUTDIR PATH SDKDIRNAME SYSTEM_LIBXSLT WORKDIR
+    . ./bin/get_config_variables CC CXX INPATH INSTDIR INSTROOT LIBO_BIN_FOLDER LIBO_LIB_FOLDER LIBO_URE_LIB_FOLDER OS PATH SDKDIRNAME SYSTEM_LIBXSLT WORKDIR
 
     for V in CC CXX INPATH LIBO_BIN_FOLDER LIBO_LIB_FOLDER LIBO_URE_LIB_FOLDER OS SDKDIRNAME SYSTEM_LIBXSLT; do
         VV='$'$V
@@ -4524,7 +4506,7 @@ if test "$cross_compiling" = "yes"; then
         fi
     done
 
-    for V in INSTDIR INSTROOT OUTDIR WORKDIR; do
+    for V in INSTDIR INSTROOT WORKDIR; do
         VV='$'$V
         VV=`eval "echo $VV"`
         VV=`echo $VV | sed -e 's,/CONF-FOR-BUILD,,g'`
@@ -4554,7 +4536,6 @@ else
     LIBO_BIN_FOLDER_FOR_BUILD="$LIBO_BIN_FOLDER"
     LIBO_LIB_FOLDER_FOR_BUILD="$LIBO_LIB_FOLDER"
     LIBO_URE_LIB_FOLDER_FOR_BUILD="$LIBO_URE_LIB_FOLDER"
-    OUTDIR_FOR_BUILD="$OUTDIR"
     SDKDIRNAME_FOR_BUILD="$SDKDIRNAME"
     WORKDIR_FOR_BUILD="$WORKDIR"
 fi
@@ -4565,7 +4546,6 @@ AC_SUBST(INSTROOT_FOR_BUILD)
 AC_SUBST(LIBO_BIN_FOLDER_FOR_BUILD)
 AC_SUBST(LIBO_LIB_FOLDER_FOR_BUILD)
 AC_SUBST(LIBO_URE_LIB_FOLDER_FOR_BUILD)
-AC_SUBST(OUTDIR_FOR_BUILD)
 AC_SUBST(SDKDIRNAME_FOR_BUILD)
 AC_SUBST(WORKDIR_FOR_BUILD)
 
@@ -7622,7 +7602,7 @@ else
     SYSTEM_ZLIB=NO
     BUILD_TYPE="$BUILD_TYPE ZLIB"
     ZLIB_CFLAGS="-I${WORKDIR}/UnpackedTarball/zlib"
-    ZLIB_LIBS="-L${OUTDIR}/lib -lzlib"
+    ZLIB_LIBS="-lzlib"
 fi
 AC_SUBST(ZLIB_CFLAGS)
 AC_SUBST(ZLIB_LIBS)
@@ -12412,7 +12392,7 @@ AC_SUBST(CHECK_PARALLELISM)
 # Set up ILIB for MSVC build
 #
 if test "$build_os" = "cygwin"; then
-    ILIB=".;${SOLARVER}/$INPATH/lib"
+    ILIB="."
     if test -n "$JAVA_HOME" -a "$JAVA_HOME" != "NO_JAVA_HOME"; then
         ILIB="$ILIB;$JAVA_HOME/lib"
     fi

cppuhelper/test/bootstrap/bootstrap.test.cxx

@@ -147,22 +147,7 @@ static rtl::OUString s_getSDrive(void)
 {
     rtl::OUString path;//(RTL_CONSTASCII_USTRINGPARAM("file://"));
 
-    char const * tmp = getenv("SOLARVER");
+    // FIXME no more S drive
-    path += rtl::OUString(tmp, rtl_str_getLength(tmp), RTL_TEXTENCODING_ASCII_US);
-    path += rtl::OUString(SAL_PATHDELIMITER);
-
-    tmp = getenv("INPATH");
-    path += rtl::OUString(tmp, rtl_str_getLength(tmp), RTL_TEXTENCODING_ASCII_US);
-    path += rtl::OUString(SAL_PATHDELIMITER);
-#ifdef WIN32
-    path += "bin";
-#else
-    path += "lib";
-#endif
-
-    tmp = getenv("UPDMINOREXT");
-    if (tmp)
-        path += rtl::OUString(tmp, rtl_str_getLength(tmp), RTL_TEXTENCODING_ASCII_US);
 
     osl::FileBase::getFileURLFromSystemPath(path, path);
 

distro-configs/OxygenOfficeLinux.conf

@@ -12,7 +12,6 @@
 --disable-symbols
 --enable-split-app-modules
 --enable-split-opt-features
---enable-strip-solver
 --with-linker-hash-style=both
 --enable-systray
 --enable-kde

external/curl/ExternalProject_curl.mk

@@ -55,7 +55,7 @@ else ifeq ($(OS)$(COM),WNTGCC)
 
 $(call gb_ExternalProject_get_state_target,curl,build):
 	$(call gb_ExternalProject_run,build,\
-		PATH=$(OUTDIR)/bin:$$PATH ./configure --with-nss --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher \
+		./configure --with-nss --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher \
 			--disable-file --disable-ldap --disable-telnet --disable-dict --build=i586-pc-mingw32 --host=i586-pc-mingw32 \
 			$(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \
 			CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \

instsetoo_native/util/openoffice.lst.in

@@ -78,7 +78,7 @@ LibreOffice
         downloadname    LibreOffice_{productversion}_{os}_install_{languages}
         langpackdownloadname    LibreOffice_{productversion}_languagepack_{os}_install_{languages}
         helppackdownloadname    LibreOffice_{productversion}_helppack_{os}_install_{languages}
-        include         {solarpath}/bin.{minor}/osl,{installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
+        include         {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
     }
 }
 
@@ -131,7 +131,7 @@ LibreOffice_Dev
         downloadname    LibreOfficeDev_{productversion}_{os}_install_{languages}
         langpackdownloadname    LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
         helppackdownloadname    LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
-        include         {solarpath}/bin.{minor}/osl,{installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
+        include         {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
     }
 }
 
@@ -170,7 +170,7 @@ LibreOffice_SDK
         active 1
         compression 5
         script sdkoo
-        include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir},{instdir}/ure/lib,{packinfopath}
+        include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir},{instdir}/ure/lib,{packinfopath}
     }
 }
 
@@ -216,6 +216,6 @@ LibreOffice_Dev_SDK
         active 1
         compression 5
         script sdkoo
-        include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir},{instdir}/ure/lib,{packinfopath}
+        include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir},{instdir}/ure/lib,{packinfopath}
     }
 }

redland/ExternalProject_raptor.mk

@@ -37,8 +37,8 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
 		$(if $(filter IOS,$(OS)),LIBS="-liconv") \
 		CFLAGS="$(if $(debug),-g,-O) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) \
 			$(if $(filter GCCLINUXPOWERPC64,$(COM)$(OS)$(CPUNAME)),-mminimal-toc)" \
-		LDFLAGS="-L$(OUTDIR)/lib \
+		LDFLAGS=" \
-			$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-rpath-link$(COMMA)$(OUTDIR)/lib -Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \
+			$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \
 			$(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \
 		CPPFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \
 		./configure --disable-gtk-doc \

redland/ExternalProject_rasqal.mk

@@ -43,7 +43,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
 	$(call gb_ExternalProject_run,build,\
 		CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \
 		LDFLAGS=" \
-			$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-rpath-link$(COMMA)$(OUTDIR)/lib -Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \
+			$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \
 			$(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \
 		$(if $(SYSBASE),CPPFLAGS="-I$(SYSBASE)/usr/include") \
 		PKG_CONFIG="" \

redland/ExternalProject_redland.mk

@@ -24,7 +24,7 @@ ifeq ($(OS),WNT)
 $(call gb_ExternalProject_get_state_target,redland,build):
 	$(call gb_ExternalProject_run,build,\
 		CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
-		LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols -L$(OUTDIR)/lib" \
+		LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols" \
 		OBJDUMP="$(HOST_PLATFORM)-objdump" \
 		PKG_CONFIG="" \
 		RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
@@ -45,7 +45,7 @@ else
 $(call gb_ExternalProject_get_state_target,redland,build):
 	$(call gb_ExternalProject_run,build,\
 		CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \
-		LDFLAGS="-L$(OUTDIR)/lib \
+		LDFLAGS=" \
 			$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \
 			$(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \
 		CPPFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \

solenv/bin/create-ids

@@ -17,10 +17,10 @@ if [ -z "$INPATH" ] ; then
     exit 1
 fi
 
-# --with-outpath includes solver/$INPATH/inc
+# TODO: should this include workdir headers?
 if [ "$1" = "--with-outpath" ]; then
-    dirs="`ls -d */* | sed -e '/\(\/\(cscope\.\|tags\|ID\)\)\|^\(clone\|solver\|workdir\|instdir\|install\)\//d'` solver/$INPATH/inc"
+    dirs="`ls -d */* | sed -e '/\(\/\(cscope\.\|tags\|ID\)\)\|^\(clone\|workdir\|instdir\)\//d'`"
 else
-    dirs="`ls -d */* | sed -e '/\(\/\(cscope\.\|tags\|ID\)\)\|^\(clone\|solver\|workdir\|instdir\|install\)\//d'`"
+    dirs="`ls -d */* | sed -e '/\(\/\(cscope\.\|tags\|ID\)\)\|^\(clone\|workdir\|instdir\)\//d'`"
 fi
 mkid --lang-map=`dirname $0`/id-lang.map --include='C C++ asm perl java make' --statistics $dirs

solenv/bin/create-tags

@@ -18,5 +18,5 @@ fi
 omnicppoptions="--c++-kinds=+p --fields=+iaS --extra=+q"
 ctags -h "+.hdl.hrc" --langmap=c:+.hdl.hrc.src $omnicppoptions \
       --languages=-HTML,Java,JavaScript \
-      -R --exclude=`echo ${INPATH} | sed 's/\./\\\./g'` --exclude=solver \
+      -R --exclude=`echo ${INPATH} | sed 's/\./\\\./g'` --exclude=workdir \
-      --exclude=clone --exclude=install --totals=yes *
+      --exclude=clone --totals=yes *

solenv/bin/modules/installer/control.pm

@@ -256,7 +256,7 @@ sub check_makecab_version
 
 ######################################################################
 # Reading the environment variables for the paths in ziplist.
-# solarpath, solarenvpath, os, pmiscpath
+# solarenvpath, os, pmiscpath
 ######################################################################
 
 sub check_system_environment
@@ -265,7 +265,6 @@ sub check_system_environment
     my $error = 0;
 
     my @environmentvariables = qw(
-        SOLARVERSION
         WORK_STAMP
         OUTPATH
         LOCAL_OUT

solenv/bin/modules/installer/download.pm

@@ -187,7 +187,7 @@ sub call_sum
 }
 
 #########################################################
-# Searching for the getuid.so in the solver
+# Searching for the getuid.so
 #########################################################
 
 sub get_path_for_library

solenv/bin/modules/installer/environment.pm

@@ -31,10 +31,7 @@ sub create_pathvariables
     my %variables = ();
 
     # The following variables are needed in the path file list
-    # solarpath, solarenvpath, os, pmiscpath
+    # solarenvpath, os, pmiscpath
-
-    my $solarpath = $environment->{'SOLARVERSION'} . $installer::globals::separator . $installer::globals::compiler . $installer::globals::productextension;
-    $variables{'solarpath'} = $solarpath;
 
     my $shlxthdlpath = $ENV{'INSTDIR'} . $installer::globals::separator . "program" . $installer::globals::separator . "shlxthdl";
     $variables{'shlxthdlpath'} = $shlxthdlpath;

solenv/bin/modules/installer/parameter.pm

@@ -514,7 +514,7 @@ sub outputparameter
     }
     else
     {
-        push(@output, "Taking setup script from solver\n");
+        push(@output, "Taking setup script from workdir\n");
     }
     push(@output, "Unpackpath: $installer::globals::unpackpath\n");
     push(@output, "Compiler: $installer::globals::compiler\n");

solenv/bin/modules/installer/simplepackage.pm

@@ -347,7 +347,7 @@ sub create_package
             my $scripthelperrealfilename = $volume_name_classic_app;
             my $translationfilename = $installer::globals::macinstallfilename;
 
-            # Finding both files in solver
+            # Finding both files in source tree
 
             my $scriptref = $ENV{'SRCDIR'} . "/setup_native/scripts/" . $scriptfilename;
             if (! -f $scriptref) { installer::exiter::exit_program("ERROR: Could not find Apple script $scriptfilename ($scriptref)!", "create_package"); }
@@ -374,7 +374,7 @@ sub create_package
             chmod 0775, $scripthelperrealfilename;
 
             # Copy also Info.plist and icon file
-            # Finding both files in solver
+            # Finding both files in source tree
             my $iconfile = "ooo3_installer.icns";
             my $iconfileref = $ENV{'SRCDIR'} . "/setup_native/source/mac/" . $iconfile;
             if (! -f $iconfileref) { installer::exiter::exit_program("ERROR: Could not find Apple script icon file $iconfile ($iconfileref)!", "create_package"); }

solenv/bin/modules/installer/worker.pm

@@ -526,7 +526,7 @@ sub collect_scpactions
 
 ###########################################################
 # Adding additional variables into the variableshashref,
-# that are defined in include files in the solver. The
+# that are defined in include files in the source tree. The
 # names of the include files are stored in
 # ADD_INCLUDE_FILES (comma separated list).
 ###########################################################

solenv/bin/ooinstall

@@ -40,9 +40,6 @@ if ($ENV{'SYSTEM_MOZILLA'} eq 'YES') {
     $ENV{'LD_LIBRARY_PATH'} = "$ENV{'MOZ_LIB'}:$ENV{'LD_LIBRARY_PATH'}";
 }
 
-# Workaround for the Python
-$ENV{'PYTHONPATH'} = "$ENV{'SRC_ROOT'}/instsetoo_native/$ENV{'INPATH'}/bin:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib/python:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib/python/lib-dynload";
-
 for $arg (@ARGV) {
     if ($arg eq '-s' || $arg eq '--strip') {
         $strip = "-strip";

solenv/doc/gbuild/solenv/gbuild/gbuild.mk

@@ -25,7 +25,6 @@ static const Command SHELL;
 
 // gbuild root directorys
 static Path SRCDIR;
-static Path OUTDIR;
 static Path WORKDIR;
 
 // Expected from configure/environment

solenv/doc/gbuild/solenv/gbuild/helper.mk

@@ -40,12 +40,6 @@ namespace gb
             static void make_dep_target(TargetType t);
             /// Creates the default get_dep_target() function for the types.
             static void make_dep_targets(List<TargetType> ts);
-            /// Creates the default get_dep_target() function for the type modifying the \$(OUTDIR).
-            static void make_outdir_clean_target(TargetType t);
-            /// Creates the default get_dep_target() function for types modifying the \$(OUTDIR).
-            static void make_outdir_clean_targets(List<TargetType> ts);
-            /// Returns the clean target of a target modifying the \$(OUTDIR).
-            static Path get_outdir_clean_target(Path target);
 
             /// The path to a zero length file.
             static const Path NULLFILE;

solenv/doc/gbuild/solenv/gbuild/library.mk

@@ -44,7 +44,7 @@ namespace gb
             /// helper function to wrap LinkTargets functions (this is more or less pimpl ...)
             void forward_to_linktarget(Function f);
 
-            /// List of buildable libraries (i.e. libraries that are not expected to exist outside of \$(OUTDIR) on the system).
+            /// List of buildable libraries (i.e. libraries that are not expected to exist on the system).
             static const List<Library> TARGETS;
             /// List of additional defines for compiling objects for libraries
             static const List<String> DEFS;

solenv/doc/gbuild/solenv/gbuild/package.mk

@@ -38,10 +38,10 @@ namespace gb
     class Package : public Target, public IsCleanable
     {
         public:
-            /// Creates a new package that copies files from source_dir to the \$(OUTDIR).
+            /// Creates a new package that copies files from source_dir to the \$(INSTDIR).
             Package(String name, Path source_dir);
             /// Adds a file to the package. destination is the relative path in
-            /// the \$(OUTDIR) and source is the relative path in the source_dir.
+            /// the \$(INSTROOT) and source is the relative path in the source_dir.
             add_file(Path destination, Path source);
     }
 }

solenv/doc/gbuild/solenv/gbuild/static_library.mk

@@ -40,7 +40,7 @@ namespace gb
             /// helper function to wrap LinkTargets functions (this is more or less pimpl ...).
             void forward_to_linktarget(Function f);
 
-            /// List of buildable static libraries (i.e. static libraries that are not expected to exist outside of \$(OUTDIR) on the system).
+            /// List of buildable static libraries (i.e. static libraries that are not expected to exist on the system).
             static const List<StaticLibrary> TARGETS;
             /// List of additional defines for compiling objects for static libraries
             static const List<String> DEFS;
@@ -48,8 +48,6 @@ namespace gb
             static const List<String> TARGETTYPEFLAGS;
             /// Mapping from symbolic static library names to filenames
             static const Map<StaticLibrary,Path> FILENAMES;
-            /// location to place static libraries in the \$(OUTDIR)
-            static const Path OUTDIRLOCATION;
             /// platformdependant file extension for static libraries
             static const String PLAINEXT;
     };

solenv/gbuild/Deliver.mk

@@ -65,7 +65,7 @@ endif
 define gb_Deliver_deliver
 $(if $(1),$(call gb_Deliver__deliver,$(1),$(2)),\
  $(error gb_Deliver_deliver:\
-  file does not exist in solver, and cannot be delivered: $(2)))
+  file does not exist in instdir, and cannot be delivered: $(2)))
 endef
 
 define gb_Deliver_print_deliverable

solenv/gbuild/Extension.mk

@@ -180,7 +180,7 @@ $(foreach file,$(3),$(call gb_Extension_add_file,$(1),$(if $(strip $(2)),$(strip
 
 endef
 
-# add a library from the solver; DO NOT use gb_Library_get_target
+# add a library from workdir; DO NOT use gb_Library_get_target
 define gb_Extension_add_library
 $(call gb_Extension_add_file,$(1),$(call gb_Library_get_runtime_filename,$(2)),\
 	$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,$(2))))
@@ -192,7 +192,7 @@ $(foreach lib,$(2),$(call gb_Extension_add_library,$(1),$(lib)))
 
 endef
 
-# add an executable from the solver
+# add an executable
 define gb_Extension_add_executable
 $(call gb_Extension_add_file,$(1),$(notdir $(call gb_Executable_get_target,$(2))),\
 	$(call gb_Executable_get_target,$(2)))

solenv/gbuild/Helper.mk

@@ -200,9 +200,6 @@ $(1) : $(2) | $(dir $(1)).dir
 $(call gb_Deliver_add_deliverable,$(1),$(2),$(1))
 endef
 
-# gb_Helper_OUTDIRLIBDIR is set by the platform to the path the dynamic linker need to use
-# for libraries from the OUTDIR
-
 define gb_Helper_optional
 $(if $(filter $(1),$(BUILD_TYPE)),$(2))
 endef

solenv/gbuild/Library.mk

@@ -75,7 +75,6 @@ endef
 define gb_Library__Library_impl_copy
 $(call gb_Package_Package,Library_Copy_$(1),$(gb_Package_PRESTAGEDIR))
 $(call gb_Package_add_file,Library_Copy_$(1),$(2),$(2))
-$(OUTDIR)/lib/$(notdir $(2)) : $(INSTROOT)/$(2)
 endef
 
 # Note: there may be targets in 3 different directories: the library itself,

solenv/gbuild/LinkTarget.mk

@@ -508,8 +508,8 @@ $(WORKDIR)/Headers/% :
 
 # Explanation of some of the targets:
 # - gb_LinkTarget_get_headers_target is the target that guarantees all headers
-#   from the linked against the libraries and the linktargets own headers
+#   from the linked against libraries and the linktargets own generated headers
-#   (including generated headers) are in the OUTDIR.
+#   are generated.
 # - gb_LinkTarget_get_target links the objects into a file in WORKDIR.
 # gb_LinkTarget_get_target depends on gb_LinkTarget_get_headers_target.
 # gb_LinkTarget_get_target depends additionally on the objects, which in turn
@@ -756,7 +756,7 @@ endef
 # call gb_LinkTarget_set_include,linktarget,includes
 define gb_LinkTarget_set_include
 $(call gb_LinkTarget__check_srcdir_paths,$(1),\
-    $(patsubst -I%,%,$(filter -I$(SRCDIR)/%,$(filter-out -I$(OUTDIR)/% -I$(WORKDIR)/%,$(2)))))
+    $(patsubst -I%,%,$(filter -I$(SRCDIR)/%,$(filter-out -I$(WORKDIR)/%,$(2)))))
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $(2)
 ifeq ($(gb_FULLDEPS),$(true))
@@ -1392,7 +1392,7 @@ $$(call gb_Output_error,\
  gb_LinkTarget_add_precompiled_header: use gb_LinkTarget_set_precompiled_header instead.)
 endef
 
-# use a header package, possibly from another module (i.e. via OUTDIR)
+# use a header package, possibly from another module
 # call gb_LinkTarget_use_package,linktarget,package
 define gb_LinkTarget_use_package
 $(call gb_LinkTarget_get_headers_target,$(1)) :| \

solenv/gbuild/SdiTarget.mk

@@ -17,10 +17,6 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-# SdiTarget is evil, in that it does not support multiple repositories for now (hardcoded to SRCDIR)
-# Also there is no way to cleanly deliver the generated header to OUTDIR.
-# (This can be workarounded by using gb_Package, but really should not.)
-
 # SdiTarget class
 gb_SdiTarget_SVIDLDEPS := $(call gb_Executable_get_runtime_dependencies,svidl)
 gb_SdiTarget_SVIDLCOMMAND := $(call gb_Executable_get_command,svidl)

solenv/gbuild/TargetLocations.mk

@@ -25,12 +25,6 @@ gb_CliNativeLibrary_get_target = $(INSTROOT)/$(LIBO_URE_LIB_FOLDER)/$(1)$(gb_Cli
 gb_CliUnoApi_get_target = $(INSTROOT)/$(if $(filter cli_uretypes,$(1)),$(LIBO_URE_LIB_FOLDER),$(LIBO_LIB_FOLDER))/$(1)$(gb_CliUnoApi_EXT)
 gb_PackagePart_get_destinations = \
 	$(INSTDIR) \
-	$(OUTDIR)/bin \
-	$(OUTDIR)/lib \
-	$(OUTDIR)/par \
-	$(OUTDIR)/pck \
-	$(OUTDIR)/res \
-	$(OUTDIR)/share \
 	$(WORKDIR)/unittest \
 
 # kind of lame but with just 3 of these why bother with registration etc.

solenv/gbuild/extensions/pre_Counters.mk

@@ -25,8 +25,6 @@ $(WORKDIR)/%:
 	$(eval gb_CountersOutdated_COUNTER_$(gb_CountersOutdated__TYPE)+= x)
 	@true
 	
-$(OUTDIR)/%:
-	@true
-
 endif
+
 # vim: set noet ts=4 sw=4:

solenv/gbuild/gbuild.help.txt

@@ -40,7 +40,7 @@ AVAILABLE TARGETS
        <module>.check   run unittests of the named module
        <module>.clean   clean the named module
        <module>.all     build the named module and the pre-requisite modules for it
-       <module>.showdeliverables show the targets delivered to OUTDIR and their
+       <module>.showdeliverables show the targets delivered to INSTDIR and their
                         source
        cmd              execute the command contained in the variable cmd=""
                         in a shell with config_host.mk or config_build.mk

solenv/gbuild/gbuild.mk

@@ -267,15 +267,12 @@ $(eval $(call gb_Deliver_init))
 
 # We are using a set of scopes that we might as well call classes.
 
+# TODO: to what extent is the following still true?
 # It is important to include them in the right order as that is
 # -- at least in part -- defining precedence. This is not an issue in the
-# WORKDIR as there are no nameing collisions there, but OUTDIR is a mess
+# WORKDIR as there are no nameing collisions there, but INSTDIR is a mess
 # and precedence is important there. This is also platform dependant.
-# For example:
+#
-# $(OUTDIR)/bin/% for executables collides
-#	with $(OUTDIR)/bin/%.res for resources on unix
-# $(OUTDIR)/lib/%.lib collides
-#	on windows (static and dynamic libs)
 # This is less of an issue with GNU Make versions > 3.82 which matches for
 # shortest stem instead of first match. However, upon intoduction this version
 # is not available everywhere by default.

solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk

@@ -14,6 +14,6 @@ gb_COMPILERDEFAULTOPTFLAGS := -O2
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:/usr/pkg/lib
+gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:/usr/pkg/lib
 
 # vim: set noet sw=4:

solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk

@@ -13,6 +13,6 @@ gb_COMPILERDEFAULTOPTFLAGS := -O2
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:/usr/pkg/lib
+gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:/usr/pkg/lib
 
 # vim: set noet sw=4:

solenv/gbuild/platform/IOS_ARM_GCC.mk

@@ -286,7 +286,7 @@ endef
 gb_UIMenubarTarget_UIMenubarTarget_platform :=
 
 # Python
-gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
+gb_PYTHON_PRECOMMAND :=
 
 include $(GBUILDDIR)/platform/com_GCC_class.mk
 

solenv/gbuild/platform/NETBSD_INTEL_GCC.mk

@@ -16,7 +16,7 @@ include $(GBUILDDIR)/platform/unxgcc.mk
 
 NB_ADD_LIBPATH := /usr/pkg/lib:/usr/X11R7/lib
 
-gb_Helper_set_ld_path := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH)
+gb_Helper_set_ld_path := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(NB_ADD_LIBPATH)
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(OUTDIR)/lib:$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:$(NB_ADD_LIBPATH)
+gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:$(NB_ADD_LIBPATH)
 
 # vim: set noet sw=4:

solenv/gbuild/platform/NETBSD_X86_64_GCC.mk

@@ -15,7 +15,7 @@ include $(GBUILDDIR)/platform/unxgcc.mk
 
 NB_ADD_LIBPATH := /usr/pkg/lib:/usr/X11R7/lib
 
-gb_Helper_set_ld_path := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH)
+gb_Helper_set_ld_path := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(NB_ADD_LIBPATH)
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(OUTDIR)/lib:$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:$(NB_ADD_LIBPATH)
+gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:$(NB_ADD_LIBPATH)
 
 # vim: set noet sw=4:

solenv/gbuild/platform/com_GCC_defs.mk

@@ -185,7 +185,7 @@ else
 gb_Helper_LIBRARY_PATH_VAR := LD_LIBRARY_PATH
 endif
 
-gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}"$(OUTDIR_FOR_BUILD)/lib:$(INSTROOT_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER_FOR_BUILD):$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER_FOR_BUILD)"
+gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}"$(INSTROOT_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER_FOR_BUILD):$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER_FOR_BUILD)"
 
 # $(1): list of : separated directory pathnames to append to the ld path
 define gb_Helper_extend_ld_path
@@ -197,6 +197,6 @@ define gb_Helper_make_url
 file://$(strip $(1))
 endef
 
-gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
-
 gb_Helper_get_rcfile = $(1)rc
+
+# vim: set noet sw=4:

solenv/gbuild/platform/com_MSC_class.mk

@@ -183,7 +183,6 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(if $(filter YES,$(LIBRARY_X64)),,$(if $(filter YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS$(MSC_SUBSYSTEM_VERSION), -SUBSYSTEM:CONSOLE$(MSC_SUBSYSTEM_VERSION))) \
 		$(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64) \
 		$(if $(filter YES,$(LIBRARY_X64)), \
-			-LIBPATH:$(OUTDIR)/lib/x64 \
 			-LIBPATH:$(COMPATH)/lib/amd64 \
 			-LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64 \
 		    $(if $(filter 80,$(WINDOWS_SDK_VERSION)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/win8/um/x64)) \
@@ -301,8 +300,6 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\
 
 $(call gb_Library_add_default_nativeres,$(1),$(1)/default)
 
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(notdir $(3)),$(3),$(1))
-
 $(call gb_LinkTarget_get_target,$(2)) \
 $(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile_in,$(2))
 
@@ -385,8 +382,6 @@ endef
 # CppunitTest class
 
 gb_CppunitTest_DEFS := -D_DLL
-# cppunittester.exe is in the cppunit subdirectory of ${OUTDIR}/bin,
-# thus it won't find its DLLs unless ${OUTDIR}/bin is added to PATH.
 gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path):"$(shell cygpath -w $(gb_Library_DLLDIR)):$(shell cygpath -w $(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/$(if $(MSVC_USE_DEBUG_RUNTIME),DebugDll,ReleaseDll))"
 
 gb_CppunitTest_get_filename = test_$(1).dll
@@ -569,7 +564,7 @@ endef
 gb_UIMenubarTarget_UIMenubarTarget_platform :=
 
 # Python
-gb_Python_PRECOMMAND := PATH="$(shell cygpath -w $(INSTDIR)/program);$(shell cygpath -w $(OUTDIR)/bin)" PYTHONHOME="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)" PYTHONPATH="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib;$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib/lib-dynload:$(INSTDIR)/program"
+gb_Python_PRECOMMAND := PATH="$(shell cygpath -w $(INSTDIR)/program)" PYTHONHOME="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)" PYTHONPATH="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib;$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib/lib-dynload:$(INSTDIR)/program"
 gb_Python_INSTALLED_EXECUTABLE := $(INSTROOT)/$(LIBO_BIN_FOLDER)/python.exe
 
 gb_ICU_PRECOMMAND := PATH="$(shell cygpath -w $(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/lib)"

solenv/gbuild/platform/com_MSC_defs.mk

@@ -293,9 +293,7 @@ gb_LTOFLAGS := $(if $(filter TRUE,$(ENABLE_LTO)),-GL)
 
 # Helper class
 
-gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
-
 # need windows path with backslashes here
-gb_Helper_set_ld_path := PATH="$(shell cygpath -w $(OUTDIR)/bin);$(shell cygpath -w $(INSTDIR)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath -w $(INSTDIR)/$(LIBO_BIN_FOLDER))"
+gb_Helper_set_ld_path := PATH="$(shell cygpath -w $(INSTDIR)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath -w $(INSTDIR)/$(LIBO_BIN_FOLDER))"
 
 # vim: set noet sw=4:

solenv/gbuild/platform/filter-showIncludes.awk

@@ -35,7 +35,7 @@ BEGIN {
     # to match especially drive letters in whitelist case insensitive
     IGNORECASE = 1
     whitelist = \
-        "^(" ENVIRON["SRCDIR"] "|" ENVIRON["OUTDIR"] "|" ENVIRON["WORKDIR"] ")"
+        "^(" ENVIRON["SRCDIR"] "|" ENVIRON["WORKDIR"] ")"
     firstline = 1
 }
 

solenv/gbuild/platform/macosx.mk

@@ -316,7 +316,7 @@ gb_PythonTest_PRECOMMAND := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY
 ifneq ($(LIBO_LIB_FOLDER),$(LIBO_URE_LIB_FOLDER))
 gb_PythonTest_PRECOMMAND := $(gb_PythonTest_PRECOMMAND):$(INSTROOT)/$(LIBO_LIB_FOLDER)
 endif
-gb_PythonTest_PRECOMMAND := $(gb_PythonTest_PRECOMMAND):$(OUTDIR)/lib:$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs
+gb_PythonTest_PRECOMMAND := $(gb_PythonTest_PRECOMMAND):$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs
 
 # Module class
 
@@ -380,7 +380,7 @@ $(call gb_UIMenubarTarget_get_target,$(1)) :| $(call gb_ExternalExecutable_get_d
 endef
 
 # Python
-gb_Python_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_Python_PRECOMMAND :=
 gb_Python_INSTALLED_EXECUTABLE := $(INSTROOT)/$(LIBO_LIB_FOLDER)/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/Resources/Python.app/Contents/MacOS/LibreOfficePython
 # this is passed to gdb as executable when running tests
 gb_Python_INSTALLED_EXECUTABLE_GDB := $(gb_Python_INSTALLED_EXECUTABLE)

solenv/gbuild/platform/mingw.mk

@@ -225,8 +225,6 @@ gb_Library_ILIBEXT := .lib
 define gb_Library_Library_platform
 $(call gb_LinkTarget_set_ilibtarget,$(2),$(3))
 
-$(call gb_Library_get_target,$(1)) :| $(OUTDIR)/bin/.dir
-
 $(call gb_LinkTarget_add_auxtargets,$(2), \
 	$(3) \
 	$(call gb_LinkTarget_get_mapfile,$(2)) \
@@ -382,6 +380,6 @@ endef
 gb_UIMenubarTarget_UIMenubarTarget_platform :=
 
 # Python
-gb_PYTHON_PRECOMMAND := PATH="$${PATH}:$(OUTDIR_FOR_BUILD)/bin" PYTHONHOME="$(OUTDIR_FOR_BUILD)/lib/python" PYTHONPATH="$(OUTDIR_FOR_BUILD)/lib/python;$(OUTDIR_FOR_BUILD)/lib/python/lib-dynload"
+gb_PYTHON_PRECOMMAND := $$(error FIXME)
 
 # vim: set noet sw=4:

testtools/CustomTarget_bridgetest.mk

@@ -27,7 +27,7 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest) : \
 $(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) :| $(testtools_BRIDGEDIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	$(call gb_Helper_abbreviate_dirs,\
-		echo $(if $(filter MACOSX,$(OS)), "$(gb_Helper_LIBRARY_PATH_VAR)=\$${$(gb_Helper_LIBRARY_PATH_VAR):+\$$$(gb_Helper_LIBRARY_PATH_VAR):}$(OUTDIR)/lib") \
+		echo \
 		"$(call gb_Executable_get_target_for_build,uno)" \
 		"-s com.sun.star.test.bridge.CppTestObject" \
 		"-u 'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \
@@ -59,11 +59,9 @@ $(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX) :| $(te
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	$(call gb_Helper_abbreviate_dirs,\
 		echo "JAVA_HOME=$(JAVA_HOME)" \
-		"$(gb_Helper_LIBRARY_PATH_VAR)=\$${$(gb_Helper_LIBRARY_PATH_VAR):+\$$$(gb_Helper_LIBRARY_PATH_VAR):}$(OUTDIR)/lib" \
 		"$(call gb_Executable_get_target_for_build,uno)" \
 		"-s com.sun.star.test.bridge.BridgeTest" \
 		"-env:LO_BUILD_LIB_DIR=$(call gb_Helper_make_url,$(gb_Library_WORKDIR_FOR_BUILD))" \
-		"-env:URE_INTERNAL_JAVA_DIR=file://$(OUTDIR)/bin" \
 		"-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target,uno_services))" \
 		"-env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \
 		"-- com.sun.star.test.bridge.JavaTestObject noCurrentContext" \
@@ -73,7 +71,7 @@ $(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX) :| $(te
 $(testtools_BRIDGEDIR)/bridgetest_client$(testtools_BATCHSUFFIX) :| $(testtools_BRIDGEDIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	$(call gb_Helper_abbreviate_dirs,\
-		echo $(if $(filter MACOSX,$(OS)), "$(gb_Helper_LIBRARY_PATH_VAR)=\$${$(gb_Helper_LIBRARY_PATH_VAR):+\$$$(gb_Helper_LIBRARY_PATH_VAR):}$(OUTDIR)/lib") \
+		echo \
 		"$(call gb_Executable_get_target_for_build,uno)" \
 		"-s com.sun.star.test.bridge.BridgeTest --" \
 		"-u 'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \

unotest/source/cpp/bootstrapfixturebase.cxx

@@ -45,13 +45,10 @@ test::BootstrapFixtureBase::BootstrapFixtureBase()
 #ifndef ANDROID
     const char* pSrcRoot = getenv( "SRC_ROOT" );
     CPPUNIT_ASSERT_MESSAGE("SRC_ROOT env variable not set", pSrcRoot != NULL && pSrcRoot[0] != 0);
-    const char* pSolverRoot = getenv( "OUTDIR_FOR_BUILD" );
-    CPPUNIT_ASSERT_MESSAGE("$OUTDIR_FOR_BUILD env variable not set", pSolverRoot != NULL && pSolverRoot[0] != 0);
     const char* pWorkdirRoot = getenv( "WORKDIR_FOR_BUILD" );
     CPPUNIT_ASSERT_MESSAGE("$WORKDIR_FOR_BUILD env variable not set", pWorkdirRoot != NULL && pWorkdirRoot[0] != 0);
 #else
     const char* pSrcRoot = "/assets";
-    const char* pSolverRoot = "/assets";
     const char* pWorkdirRoot = "/assets";
 #endif
     m_aSrcRootPath = OUString::createFromAscii( pSrcRoot );