gbuild: InstallScript: use scripts from WORKDIR

Change-Id: I741edcabf86801f77ff58bc42a81372053c7901b

5 files changed, 35 insertions, 61 deletions

diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 99da91074e6d..24df6ece1da9 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -78,7 +78,7 @@ LibreOffice
         downloadname    LibreOffice_{productversion}_{os}_install_{languages}
         langpackdownloadname    LibreOffice_{productversion}_languagepack_{os}_install_{languages}
         helppackdownloadname    LibreOffice_{productversion}_helppack_{os}_install_{languages}
-        include         {solarpath}/bin.{minor}/osl,{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native/scripts,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
+        include         {solarpath}/bin.{minor}/osl,{installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
     }
 }
 
@@ -131,7 +131,7 @@ LibreOffice_Dev
         downloadname    LibreOfficeDev_{productversion}_{os}_install_{languages}
         langpackdownloadname    LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
         helppackdownloadname    LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
-        include         {solarpath}/bin.{minor}/osl,{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native/scripts,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
+        include         {solarpath}/bin.{minor}/osl,{installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
     }
 }
 
@@ -170,7 +170,7 @@ LibreOffice_SDK
         active 1
         compression 5
         script sdkoo
-        include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir},{instdir}/ure/lib,{packinfopath}
+        include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir},{instdir}/ure/lib,{packinfopath}
     }
 }
 
@@ -216,6 +216,6 @@ LibreOffice_Dev_SDK
         active 1
         compression 5
         script sdkoo
-        include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir},{instdir}/ure/lib,{packinfopath}
+        include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir},{instdir}/ure/lib,{packinfopath}
     }
 }
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
index 9bf14fe9a518..c84f4a994857 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -46,7 +46,7 @@ End
 
 #if !defined(WNT) && !defined(MACOSX) && defined(WITH_RPM)
 ScpAction scp_Copy_Install
-    Copy = "userscripts/install";
+    Copy = "scripts/install";
     Name = "install";
     UnixRights = 755;
 End
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index 124ed584df01..2bcd7ccdf847 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -61,6 +61,9 @@ sub create_pathvariables
     my $instdir = $ENV{'INSTDIR'};
     $variables{'instdir'} = $instdir;
 
+    my $installscriptdir = $environment->{'WORKDIR'} . $installer::globals::separator . "InstallScriptTarget";
+    $variables{'installscriptdir'} = $installscriptdir;
+
     my $extensionsdir = $environment->{'WORKDIR'} . $installer::globals::separator . "Extension";
     $variables{'extensionsdir'} = $extensionsdir;
 
diff --git a/solenv/gbuild/InstallScript.mk b/solenv/gbuild/InstallScript.mk
index 36aeb1e82657..41e94f5c7615 100644
--- a/solenv/gbuild/InstallScript.mk
+++ b/solenv/gbuild/InstallScript.mk
@@ -7,86 +7,60 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-# InstallScriptTarget class
+# InstallScript class
 
-gb_InstallScriptTarget_TARGET := $(SOLARENV)/bin/par2script.pl
-gb_InstallScriptTarget_COMMAND := $(PERL) $(gb_InstallScriptTarget_TARGET)
+gb_InstallScript_TARGET := $(SOLARENV)/bin/par2script.pl
+gb_InstallScript_COMMAND := $(PERL) $(gb_InstallScript_TARGET)
 
-gb_InstallScriptTarget__make_arglist = $(subst $(WHITESPACE),$(COMMA),$(strip $(1)))
+gb_InstallScript__make_arglist = $(subst $(WHITESPACE),$(COMMA),$(strip $(1)))
 
-define gb_InstallScriptTarget__get_files
+define gb_InstallScript__get_files
 $(notdir $(shell cat $(foreach module,$(1),$(call gb_InstallModule_get_filelist,$(module)))))
 endef
 
-define gb_InstallScriptTarget__get_dirs
+define gb_InstallScript__get_dirs
 $(sort $(dir $(shell cat $(foreach module,$(1),$(call gb_InstallModule_get_filelist,$(module))))))
 endef
 
 # Pass first arg if make is running in silent mode, second arg otherwise
-define gb_InstallScriptTarget__if_silent
+define gb_InstallScript__if_silent
 $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),$(1),$(2))
 endef
 
-define gb_InstallScriptTarget__command
+define gb_InstallScript__command
 $(call gb_Output_announce,$(2),$(true),INS,4)
 $(call gb_Helper_abbreviate_dirs,\
 	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\
-		$(call gb_InstallScriptTarget__make_arglist,\
-			$(call gb_InstallScriptTarget__get_files,$(SCP_MODULES))) \
+		$(call gb_InstallScript__make_arglist,\
+			$(call gb_InstallScript__get_files,$(SCP_MODULES))) \
 	) && \
-	$(gb_InstallScriptTarget_COMMAND) \
-		$(call gb_InstallScriptTarget__if_silent,-q) \
-		-i $(call gb_InstallScriptTarget__make_arglist,$(call gb_InstallScriptTarget__get_dirs,$(SCP_MODULES))) \
+	$(gb_InstallScript_COMMAND) \
+		$(call gb_InstallScript__if_silent,-q) \
+		-i $(call gb_InstallScript__make_arglist,$(call gb_InstallScript__get_dirs,$(SCP_MODULES))) \
 	   	-o $(1) \
 	   	@@$${RESPONSEFILE} && \
 	rm -f $${RESPONSEFILE} \
 )
 endef
 
-$(dir $(call gb_InstallScriptTarget_get_target,%))%/.dir :
+$(dir $(call gb_InstallScript_get_target,%))%/.dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
-$(dir $(call gb_InstallScriptTarget_get_target,%)).dir :
+$(dir $(call gb_InstallScript_get_target,%)).dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
-$(call gb_InstallScriptTarget_get_target,%) : $(gb_InstallScriptTarget_TARGET)
-	$(call gb_InstallScriptTarget__command,$@,$*)
+$(call gb_InstallScript_get_target,%) : $(gb_InstallScript_TARGET)
+	$(call gb_InstallScript__command,$@,$*)
 
-.PHONY : $(call gb_InstallScriptTarget_get_clean_target,%)
-$(call gb_InstallScriptTarget_get_clean_target,%) :
+.PHONY : $(call gb_InstallScript_get_clean_target,%)
+$(call gb_InstallScript_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),INS,4)
-	rm -f $(call gb_InstallScriptTarget_get_target,$*)
-
-# gb_InstallScriptTarget_InstallScriptTarget(<target>)
-define gb_InstallScriptTarget_InstallScriptTarget
-$(call gb_InstallScriptTarget_get_target,$(1)) :| $(dir $(call gb_InstallScriptTarget_get_target,$(1))).dir
-$(call gb_InstallScriptTarget_get_target,$(1)) : SCP_MODULES :=
-
-endef
-
-define gb_InstallScriptTarget_use_module
-$(call gb_InstallScriptTarget_get_target,$(1)) : $(call gb_InstallModule_get_target,$(2))
-$(call gb_InstallScriptTarget_get_clean_target,$(1)) : $(call gb_InstallModule_get_clean_target,$(2))
-$(call gb_InstallScriptTarget_get_target,$(1)) : SCP_MODULES += $(2)
-
-endef
-
-define gb_InstallScriptTarget_use_modules
-$(foreach module,$(2),$(call gb_InstallScriptTarget_use_module,$(1),$(module)))
-
-endef
-
-# InstallScript class
+	rm -f $(call gb_InstallScript_get_target,$*)
 
 # gb_InstallScript_InstallScript(<target>)
 define gb_InstallScript_InstallScript
-$(call gb_InstallScriptTarget_InstallScriptTarget,$(1))
-
-$(call gb_InstallScript_get_target,$(1)) : $(call gb_InstallScriptTarget_get_target,$(1))
 $(call gb_InstallScript_get_target,$(1)) :| $(dir $(call gb_InstallScript_get_target,$(1))).dir
-$(call gb_InstallScript_get_clean_target,$(1)) : $(call gb_InstallScriptTarget_get_clean_target,$(1))
-
-$(call gb_Deliver_add_deliverable,$(call gb_InstallScript_get_target,$(1)),$(call gb_InstallScriptTarget_get_target,$(1)),$(1))
+$(call gb_InstallScript_get_target,$(1)) : SCP_MODULES :=
 
 $$(eval $$(call gb_Module_register_target,$(call gb_InstallScript_get_target,$(1)),$(call gb_InstallScript_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),InstallScript)
@@ -94,12 +68,14 @@ $(call gb_Helper_make_userfriendly_targets,$(1),InstallScript)
 endef
 
 define gb_InstallScript_use_module
-$(call gb_InstallScriptTarget_use_module,$(1),$(2))
+$(call gb_InstallScript_get_target,$(1)) : $(call gb_InstallModule_get_target,$(2))
+$(call gb_InstallScript_get_clean_target,$(1)) : $(call gb_InstallModule_get_clean_target,$(2))
+$(call gb_InstallScript_get_target,$(1)) : SCP_MODULES += $(2)
 
 endef
 
 define gb_InstallScript_use_modules
-$(call gb_InstallScriptTarget_use_modules,$(1),$(2))
+$(foreach module,$(2),$(call gb_InstallScript_use_module,$(1),$(module)))
 
 endef
 
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 0025f30d87c4..90f9decdab08 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -33,7 +33,6 @@ gb_PackagePart_get_destinations = \
 	$(OUTDIR)/share \
 	$(WORKDIR)/unittest \
 
-gb_InstallScript_get_target = $(OUTDIR)/bin/$(1)$(gb_InstallScript_EXT)
 # kind of lame but with just 3 of these why bother with registration etc.
 gb_UnoApi_get_target = $(INSTROOT)/$(if $(filter udkapi,$(1)),$(LIBO_URE_SHARE_FOLDER)/misc/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb
 
@@ -113,7 +112,7 @@ gb_InstallModule_get_target = $(WORKDIR)/InstallModule/$(1).done
 gb_InstallModuleTarget_get_external_target = $(WORKDIR)/InstallModuleTarget/$(1).external
 gb_InstallModuleTarget_get_filelist = $(WORKDIR)/InstallModuleTarget/$(1).filelist
 gb_InstallModuleTarget_get_target = $(WORKDIR)/InstallModuleTarget/$(1).filelist
-gb_InstallScriptTarget_get_target = $(WORKDIR)/InstallScriptTarget/$(1)$(gb_InstallScript_EXT)
+gb_InstallScript_get_target = $(WORKDIR)/InstallScriptTarget/$(1)$(gb_InstallScript_EXT)
 gb_InternalUnoApi_get_target = $(WORKDIR)/InternalUnoApi/$(1).done
 gb_Jar_get_target = $(call gb_Jar_get_install_target,$(1))
 gb_Jar_get_classsetname = Jar/$(1)
@@ -267,7 +266,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
 	HelpTreeTarget \
 	InstallModule \
 	InstallModuleTarget \
-	InstallScriptTarget \
+	InstallScript \
 	InternalUnoApi \
 	JavaClassSet \
 	Jar \
@@ -320,10 +319,6 @@ $(eval $(call gb_Helper_make_clean_targets,\
 	Configuration \
 ))
 
-$(eval $(call gb_Helper_make_outdir_clean_targets,\
-	InstallScript \
-))
-
 $(eval $(call gb_Helper_make_dep_targets,\
 	CObject \
 	CxxObject \