gbuild: install extension directly from workdir

Also kill ExtensionTarget indirection causing duplication.

Change-Id: I24f7e6d85df6acf2ededaade20dd1a788d916594

scp2/source/extensions/file_extensions.scp

@@ -30,7 +30,7 @@ File gid_File_Oxt_Presentation_Minimizer
     TXT_FILE_BODY;
     Styles = (PACKED, ARCHIVE);
     Dir = gid_Brand_Dir_Share_Extensions_Presentation_Minimizer;
-    Name = "presentation-minimizer.oxt";
+    Name = "Extension/presentation-minimizer.oxt";
 End
 
 #endif
@@ -43,7 +43,7 @@ File gid_File_Oxt_MediaWiki
     TXT_FILE_BODY;
     Styles = (PACKED, ARCHIVE);
     Dir = gid_Brand_Dir_Share_Extensions_MediaWiki;
-    Name = "wiki-publisher.oxt";
+    Name = "Extension/wiki-publisher.oxt";
 End
 
 #endif
@@ -173,7 +173,7 @@ File gid_File_Oxt_NLPSolver
     TXT_FILE_BODY;
     Styles = (PACKED, ARCHIVE);
     Dir = gid_Brand_Dir_Share_Extensions_NLPSolver;
-    Name = "nlpsolver.oxt";
+    Name = "Extension/nlpsolver.oxt";
 End
 
 #endif
@@ -199,7 +199,7 @@ File gid_File_Oxt_MySQLConnector
     TXT_FILE_BODY;
     Styles = (PACKED, ARCHIVE);
     Dir = gid_Brand_Dir_Share_Extensions_MySQLConnector;
-    Name = "mysql-connector-ooo.oxt";
+    Name = "Extension/mysql-connector-ooo.oxt";
 End
 
 #endif

solenv/gbuild/TargetLocations.mk

@@ -24,7 +24,6 @@ gb_CliNativeLibrary_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliNativeLib
 gb_CliUnoApi_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliUnoApi_EXT)
 gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT)
 gb_Executable_get_target_for_build = $(OUTDIR_FOR_BUILD)/bin/$(1)$(gb_Executable_EXT_for_build)
-gb_Extension_get_target = $(OUTDIR)/bin/$(1).oxt
 gb_Pagein_get_outdir_target = $(OUTDIR)/bin/pagein-$(1)
 gb_PackagePart_get_destinations = \
 	$(INSTDIR) \
@@ -96,9 +95,9 @@ gb_GenCxxObject_get_target = $(WORKDIR)/GenCxxObject/$(1).o
 gb_Executable_get_external_headers_target = $(WORKDIR)/ExternalHeaders/Executable/$(1)
 gb_Executable_get_headers_target = $(WORKDIR)/Headers/Executable/$(1)
 gb_Executable_get_runtime_target = $(WORKDIR_FOR_BUILD)/Executable/$(1).run
-gb_ExtensionTarget_get_target = $(WORKDIR)/ExtensionTarget/$(1).oxt
-gb_ExtensionTarget_get_rootdir = $(WORKDIR)/ExtensionTarget/$(1)/root
-gb_ExtensionTarget_get_workdir = $(WORKDIR)/ExtensionTarget/$(1)
+gb_Extension_get_target = $(WORKDIR)/Extension/$(1).oxt
+gb_Extension_get_rootdir = $(WORKDIR)/Extension/$(1)/root
+gb_Extension_get_workdir = $(WORKDIR)/Extension/$(1)
 gb_ExternalPackage_get_target = $(WORKDIR)/ExternalPackage/$(1)
 gb_ExternalProject_get_statedir = $(WORKDIR)/ExternalProject/$(1)
 gb_ExternalProject_get_preparation_target = $(WORKDIR)/ExternalProject/$(1).prepare
@@ -259,7 +258,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
 	DescriptionTranslateTarget \
 	Dictionary \
 	ExternalPackage \
-	ExtensionTarget \
+	Extension \
 	Gallery \
 	GeneratedPackage \
 	HelpTarget \
@@ -328,7 +327,6 @@ $(eval $(call gb_Helper_make_outdir_clean_targets,\
 	CliNativeLibrary \
 	CliUnoApi \
 	Executable \
-	Extension \
 	InstallScript \
 	Library \
 	StaticLibrary \

solenv/gbuild/gbuild.mk

@@ -331,9 +331,8 @@ include $(foreach class, \
 	Configuration \
 	HelpTarget \
 	AllLangHelp \
-	ExtensionTarget \
-	Dictionary \
 	Extension \
+	Dictionary \
 	InstallModuleTarget \
 	InstallModule \
 	InstallScript \

solenv/gbuild/platform/IOS_ARM_GCC.mk

@@ -254,9 +254,9 @@ gb_InstallScript_EXT := .ins
 gb_CliAssemblyTarget_POLICYEXT :=
 gb_CliAssemblyTarget_get_dll :=
 
-# ExtensionTarget class
+# Extension class
 
-gb_ExtensionTarget_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE
+gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE
 
 # UnpackedTarget class
 

solenv/gbuild/platform/WNT_INTEL_GCC.mk

@@ -388,9 +388,9 @@ gb_InstallScript_EXT := .inf
 gb_CliAssemblyTarget_POLICYEXT :=
 gb_CliAssemblyTarget_get_dll :=
 
-# ExtensionTarget class
+# Extension class
 
-gb_ExtensionTarget_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/license.txt
+gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/license.txt
 
 # UnpackedTarget class
 

solenv/gbuild/platform/com_MSC_class.mk

@@ -563,9 +563,9 @@ gb_InstallScript_EXT := .inf
 gb_CliAssemblyTarget_POLICYEXT := $(gb_Library_DLLEXT)
 gb_CliAssemblyTarget_get_dll = $(OUTDIR)/bin/$(1)$(gb_CliAssemblyTarget_POLICYEXT)
 
-# ExtensionTarget class
+# Extension class
 
-gb_ExtensionTarget_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/license.txt
+gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/license.txt
 
 # UnpackedTarget class
 

solenv/gbuild/platform/macosx.mk

@@ -356,9 +356,9 @@ gb_InstallScript_EXT := .ins
 gb_CliAssemblyTarget_POLICYEXT :=
 gb_CliAssemblyTarget_get_dll :=
 
-# ExtensionTarget class
+# Extension class
 
-gb_ExtensionTarget_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE
+gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE
 
 # UnpackedTarget class
 

solenv/gbuild/platform/solaris.mk

@@ -396,9 +396,9 @@ gb_InstallScript_EXT := .ins
 gb_CliAssemblyTarget_POLICYEXT :=
 gb_CliAssemblyTarget_get_dll :=
 
-# ExtensionTarget class
+# Extension class
 
-gb_ExtensionTarget_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE
+gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE
 
 # UnpackedTarget class
 

solenv/gbuild/platform/unxgcc.mk

@@ -395,9 +395,9 @@ gb_InstallScript_EXT := .ins
 gb_CliAssemblyTarget_POLICYEXT :=
 gb_CliAssemblyTarget_get_dll :=
 
-# ExtensionTarget class
+# Extension class
 
-gb_ExtensionTarget_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE
+gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE
 
 # UnpackedTarget class