remove INPATH and PROEXT

- WORKDIR path is just workdir
- INSTDIR path is just instdir
- WORKDIR_FOR_BUILD is workdir_for_build
- INSTDIR_FOR_BUILD is instdir_for_build
- replace other usage of INPATH by combination of OS and CPUNAME

Change-Id: Ie398387ebd82a968ec2605f2103c55b43a231482
Reviewed-on: https://gerrit.libreoffice.org/6601
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

9 files changed, 10 insertions, 29 deletions

diff --git a/solenv/bin/bin_library_info.sh b/solenv/bin/bin_library_info.sh
index 10200edad3f5..d54d6b3d2f82 100755
--- a/solenv/bin/bin_library_info.sh
+++ b/solenv/bin/bin_library_info.sh
@@ -63,7 +63,7 @@ determine_binary_package_name()
     csha=$(get_config_sha)
     gsha=$(get_library_gbuild_sha "${module?}")
     if [ -n "${csha?}" -a -n "${gsha}" ] ; then
-        binfile="${csha?}_${gsha?}_${tarball?}.${INPATH?}.tar.gz"
+        binfile="${csha?}_${gsha?}_${tarball?}.${PLATFORM?}.tar.gz"
     fi
     echo "${binfile}"
 
@@ -125,7 +125,7 @@ while [ "${1}" != "" ]; do
                 shift;
                 arg="$1"
             fi
-            INPATH="$arg"
+            PLATFORM="$arg"
             ;;
         -q)
             V=0
diff --git a/solenv/bin/create-ids b/solenv/bin/create-ids
index 847f022e0daa..0722091b2386 100755
--- a/solenv/bin/create-ids
+++ b/solenv/bin/create-ids
@@ -9,14 +9,6 @@
 
 # create ID file for the whole LibO tree. run it in toplevel dir
 
-if [ -z "$INPATH" ] ; then
-   INPATH=$(grep "INPATH=" ./config_host.mk | sed -e "s/INPATH=//")
-fi
-if [ -z "$INPATH" ] ; then
-    echo "could not determine INPATH" >&2
-    exit 1
-fi
-
 # TODO: should this include workdir headers?
 if [ "$1" = "--with-outpath" ]; then
     dirs="`ls -d */* | sed -e '/\(\/\(cscope\.\|tags\|ID\)\)\|^\(clone\|workdir\|instdir\)\//d'`"
diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags
index 55847f2e5d54..739c7d02a2b3 100755
--- a/solenv/bin/create-tags
+++ b/solenv/bin/create-tags
@@ -7,16 +7,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-if [ -z "$INPATH" ] ; then
-   INPATH=$(grep "INPATH=" ./config_host.mk | sed -e "s/export INPATH=//")
-fi
-if [ -z "$INPATH" ] ; then
-    echo "could not determine INPATH" >&2
-    exit 1
-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=workdir \
+      -R --exclude=instdir --exclude=workdir \
       --exclude=clone --totals=yes *
diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh
index 6cd7df94bf60..ee53fe4f4b1d 100755
--- a/solenv/bin/mkdocs.sh
+++ b/solenv/bin/mkdocs.sh
@@ -108,7 +108,6 @@ which dot > /dev/null 2>&1 || {
 }
 
 # suck setup
-setup "INPATH"
 setup "SOLARINC"
 shopt -s nullglob
 
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index c14b771f2a9f..70763c9762d6 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -62,7 +62,7 @@ if ($help) {
 
 my $BUILD=$ENV{LIBO_VERSION_PATCH};
 $ENV{LAST_MINOR} = 'm0';
-$ENV{OUT} = "../$ENV{'INPATH'}";
+$ENV{OUT} = "../FIXME";
 $ENV{LOCAL_OUT} = $ENV{OUT};
 $ENV{LOCAL_COMMON_OUT} = $ENV{OUT};
 
@@ -79,8 +79,8 @@ if (defined $ENV{DESTDIR} &&
 
 $msi='';
 if ($is_windows) {
-    $msi = "-msitemplate $ENV{SRC_ROOT}/workdir/$ENV{INPATH}/CustomTarget/instsetoo_native/install/msi_templates " .
-           "-msilanguage $ENV{SRC_ROOT}/workdir/$ENV{INPATH}/CustomTarget/instsetoo_native/install/win_ulffiles";
+    $msi = "-msitemplate $ENV{SRC_ROOT}/workdir/CustomTarget/instsetoo_native/install/msi_templates " .
+           "-msilanguage $ENV{SRC_ROOT}/workdir/CustomTarget/instsetoo_native/install/win_ulffiles";
 }
 
 # FIXME: a better solution would be to fix installer to deal with broken symlinks
diff --git a/solenv/bin/packimages.pl b/solenv/bin/packimages.pl
index 09e19dbddb23..3621f20470b9 100644
--- a/solenv/bin/packimages.pl
+++ b/solenv/bin/packimages.pl
@@ -117,7 +117,7 @@ sub parse_options
         exit(1);
     }
     #define intermediate output file
-    $tmp_out_file="$out_file"."$$".$ENV{INPATH};
+    $tmp_out_file="$out_file"."$$".".tmp";
     # Sanity checks.
 
     # Check if out_file can be written.
diff --git a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
index f47a8330ad71..647a860c636a 100644
--- a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
+++ b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
@@ -32,7 +32,6 @@ static const Integer OSL_DEBUG_LEVEL;
 static const List<Path> SOLARINC;
 static const List<Path> SOLARLIB;
 static const Path GBUILDDIR;
-static const Path INPATH;
 static const Path JAVA_HOME;
 static const Path UPD;
 static const String LIBXML_CFLAGS;
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 8079472bdfeb..a07368b18bf9 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -255,9 +255,9 @@ endef
 define gb_UnpackedTarball_set_tarball
 $(if $(findstring YES,$(USE_LIBRARY_BIN_TAR)),
 $(if $(4),
-$(if $(shell "$(SRCDIR)/solenv/bin/bin_library_info.sh" -l "$(gb_UnpackedTarget_TARFILE_LOCATION)" -o "$(4)" -b "$(BUILDDIR)" -s "$(SRCDIR)" -t "$(2)" -m verify -p "$(INPATH)"),
-$(call gb_UnpackedTarball_set_tarball_internal,$(1),$(shell "$(SRCDIR)/solenv/bin/bin_library_info.sh" -l "$(gb_UnpackedTarget_TARFILE_LOCATION)" -o "$(4)" -b "$(BUILDDIR)" -s "$(SRCDIR)" -t "$(2)" -m verify -p "$(INPATH)"),$(3),$(4),in),\
-$(call gb_UnpackedTarball_set_tarball_internal,$(1),$(2),$(3),$(4),out,$(shell "$(SRCDIR)/solenv/bin/bin_library_info.sh" -l "$(gb_UnpackedTarget_TARFILE_LOCATION)" -o "$(4)" -b "$(BUILDDIR)" -s "$(SRCDIR)" -t "$(2)" -m name -p "$(INPATH)")))
+$(if $(shell "$(SRCDIR)/solenv/bin/bin_library_info.sh" -l "$(gb_UnpackedTarget_TARFILE_LOCATION)" -o "$(4)" -b "$(BUILDDIR)" -s "$(SRCDIR)" -t "$(2)" -m verify -p "$(OS)_$(CPUNAME)"),
+$(call gb_UnpackedTarball_set_tarball_internal,$(1),$(shell "$(SRCDIR)/solenv/bin/bin_library_info.sh" -l "$(gb_UnpackedTarget_TARFILE_LOCATION)" -o "$(4)" -b "$(BUILDDIR)" -s "$(SRCDIR)" -t "$(2)" -m verify -p "$(OS)_$(CPUNAME)"),$(3),$(4),in),\
+$(call gb_UnpackedTarball_set_tarball_internal,$(1),$(2),$(3),$(4),out,$(shell "$(SRCDIR)/solenv/bin/bin_library_info.sh" -l "$(gb_UnpackedTarget_TARFILE_LOCATION)" -o "$(4)" -b "$(BUILDDIR)" -s "$(SRCDIR)" -t "$(2)" -m name -p "$(OS)_$(CPUNAME)")))
 ,
 $(call gb_UnpackedTarball_set_tarball_internal,$(1),$(2),$(3),$(4),)
 )
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 11f9bf4c8e1c..0796f8ba2541 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -22,7 +22,6 @@ GBUILDDIR:=$(SRCDIR)/solenv/gbuild
 # vars needed from the env/calling makefile
 
 # DEBUG
-# INPATH
 # JAVA_HOME
 # LIBXML_CFLAGS
 # OS