use filelist install method for udkapi and offapi

... so we can drop ZipUnoApi again.

Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa
Reviewed-on: https://gerrit.libreoffice.org/3152Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

instsetoo_native/util/openoffice.lst.in

@@ -179,7 +179,7 @@ LibreOffice_SDK
         active 1
         compression 5
         script sdkoo
-        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarenvpath}/{os}/MS
+        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/filelists.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarenvpath}/{os}/MS,{filelistpath}
     }
 }
 
@@ -224,7 +224,7 @@ LibreOffice_Dev_SDK
         active 1
         compression 5
         script sdkoo
-        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarenvpath}/{os}/MS
+        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/filelists.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarenvpath}/{os}/MS,{filelistpath}
     }
 }
 

scp2/inc/macros.inc

@@ -427,8 +427,14 @@ End
 
 #if defined MACOSX
 #define FILELIST_DIR gid_Dir_Bundle_Contents
+#define FILELIST_SDK_DIR PREDEFINED_PROGDIR
 #else
 #define FILELIST_DIR gid_Dir_Brand_Root
+#if defined WNT
+#define FILELIST_SDK_DIR gid_Dir_Sdkoo_Root
+#else
+#define FILELIST_SDK_DIR PREDEFINED_PROGDIR
+#endif
 #endif
 
 #include <langmacros.inc>

scp2/source/sdkoo/sdkoo.scp

@@ -133,16 +133,16 @@ End
 
 File gid_File_Zip_OdkIdl_udkapi
     TXT_FILE_BODY;
-    Dir = gid_Dir_Basis_Sdk;
-    Name = "udkapi.zip";
-    Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+    Dir = FILELIST_SDK_DIR;
+    Name = "udkapi_idl.filelist";
+    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
 End
 
 File gid_File_Zip_OdkIdl_offapi
     TXT_FILE_BODY;
-    Dir = gid_Dir_Basis_Sdk;
-    Name = "offapi.zip";
-    Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+    Dir = FILELIST_SDK_DIR;
+    Name = "offapi_idl.filelist";
+    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
 End
 
 File gid_File_Zip_Odkheaders_sal_generated

solenv/gbuild/Package.mk

@@ -56,6 +56,9 @@ endef
 
 # Package class
 
+# defined by platform
+#  gb_Package_SDKDIRNAME
+
 $(dir $(call gb_Package_get_target,%)).dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 

solenv/gbuild/UnoApi.mk

@@ -33,6 +33,8 @@ $(call gb_UnoApi_get_clean_target,%) :
 define gb_UnoApi_UnoApi
 $(call gb_UnoApiTarget_UnoApiTarget,$(1))
 $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1))
+$(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR))
+$(call gb_Package_set_outdir,$(1)_idl,$(INSTDIR))
 $(call gb_Package_Package_internal,$(1)_inc,$(call gb_UnoApiHeadersTarget_get_dir,$(1)))
 
 $(call gb_UnoApiTarget_set_root,$(1),UCR)
@@ -44,6 +46,7 @@ $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_targe
 $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1))
 $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_inc)
 
+$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(call gb_Package_get_target,$(1)_idl)
 $(call gb_Package_get_preparation_target,$(1)_inc) : $(call gb_UnoApiHeadersTarget_get_target,$(1))
 
 $(call gb_Deliver_add_deliverable,$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1))
@@ -53,6 +56,20 @@ $(call gb_Helper_make_userfriendly_targets,$(1),UnoApi)
 
 endef
 
+# Create a package of IDL files for putting into SDK.
+#
+# gb_UnoApi_package_idlfiles api
+define gb_UnoApi_package_idlfiles
+$(call gb_UnoApi_get_target,$(1)) : $(call gb_Package_get_target,$(1)_idl)
+$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_idl)
+
+endef
+
+define gb_UnoApi__add_idlfile
+$(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,$(gb_Package_SDKDIRNAME)/idl/%,$(2)),$(2))
+
+endef
+
 define gb_UnoApi__add_headerfile_impl
 $(call gb_Package_add_file,$(1)_inc,inc/$(2),$(3))
 $(call gb_UnoApiHeadersTarget_add_headerfile,$(1),$(2),$(3))
@@ -66,7 +83,13 @@ $(call gb_UnoApi__add_headerfile_impl,$(1),$(2),$(subst $() $(),/,$(wordlist 2,$
 
 endef
 
+define gb_UnoApi__add_idlfile_noheader
+$(call gb_UnoApi__add_idlfile,$(1),$(2).idl)
+
+endef
+
 define gb_UnoApi__add_idlfile_nohdl
+$(call gb_UnoApi__add_idlfile_noheader,$(1),$(2))
 $(call gb_UnoApi__add_headerfile,$(1),$(2).hpp)
 
 endef
@@ -106,11 +129,13 @@ endef
 # for old-style services and modules
 define gb_UnoApi_add_idlfile_noheader
 $(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(3))
+$(call gb_UnoApi__add_idlfile_noheader,$(1),$(2)/$(3))
 
 endef
 
 define gb_UnoApi_add_idlfiles_noheader
 $(call gb_UnoApiTarget_add_idlfiles,$(1),$(2),$(3))
+$(foreach idl,$(3),$(call gb_UnoApi__add_idlfile_noheader,$(1),$(2)/$(idl)))
 
 endef
 

solenv/gbuild/ZipUnoApi.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-# ZipUnoApi class
-# this is a bit of a hack, hopefully needed only temporarily because
-# scp2 can easily deal with zip files but not so easily with 100s of
-# individual files; ideally the Package itself should be sufficient.
-
-define gb_ZipUnoApi_ZipUnoApi
-$(call gb_UnoApi_UnoApi,$(1),$(2))
-$(call gb_Zip_Zip_internal,$(1),$(WORKDIR)/Zip/$(1))
-$(call gb_UnoApi_get_target,$(1)) : $(call gb_Zip_get_final_target,$(1))
-$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Zip_get_clean_target,$(1))
-$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(call gb_Zip_get_target,$(1))
-
-endef
-
-# hard-code "idl" path in zip so we don't need another parameter
-define gb_ZipUnoApi__add_idlfiles
-$(foreach file,$(3),$(call gb_Zip_add_file,$(1),$(patsubst $(1)/%,idl/%,$(2))/$(file).idl,$(SRCDIR)/$(2)/$(file).idl))
-
-endef
-
-# sadly source files in udkapi/ but ODK path is idl/ so need to
-# copy files
-# $(1) package
-# $(2) dir in source
-# $(3) file list
-define gb_ZipUnoApi_add_idlfiles
-$(call gb_UnoApi_add_idlfiles,$(1),$(2),$(3))
-$(call gb_ZipUnoApi__add_idlfiles,$(1),$(2),$(3))
-
-endef
-
-define gb_ZipUnoApi_add_idlfiles_nohdl
-$(call gb_UnoApi_add_idlfiles_nohdl,$(1),$(2),$(3))
-$(call gb_ZipUnoApi__add_idlfiles,$(1),$(2),$(3))
-
-endef
-
-define gb_ZipUnoApi_add_idlfiles_noheader
-$(call gb_UnoApi_add_idlfiles_noheader,$(1),$(2),$(3))
-$(call gb_ZipUnoApi__add_idlfiles,$(1),$(2),$(3))
-
-endef
-
-# vim: set noet sw=4 ts=4:

solenv/gbuild/gbuild.mk

@@ -331,7 +331,6 @@ include $(foreach class, \
 	CliUnoApi \
 	Zip \
 	ZipPackage \
-	ZipUnoApi \
 	AllLangZip \
 	Configuration \
 	HelpTarget \

solenv/gbuild/platform/IOS_ARM_GCC.mk

@@ -283,6 +283,9 @@ else
 gb_UnoApiHeadersTarget_select_variant = $(2)
 endif
 
+# Package class
+gb_Package_SDKDIRNAME := sdk
+
 # Python
 gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
 

solenv/gbuild/platform/WNT_INTEL_GCC.mk

@@ -415,6 +415,9 @@ else
 gb_UnoApiHeadersTarget_select_variant = $(2)
 endif
 
+# Package class
+gb_Package_SDKDIRNAME := sdk
+
 # 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"
 

solenv/gbuild/platform/com_MSC_class.mk

@@ -591,6 +591,9 @@ else
 gb_UnoApiHeadersTarget_select_variant = $(2)
 endif
 
+# Package class
+gb_Package_SDKDIRNAME := sdk
+
 # Python
 gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME="$(OUTDIR_FOR_BUILD)/lib/python" PYTHONPATH="$(OUTDIR_FOR_BUILD)/lib/python;$(OUTDIR_FOR_BUILD)/lib/python/lib-dynload"
 

solenv/gbuild/platform/macosx.mk

@@ -358,6 +358,9 @@ else
 gb_UnoApiHeadersTarget_select_variant = $(2)
 endif
 
+# Package class
+gb_Package_SDKDIRNAME := LibreOffice$(PRODUCTVERSION)_SDK
+
 # Python
 gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
 

solenv/gbuild/platform/solaris.mk

@@ -409,6 +409,9 @@ else
 gb_UnoApiHeadersTarget_select_variant = $(2)
 endif
 
+# Package class
+gb_Package_SDKDIRNAME := sdk
+
 # Python
 gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload
 

solenv/gbuild/platform/unxgcc.mk

@@ -407,6 +407,9 @@ else
 gb_UnoApiHeadersTarget_select_variant = $(2)
 endif
 
+# Package class
+gb_Package_SDKDIRNAME := sdk
+
 # Python
 gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload