From 5d8f48c81eac8650315b936d0e89ad1d54b566fc Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 31 Oct 2013 14:02:40 +0100 Subject: 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 Reviewed-by: Michael Stahl --- solenv/doc/gbuild/solenv/gbuild/gbuild.mk | 1 - solenv/doc/gbuild/solenv/gbuild/helper.mk | 6 ------ solenv/doc/gbuild/solenv/gbuild/library.mk | 2 +- solenv/doc/gbuild/solenv/gbuild/package.mk | 4 ++-- solenv/doc/gbuild/solenv/gbuild/static_library.mk | 4 +--- 5 files changed, 4 insertions(+), 13 deletions(-) (limited to 'solenv/doc') diff --git a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk index d0fb5d254938..f47a8330ad71 100644 --- a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk +++ b/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 diff --git a/solenv/doc/gbuild/solenv/gbuild/helper.mk b/solenv/doc/gbuild/solenv/gbuild/helper.mk index 33d034a08aad..f71c26915cf4 100644 --- a/solenv/doc/gbuild/solenv/gbuild/helper.mk +++ b/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 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 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; diff --git a/solenv/doc/gbuild/solenv/gbuild/library.mk b/solenv/doc/gbuild/solenv/gbuild/library.mk index 085989d50060..a20c96f9efd6 100644 --- a/solenv/doc/gbuild/solenv/gbuild/library.mk +++ b/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 TARGETS; /// List of additional defines for compiling objects for libraries static const List DEFS; diff --git a/solenv/doc/gbuild/solenv/gbuild/package.mk b/solenv/doc/gbuild/solenv/gbuild/package.mk index 15c83081200f..d45eb5da5a2a 100644 --- a/solenv/doc/gbuild/solenv/gbuild/package.mk +++ b/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); } } diff --git a/solenv/doc/gbuild/solenv/gbuild/static_library.mk b/solenv/doc/gbuild/solenv/gbuild/static_library.mk index d225b9e1439f..a6d529717f54 100644 --- a/solenv/doc/gbuild/solenv/gbuild/static_library.mk +++ b/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 TARGETS; /// List of additional defines for compiling objects for static libraries static const List DEFS; @@ -48,8 +48,6 @@ namespace gb static const List TARGETTYPEFLAGS; /// Mapping from symbolic static library names to filenames static const Map FILENAMES; - /// location to place static libraries in the \$(OUTDIR) - static const Path OUTDIRLOCATION; /// platformdependant file extension for static libraries static const String PLAINEXT; }; -- cgit