Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2555
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/55/2555/1
remove ScpConvertTarget class, no codepage conversion is needed
Change-Id: I45f309c6c23704af8638003fd54f1a7e45062d61
---
M solenv/gbuild/InstallModuleTarget.mk
M solenv/gbuild/TargetLocations.mk
M solenv/gbuild/platform/IOS_ARM_GCC.mk
M solenv/gbuild/platform/WNT_INTEL_GCC.mk
M solenv/gbuild/platform/com_MSC_class.mk
M solenv/gbuild/platform/macosx.mk
M solenv/gbuild/platform/solaris.mk
M solenv/gbuild/platform/unxgcc.mk
8 files changed, 5 insertions(+), 76 deletions(-)
diff --git a/solenv/gbuild/InstallModuleTarget.mk
b/solenv/gbuild/InstallModuleTarget.mk
index dbdd1d7..bed84ad 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -150,43 +150,6 @@
endef
-# ScpConvertTarget class
-
-# platform:
-# gb_ScpConvertTarget_ScpConvertTarget_platform
-
-gb_ScpConvertTarget_DEPS := $(call
gb_Executable_get_runtime_dependencies,ulfconv)
-gb_ScpConvertTarget_COMMAND := $(call gb_Executable_get_command,ulfconv)
-
-define gb_ScpConvertTarget__command
-$(call gb_Output_announce,$(2),$(true),SCC,1)
-$(call gb_Helper_abbreviate_dirs,\
- $(gb_ScpConvertTarget_COMMAND) $(SCP_FLAGS) -o $(1) $(SCP_CONVERT_ULF) \
-)
-endef
-
-$(dir $(call gb_ScpConvertTarget_get_target,%))%/.dir :
- $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(call gb_ScpConvertTarget_get_target,%) : $(gb_ScpConvertTarget_DEPS)
- $(call gb_ScpConvertTarget__command,$@,$*)
-
-.PHONY : $(call gb_ScpConvertTarget_get_clean_target,%)
-$(call gb_ScpConvertTarget_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),SCC,1)
- rm -f $(call gb_ScpConvertTarget_get_target,$*)
-
-# gb_ScpConvertTarget_ScpConvertTarget(<target>,<ulffile>)
-define gb_ScpConvertTarget_ScpConvertTarget
-$(call gb_ScpConvertTarget_get_target,$(1)) : $(2)
-$(call gb_ScpConvertTarget_get_target,$(1)) :| $(dir $(call
gb_ScpConvertTarget_get_target,$(1))).dir
-$(call gb_ScpConvertTarget_get_target,$(1)) : SCP_CONVERT_ULF := $(2)
-$(call gb_ScpConvertTarget_get_target,$(1)) : SCP_FLAGS :=
-
-$(call gb_ScpConvertTarget_ScpConvertTarget_platform,$(1))
-
-endef
-
# ScpTarget class
gb_ScpTarget_TARGET := $(SOLARENV)/bin/pre2par.pl
@@ -232,15 +195,15 @@
define gb_ScpTarget_set_localized
ifneq ($(gb_WITH_LANG),)
$(call gb_ScpMergeTarget_ScpMergeTarget,$(1))
-$(call gb_ScpConvertTarget_ScpConvertTarget,$(1),$(call
gb_ScpMergeTarget_get_target,$(1)))
+$(call gb_ScpMergeTarget_ScpMergeTarget,$(1),$(call
gb_ScpMergeTarget_get_target,$(1)))
$(call gb_ScpTarget_get_clean_target,$(1)) : $(call
gb_ScpMergeTarget_get_clean_target,$(1))
else
-$(call gb_ScpConvertTarget_ScpConvertTarget,$(1),$(call
gb_ScpMergeTarget_get_source,$(1)))
+$(call gb_ScpMergeTarget_ScpMergeTarget,$(1),$(call
gb_ScpMergeTarget_get_source,$(1)))
endif
-$(call gb_ScpTarget_get_target,$(1)) : $(call
gb_ScpConvertTarget_get_target,$(1))
-$(call gb_ScpTarget_get_clean_target,$(1)) : $(call
gb_ScpConvertTarget_get_clean_target,$(1))
-$(call gb_ScpTarget_get_target,$(1)) : SCP_ULF := $(call
gb_ScpConvertTarget_get_target,$(1))
+$(call gb_ScpTarget_get_target,$(1)) : $(call
gb_ScpMergeTarget_get_target,$(1))
+$(call gb_ScpTarget_get_clean_target,$(1)) : $(call
gb_ScpMergeTarget_get_clean_target,$(1))
+$(call gb_ScpTarget_get_target,$(1)) : SCP_ULF := $(call
gb_ScpMergeTarget_get_target,$(1))
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index b46070e..6fa782b 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -176,7 +176,6 @@
gb_Rdb_get_target = $(WORKDIR)/Rdb/$(1).rdb
gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst
gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res
-gb_ScpConvertTarget_get_target = $(WORKDIR)/ScpConvertTarget/$(1).ulf
gb_ScpMergeTarget_get_target = $(WORKDIR)/ScpMergeTarget/$(1).ulf
gb_ScpPreprocessTarget_get_target = $(WORKDIR)/ScpPreprocessTarget/$(1).pre
gb_ScpTarget_get_external_target = $(WORKDIR)/ScpTarget/$(1).external
@@ -292,7 +291,6 @@
Pyuno \
Rdb \
ResTarget \
- ScpConvertTarget \
ScpMergeTarget \
ScpPreprocessTarget \
ScpTarget \
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 3d14f54..e29a9bf 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -259,10 +259,6 @@
endef
-# ScpConvertTarget class
-
-gb_ScpConvertTarget_ScpConvertTarget_platform :=
-
# InstallScript class
gb_InstallScript_EXT := .ins
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 5b5c21e..b70e84b 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -394,14 +394,6 @@
endef
-# ScpConvertTarget class
-
-define gb_ScpConvertTarget_ScpConvertTarget_platform
-$(call gb_ScpConvertTarget_get_target,$(1)) :|
$(OUTDIR)/bin/msi-encodinglist.txt
-$(call gb_ScpConvertTarget_get_target,$(1)) : SCP_FLAGS := -t
$(OUTDIR)/bin/msi-encodinglist.txt
-
-endef
-
# InstallScript class
gb_InstallScript_EXT := .inf
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index 7e00319..e3307e6 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -538,14 +538,6 @@
endef
-# ScpConvertTarget class
-
-define gb_ScpConvertTarget_ScpConvertTarget_platform
-$(call gb_ScpConvertTarget_get_target,$(1)) :|
$(OUTDIR)/bin/msi-encodinglist.txt
-$(call gb_ScpConvertTarget_get_target,$(1)) : SCP_FLAGS := -t
$(OUTDIR)/bin/msi-encodinglist.txt
-
-endef
-
# InstallScript class
gb_InstallScript_EXT := .inf
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 29e3549..c770d90 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -347,10 +347,6 @@
endef
-# ScpConvertTarget class
-
-gb_ScpConvertTarget_ScpConvertTarget_platform :=
-
# InstallScript class
gb_InstallScript_EXT := .ins
diff --git a/solenv/gbuild/platform/solaris.mk
b/solenv/gbuild/platform/solaris.mk
index 67c5e88..d7a14c5 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -380,10 +380,6 @@
endef
-# ScpConvertTarget class
-
-gb_ScpConvertTarget_ScpConvertTarget_platform :=
-
# InstallScript class
gb_InstallScript_EXT := .ins
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 104fe7f..ef640da 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -379,10 +379,6 @@
endef
-# ScpConvertTarget class
-
-gb_ScpConvertTarget_ScpConvertTarget_platform :=
-
# InstallScript class
gb_InstallScript_EXT := .ins
--
To view, visit https://gerrit.libreoffice.org/2555
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I45f309c6c23704af8638003fd54f1a7e45062d61
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Andras Timar <ati...@suse.com>
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
