odk: remove Package_bin, instead auto-install executables

This is somewhat annoying since it requires re-introducing stupid
directories in scp2, but if the executables should be put in INSTDIR
directly then the Package_bin needs to go.

Change-Id: I893694c7f9d4cb5b9ef8ec4a3d30e08536223740

9 files changed, 40 insertions, 44 deletions

diff --git a/Repository.mk b/Repository.mk
index fd4a3bdeaa1b..78a4936ce3df 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -65,7 +65,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
 	xrmex \
 ))
 
-$(eval $(call gb_Helper_register_executables,SDK, \
+$(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \
 	$(if $(filter MSC,$(COM)),climaker) \
 	cppumaker \
 	idlc \
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index e7d524450489..46042a49726c 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -28,7 +28,8 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),\
 $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(SRCDIR)/odk/util/check.pl \
 		$(if $(DOXYGEN),$(call gb_GeneratedPackage_get_target,odk_doxygen)) \
-		$(call gb_Package_get_target,odk_bin) \
+		$(foreach exe,$(if $(filter WNT,$(OS)),climaker) cppumaker idlc javamaker regcompare $(if $(SYSTEM_UCPP),,ucpp) uno-skeletonmaker unoapploader,\
+			$(call gb_Executable_get_target,$(exe))) \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \
 		$(call gb_Package_get_target,odk_config) \
 		$(if $(filter WNT,$(OS)),\
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 7dd0e20dcecb..56b940514175 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_Module_add_targets,odk,\
 	CustomTarget_html \
 	CustomTarget_settings \
 	Executable_unoapploader \
-	Package_bin \
 	Package_config \
 	Package_docs \
 	Package_html \
diff --git a/odk/Package_bin.mk b/odk/Package_bin.mk
deleted file mode 100644
index 46d447a0e71c..000000000000
--- a/odk/Package_bin.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- 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/.
-#
-
-$(eval $(call gb_Package_Package,odk_bin,$(OUTDIR)/bin))
-
-$(eval $(call gb_Package_set_outdir,odk_bin,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_files,odk_bin,$(gb_Package_SDKDIRNAME)/bin,\
-    $(addsuffix $(gb_Executable_EXT),\
-	$(if $(filter WNT,$(OS)),climaker) \
-	cppumaker \
-	idlc \
-	javamaker \
-	regcompare \
-	$(if $(SYSTEM_UCPP),,ucpp) \
-	uno-skeletonmaker \
-	unoapploader \
-    ) \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 415279347e07..8550649379e9 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE))
+$(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE))
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 3b8740a8909d..2f605a9b611d 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -513,6 +513,14 @@ End
         Styles = (PACKED); \
     End
 
+#define SDK_EXECUTABLE(id,name) \
+    File id \
+        BIN_FILE_BODY; \
+        Dir = gid_Dir_Sdkoo_Bin; \
+        Name = name; \
+        Styles = (PACKED); \
+    End
+
 #define GALLERY_NAME(id) \
 
 #define GALLERY_FILELIST(id) \
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index 9b1751983160..06fef8e4964b 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -18,6 +18,8 @@
 
 #include "macros.inc"
 
+#include "AutoInstall/sdk"
+
 Installation gid_Installation_Sdk
     ProductName = "${PRODUCTNAME}";
     ProductVersion = "${PRODUCTVERSION}";
@@ -29,7 +31,7 @@ Installation gid_Installation_Sdk
 #endif
 End
 
-#if defined WNT
+#ifdef WNT
 
 Directory gid_Dir_Sdkoo_Root
     ParentID = PREDEFINED_PROGDIR;
@@ -39,10 +41,29 @@ End
 
 #endif
 
+Directory gid_Dir_Sdkoo_Sdk
+#ifdef WNT
+    ParentID = gid_Dir_Sdkoo_Root;
+#else
+    ParentID = PREDEFINED_PROGDIR;
+#endif
+#ifdef MACOSX
+    DosName = "LibreOffice${PRODUCTVERSION}_SDK";
+#else
+    DosName = "sdk";
+#endif
+End
+
+Directory gid_Dir_Sdkoo_Bin
+    ParentID = gid_Dir_Sdkoo_Sdk;
+    DosName = "bin";
+End
+
 Module gid_Module_Root_SDK
     Name = "sdkoo";
     Description = "sdkoo";
     PackageInfo = "packinfo_sdkoo.txt";
+    Files = (auto_sdk_ALL);
 End
 
 File gid_File_Pakage_odk_share_readme
@@ -52,13 +73,6 @@ File gid_File_Pakage_odk_share_readme
     Styles = (FILELIST,USE_INTERNAL_RIGHTS);
 End
 
-File gid_File_Package_odk_bin
-    TXT_FILE_BODY;
-    Dir = FILELIST_SDK_DIR;
-    Name = "odk_bin.filelist";
-    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-
 #if defined(WNT)
 File gid_File_Package_odk_cli
     TXT_FILE_BODY;
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk
index 6494c642e096..de94507065c6 100644
--- a/solenv/gbuild/AutoInstall.mk
+++ b/solenv/gbuild/AutoInstall.mk
@@ -11,7 +11,7 @@
 
 define gb_AutoInstall__make_define
 echo "#define auto_$*_ALL \ " >> $@
-$(foreach binary,$(filter-out $(lastword $(1)),$(1)),echo "    $(binary), \ " >> $@;)
+$(foreach binary,$(filter-out $(lastword $(1)),$(1)),echo "    $(subst -,_,$(binary)), \ " >> $@;)
 echo "    $(lastword $(1))" >> $@;
 echo "" >> $@
 endef
@@ -28,7 +28,7 @@ $(call gb_AutoInstall_get_target,%) : $(SRCDIR)/Repository.mk $(GBUILDDIR)/AutoI
 	$(foreach lib,$(gb_Library_MODULE_$*),\
 		echo "$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call gb_Library_get_runtime_filename,$(lib)))" >> $@;)
 	$(foreach exe,$(gb_Executable_MODULE_$*),\
-		echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(exe),$(call gb_Executable_get_filename,$(exe)))" >> $@;)
+		echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(subst -,_,$(exe)),$(call gb_Executable_get_filename,$(exe)))" >> $@;)
 
 
 $(call gb_AutoInstall_get_clean_target,%) :
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index ca70437168b7..c12287b5c14f 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -22,10 +22,10 @@
 # defined by platform
 #  gb_Executable_Executable_platform
 
-# NOTE: SDKBIN executables are already packaged in module odk
 gb_Executable_LAYER_DIRS := \
-	OOO:$(gb_PROGRAMDIRNAME) \
-	UREBIN:$(LIBO_URE_BIN_FOLDER) \
+	UREBIN:$(gb_INSTROOT)/$(LIBO_URE_BIN_FOLDER) \
+	OOO:$(gb_INSTROOT)/$(gb_PROGRAMDIRNAME) \
+	SDKBIN:$(INSTDIR)/$(gb_Package_SDKDIRNAME)/bin \
 
 $(dir $(call gb_Executable_get_runtime_target,%)).dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
@@ -43,7 +43,7 @@ $(call gb_Executable_get_clean_target,%) :
 			$(call gb_Executable_get_runtime_target,$*) \
 			$(AUXTARGETS))
 
-gb_Executable__get_dir_for_layer = $(patsubst $(1):%,$(gb_INSTROOT)/%,$(filter $(1):%,$(call gb_Executable_LAYER_DIRS)))
+gb_Executable__get_dir_for_layer = $(patsubst $(1):%,%,$(filter $(1):%,$(call gb_Executable_LAYER_DIRS)))
 gb_Executable__get_dir_for_exe = $(call gb_Executable__get_dir_for_layer,$(call gb_Executable_get_layer,$(1)))
 gb_Executable_get_install_target = $(call gb_Executable__get_dir_for_exe,$(1))/$(call gb_Executable_get_filename,$(1))