merge packimages into postprocess

Change-Id: Ie00c7cbc012a605e95ceafcad384a67b599fc758
Reviewed-on: https://gerrit.libreoffice.org/1476
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>

13 files changed, 16 insertions, 59 deletions

diff --git a/Makefile.top b/Makefile.top
index 13ff6b4ecdea..ed0dda28c8a2 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -26,7 +26,7 @@ endif
 endif
 
 # This list tells which modules are gbuild ones. It does *not* tell which modules to build. That is directed
-# by the module being mentioned in packimages/prj/build.lst, etc, recursively.
+# by the module being mentioned in postprocess/prj/build.lst, etc, recursively.
 $(WORKDIR)/modules.mk: $(wildcard */Module_*.mk) $(wildcard */prj/dmake) $(BUILDDIR)/config_host.mk
 	mkdir -p $(dir $@)
 	echo -n "gbuild_modules:= tail_build \\" > $@
@@ -222,7 +222,7 @@ $(WORKDIR)/bootstrap:
 #
 # Build
 #
-build-packimages: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
+build-postprocess: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
 ifeq ($(DISABLE_SCRIPTING),TRUE)
 # We must get the headers from vbahelper "delivered" because
 # as we don't link to any libs from there they won't otherwise be, or
@@ -235,11 +235,11 @@ ifeq ($(DISABLE_DBCONNECTIVITY),TRUE)
 # Ditto for dbconnectivity in the --disable-database-connectivity case
 	cd connectivity && sed -e 's/^\(export [A-Z0-9_]*=\)\(.*\)$$/\1"\2"/' <../config_host.mk >conftmp.sh && . conftmp.sh && rm conftmp.sh && $(SOLARENV)/bin/deliver.pl
 endif
-	cd $(SRC_ROOT)/packimages && unset MAKEFLAGS && \
+	cd $(SRC_ROOT)/postprocess && unset MAKEFLAGS && \
 		$(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM) && \
 		$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
 
-build: build-packimages
+build: build-postprocess
 ifeq ($(OS_FOR_BUILD),WNT)
 	cd $(SRC_ROOT)/instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl
 else
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index cdb908fee1f1..e7471785dc9b 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -137,7 +137,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 	oox \
 	$(call gb_Helper_optional,OPENLDAP,openldap) \
 	package \
-	packimages \
 	padmin \
 	$(call gb_Helper_optional,POSTGRESQL,postgresql) \
 	postprocess \
diff --git a/android/prj/build.lst b/android/prj/build.lst
index 1a0c8c28fe15..90d51a297fd0 100644
--- a/android/prj/build.lst
+++ b/android/prj/build.lst
@@ -1,2 +1,2 @@
-an android :: packimages postprocess NULL
+an android :: postprocess NULL
 an android\prj nmake - all an_prj NULL
diff --git a/instsetoo_native/prj/build.lst b/instsetoo_native/prj/build.lst
index 46b09be9fd0c..56d88ea13e3a 100644
--- a/instsetoo_native/prj/build.lst
+++ b/instsetoo_native/prj/build.lst
@@ -1,4 +1,4 @@
-oon	instsetoo_native	::	postprocess packimages NULL
+oon	instsetoo_native	::	postprocess NULL
 oon	instsetoo_native						usr1	-	all	oon_mkout NULL
 oon	instsetoo_native\inc_openoffice\unix	nmake	-	u	oon_unix NULL
 oon	instsetoo_native\inc_openoffice\windows\msi_languages	nmake	-	all	oon_msilang NULL
diff --git a/packimages/Makefile b/packimages/Makefile
deleted file mode 100644
index ccb1c85a04da..000000000000
--- a/packimages/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/packimages/Module_packimages.mk b/packimages/Module_packimages.mk
deleted file mode 100644
index ec424c406373..000000000000
--- a/packimages/Module_packimages.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Module_Module,packimages))
-
-$(eval $(call gb_Module_add_targets,packimages,\
-	CustomTarget_images \
-	Package_images \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/packimages/prj/build.lst b/packimages/prj/build.lst
deleted file mode 100644
index 8eecfee20a1f..000000000000
--- a/packimages/prj/build.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-pim	packimages	::	postprocess NULL
-pim packimages\prj nmake          -       all     pim_prj NULL
diff --git a/packimages/prj/d.lst b/packimages/prj/d.lst
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/packimages/prj/d.lst
+++ /dev/null
diff --git a/packimages/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
index 2c40d3488b78..73dd16e367ff 100644
--- a/packimages/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -25,16 +25,16 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_CustomTarget_CustomTarget,packimages/images))
+$(eval $(call gb_CustomTarget_CustomTarget,postprocess/images))
 
-packimages_DIR := $(call gb_CustomTarget_get_workdir,packimages/images)
+packimages_DIR := $(call gb_CustomTarget_get_workdir,postprocess/images)
 
 # Custom sets, at 24x24 & 16x16 fall-back to Tango preferentially
 # (Tango fallbacks to Industrial for the missing icons)
 packimages_CUSTOM_FALLBACK_1 := -c $(SRCDIR)/icon-themes/tango
 packimages_CUSTOM_FALLBACK_2 := -c $(SRCDIR)/icon-themes/industrial
 
-$(call gb_CustomTarget_get_target,packimages/images) : \
+$(call gb_CustomTarget_get_target,postprocess/images) : \
 	$(packimages_DIR)/images_brand.zip \
 	$(if $(filter default,$(WITH_THEMES)),$(packimages_DIR)/images.zip) \
 	$(foreach theme,$(filter-out default,$(WITH_THEMES)),$(packimages_DIR)/images_$(theme).zip)
@@ -76,7 +76,7 @@ $(packimages_DIR)/commandimagelist.ilst :| $(packimages_DIR)/.dir
 			$(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))
 
 $(packimages_DIR)/sorted.lst : \
-		$(SRCDIR)/packimages/pack/image-sort.lst | $(packimages_DIR)/.dir
+		$(SRCDIR)/postprocess/packimages/image-sort.lst | $(packimages_DIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
 	$(call gb_Helper_abbreviate_dirs, \
 		$(PERL) $(SOLARENV)/bin/image-sort.pl $< $(OUTDIR)/xml $@)
diff --git a/postprocess/Module_postprocess.mk b/postprocess/Module_postprocess.mk
index 6e1c7c25514a..0716ae780fe5 100644
--- a/postprocess/Module_postprocess.mk
+++ b/postprocess/Module_postprocess.mk
@@ -17,8 +17,10 @@ $(eval $(call gb_Module_Module,postprocess))
 
 $(eval $(call gb_Module_add_targets,postprocess,\
 	CustomTarget_config \
+	CustomTarget_images \
 	CustomTarget_registry \
 	Package_config \
+	Package_images \
 	Package_registry \
 	Rdb_services \
 ))
diff --git a/packimages/Package_images.mk b/postprocess/Package_images.mk
index a57c7e4a2d0a..6d6059036f72 100644
--- a/packimages/Package_images.mk
+++ b/postprocess/Package_images.mk
@@ -25,14 +25,14 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Package_Package,packimages_images,$(call gb_CustomTarget_get_workdir,packimages/images)))
+$(eval $(call gb_Package_Package,postprocess_images,$(call gb_CustomTarget_get_workdir,postprocess/images)))
 
-$(eval $(call gb_Package_add_file,packimages_images,bin/images_brand.zip,images_brand.zip))
+$(eval $(call gb_Package_add_file,postprocess_images,bin/images_brand.zip,images_brand.zip))
 
 $(if $(filter default,$(WITH_THEMES)),\
-$(eval $(call gb_Package_add_file,packimages_images,bin/images.zip,images.zip)))
+$(eval $(call gb_Package_add_file,postprocess_images,bin/images.zip,images.zip)))
 
 $(foreach theme,$(filter-out default,$(WITH_THEMES)),\
-$(eval $(call gb_Package_add_file,packimages_images,bin/images_$(theme).zip,images_$(theme).zip)))
+$(eval $(call gb_Package_add_file,postprocess_images,bin/images_$(theme).zip,images_$(theme).zip)))
 
 # vim: set noet sw=4 ts=4:
diff --git a/packimages/README b/postprocess/packimages/README
index cf7b96ee286d..cf7b96ee286d 100644
--- a/packimages/README
+++ b/postprocess/packimages/README
diff --git a/packimages/pack/image-sort.lst b/postprocess/packimages/image-sort.lst
index 6a84af7a366f..6a84af7a366f 100644
--- a/packimages/pack/image-sort.lst
+++ b/postprocess/packimages/image-sort.lst