Skip to content

C
core
Kaydet (Commit) a714cf18 authored tarafından Matúš Kukan's avatar Matúš Kukan
Dosyalara gözat
Seçenekler

gbuild: install extension directly from workdir 

Also kill ExtensionTarget indirection causing duplication.

Change-Id: I24f7e6d85df6acf2ededaade20dd1a788d916594
üst b8e09de4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 24 deletions
scp2/source/extensions/file_extensions.scp
Dosyayı görüntüle @ a714cf18
...@@ -30,7 +30,7 @@ File gid_File_Oxt_Presentation_Minimizer ...@@ -30,7 +30,7 @@ File gid_File_Oxt_Presentation_Minimizer
TXT_FILE_BODY; TXT_FILE_BODY;
Styles = (PACKED, ARCHIVE); Styles = (PACKED, ARCHIVE);
Dir = gid_Brand_Dir_Share_Extensions_Presentation_Minimizer; Dir = gid_Brand_Dir_Share_Extensions_Presentation_Minimizer;
Name = "presentation-minimizer.oxt"; Name = "Extension/presentation-minimizer.oxt";
End End
#endif #endif
...@@ -43,7 +43,7 @@ File gid_File_Oxt_MediaWiki ...@@ -43,7 +43,7 @@ File gid_File_Oxt_MediaWiki
TXT_FILE_BODY; TXT_FILE_BODY;
Styles = (PACKED, ARCHIVE); Styles = (PACKED, ARCHIVE);
Dir = gid_Brand_Dir_Share_Extensions_MediaWiki; Dir = gid_Brand_Dir_Share_Extensions_MediaWiki;
Name = "wiki-publisher.oxt"; Name = "Extension/wiki-publisher.oxt";
End End
#endif #endif
...@@ -173,7 +173,7 @@ File gid_File_Oxt_NLPSolver ...@@ -173,7 +173,7 @@ File gid_File_Oxt_NLPSolver
TXT_FILE_BODY; TXT_FILE_BODY;
Styles = (PACKED, ARCHIVE); Styles = (PACKED, ARCHIVE);
Dir = gid_Brand_Dir_Share_Extensions_NLPSolver; Dir = gid_Brand_Dir_Share_Extensions_NLPSolver;
Name = "nlpsolver.oxt"; Name = "Extension/nlpsolver.oxt";
End End
#endif #endif
...@@ -199,7 +199,7 @@ File gid_File_Oxt_MySQLConnector ...@@ -199,7 +199,7 @@ File gid_File_Oxt_MySQLConnector
TXT_FILE_BODY; TXT_FILE_BODY;
Styles = (PACKED, ARCHIVE); Styles = (PACKED, ARCHIVE);
Dir = gid_Brand_Dir_Share_Extensions_MySQLConnector; Dir = gid_Brand_Dir_Share_Extensions_MySQLConnector;
Name = "mysql-connector-ooo.oxt"; Name = "Extension/mysql-connector-ooo.oxt";
End End
#endif #endif
......
solenv/gbuild/Extension.mk
Dosyayı görüntüle @ a714cf18
This diff is collapsed.
solenv/gbuild/ExtensionTarget.mk deleted 100644 → 0
Dosyayı görüntüle @ b8e09de4
This diff is collapsed.
solenv/gbuild/TargetLocations.mk
Dosyayı görüntüle @ a714cf18
...@@ -24,7 +24,6 @@ gb_CliNativeLibrary_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliNativeLib ...@@ -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_CliUnoApi_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliUnoApi_EXT)
gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_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_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_Pagein_get_outdir_target = $(OUTDIR)/bin/pagein-$(1)
gb_PackagePart_get_destinations = \ gb_PackagePart_get_destinations = \
$(INSTDIR) \ $(INSTDIR) \
...@@ -96,9 +95,9 @@ gb_GenCxxObject_get_target = $(WORKDIR)/GenCxxObject/$(1).o ...@@ -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_external_headers_target = $(WORKDIR)/ExternalHeaders/Executable/$(1)
gb_Executable_get_headers_target = $(WORKDIR)/Headers/Executable/$(1) gb_Executable_get_headers_target = $(WORKDIR)/Headers/Executable/$(1)
gb_Executable_get_runtime_target = $(WORKDIR_FOR_BUILD)/Executable/$(1).run gb_Executable_get_runtime_target = $(WORKDIR_FOR_BUILD)/Executable/$(1).run
gb_ExtensionTarget_get_target = $(WORKDIR)/ExtensionTarget/$(1).oxt gb_Extension_get_target = $(WORKDIR)/Extension/$(1).oxt
gb_ExtensionTarget_get_rootdir = $(WORKDIR)/ExtensionTarget/$(1)/root gb_Extension_get_rootdir = $(WORKDIR)/Extension/$(1)/root
gb_ExtensionTarget_get_workdir = $(WORKDIR)/ExtensionTarget/$(1) gb_Extension_get_workdir = $(WORKDIR)/Extension/$(1)
gb_ExternalPackage_get_target = $(WORKDIR)/ExternalPackage/$(1) gb_ExternalPackage_get_target = $(WORKDIR)/ExternalPackage/$(1)
gb_ExternalProject_get_statedir = $(WORKDIR)/ExternalProject/$(1) gb_ExternalProject_get_statedir = $(WORKDIR)/ExternalProject/$(1)
gb_ExternalProject_get_preparation_target = $(WORKDIR)/ExternalProject/$(1).prepare gb_ExternalProject_get_preparation_target = $(WORKDIR)/ExternalProject/$(1).prepare
...@@ -259,7 +258,7 @@ $(eval $(call gb_Helper_make_clean_targets,\ ...@@ -259,7 +258,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
DescriptionTranslateTarget \ DescriptionTranslateTarget \
Dictionary \ Dictionary \
ExternalPackage \ ExternalPackage \
ExtensionTarget \ Extension \
Gallery \ Gallery \
GeneratedPackage \ GeneratedPackage \
HelpTarget \ HelpTarget \
...@@ -328,7 +327,6 @@ $(eval $(call gb_Helper_make_outdir_clean_targets,\ ...@@ -328,7 +327,6 @@ $(eval $(call gb_Helper_make_outdir_clean_targets,\
CliNativeLibrary \ CliNativeLibrary \
CliUnoApi \ CliUnoApi \
Executable \ Executable \
Extension \
InstallScript \ InstallScript \
Library \ Library \
StaticLibrary \ StaticLibrary \
......
solenv/gbuild/gbuild.mk
Dosyayı görüntüle @ a714cf18
...@@ -331,9 +331,8 @@ include $(foreach class, \ ...@@ -331,9 +331,8 @@ include $(foreach class, \
Configuration \ Configuration \
HelpTarget \ HelpTarget \
AllLangHelp \ AllLangHelp \
ExtensionTarget \
Dictionary \
Extension \ Extension \
Dictionary \
InstallModuleTarget \ InstallModuleTarget \
InstallModule \ InstallModule \
InstallScript \ InstallScript \
......
solenv/gbuild/platform/IOS_ARM_GCC.mk
Dosyayı görüntüle @ a714cf18
...@@ -254,9 +254,9 @@ gb_InstallScript_EXT := .ins ...@@ -254,9 +254,9 @@ gb_InstallScript_EXT := .ins
gb_CliAssemblyTarget_POLICYEXT := gb_CliAssemblyTarget_POLICYEXT :=
gb_CliAssemblyTarget_get_dll := 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 # UnpackedTarget class
......
solenv/gbuild/platform/WNT_INTEL_GCC.mk
Dosyayı görüntüle @ a714cf18
...@@ -388,9 +388,9 @@ gb_InstallScript_EXT := .inf ...@@ -388,9 +388,9 @@ gb_InstallScript_EXT := .inf
gb_CliAssemblyTarget_POLICYEXT := gb_CliAssemblyTarget_POLICYEXT :=
gb_CliAssemblyTarget_get_dll := 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 # UnpackedTarget class
......
solenv/gbuild/platform/com_MSC_class.mk
Dosyayı görüntüle @ a714cf18
...@@ -563,9 +563,9 @@ gb_InstallScript_EXT := .inf ...@@ -563,9 +563,9 @@ gb_InstallScript_EXT := .inf
gb_CliAssemblyTarget_POLICYEXT := $(gb_Library_DLLEXT) gb_CliAssemblyTarget_POLICYEXT := $(gb_Library_DLLEXT)
gb_CliAssemblyTarget_get_dll = $(OUTDIR)/bin/$(1)$(gb_CliAssemblyTarget_POLICYEXT) 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 # UnpackedTarget class
......
solenv/gbuild/platform/macosx.mk
Dosyayı görüntüle @ a714cf18
...@@ -356,9 +356,9 @@ gb_InstallScript_EXT := .ins ...@@ -356,9 +356,9 @@ gb_InstallScript_EXT := .ins
gb_CliAssemblyTarget_POLICYEXT := gb_CliAssemblyTarget_POLICYEXT :=
gb_CliAssemblyTarget_get_dll := 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 # UnpackedTarget class
......
solenv/gbuild/platform/solaris.mk
Dosyayı görüntüle @ a714cf18
...@@ -396,9 +396,9 @@ gb_InstallScript_EXT := .ins ...@@ -396,9 +396,9 @@ gb_InstallScript_EXT := .ins
gb_CliAssemblyTarget_POLICYEXT := gb_CliAssemblyTarget_POLICYEXT :=
gb_CliAssemblyTarget_get_dll := 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 # UnpackedTarget class
......
solenv/gbuild/platform/unxgcc.mk
Dosyayı görüntüle @ a714cf18
...@@ -395,9 +395,9 @@ gb_InstallScript_EXT := .ins ...@@ -395,9 +395,9 @@ gb_InstallScript_EXT := .ins
gb_CliAssemblyTarget_POLICYEXT := gb_CliAssemblyTarget_POLICYEXT :=
gb_CliAssemblyTarget_get_dll := 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 # UnpackedTarget class
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment