ct2n/Extension_ct2n.mk | 55 ------------------------------------ ct2n/Module_ct2n.mk | 2 - ct2n/UnpackedTarball_ct2n.mk | 2 - ct2n/Zip_ct2n.mk | 59 +++++++++++++++++++++++++++++++++++++++ sc/source/core/data/conditio.cxx | 2 - solenv/gbuild/Dictionary.mk | 2 - solenv/gbuild/Extension.mk | 8 +---- solenv/gbuild/ExtensionTarget.mk | 12 +++---- solenv/gbuild/Zip.mk | 6 +++ 9 files changed, 76 insertions(+), 72 deletions(-)
New commits: commit 3113389d438a0e897e48a445f0443183331a3482 Author: Michael Stahl <[email protected]> Date: Thu Oct 25 00:31:55 2012 +0200 gbuild: Extension: remove ugly "nodefaults" mode again Change-Id: I723f70224a00972993d5b8592dd5e3834be7fd84 diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk index 9890748..c40e376 100644 --- a/solenv/gbuild/Dictionary.mk +++ b/solenv/gbuild/Dictionary.mk @@ -62,7 +62,7 @@ gb_Dictionary_extensionname = Dictionary/$(1) # # gb_Dictionary_Dictionary dictionary srcdir define gb_Dictionary_Dictionary -$(call gb_ExtensionTarget_ExtensionTarget,$(call gb_Dictionary_extensionname,$(1)),$(SRCDIR)/$(2),$(2)) +$(call gb_ExtensionTarget_ExtensionTarget,$(call gb_Dictionary_extensionname,$(1)),$(2)) $(call gb_Dictionary_add_root_file,$(1),$(2)/$(gb_Dictionary_CONFIGURATION_FILE)) $(call gb_Dictionary_get_target,$(1)) : $(call gb_ExtensionTarget_get_target,$(call gb_Dictionary_extensionname,$(1))) diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index ddf328b..eee1232 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -28,11 +28,9 @@ # Extension class define gb_Extension_Extension -$(call gb_ExtensionTarget_ExtensionTarget,$(1),$(if $(filter nodefaults,$(3)),$(2),$(SRCDIR)/$(2)),$(if $(filter nodefaults,$(3)),,$(2))) -$(if $(filter nodefaults,$(3)),,\ - $(call gb_ExtensionTarget_use_default_license,$(1))) -$(if $(filter nodefaults,$(3)),,\ - $(call gb_ExtensionTarget_use_default_description,$(1),$(2))) +$(call gb_ExtensionTarget_ExtensionTarget,$(1),$(2)) +$(call gb_ExtensionTarget_use_default_license,$(1)) +$(call gb_ExtensionTarget_use_default_description,$(1),$(2)) $(call gb_Extension_get_target,$(1)) : $(call gb_ExtensionTarget_get_target,$(1)) $(call gb_Extension_get_clean_target,$(1)) : $(call gb_ExtensionTarget_get_clean_target,$(1)) diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index fd55c51..3e76432 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -131,22 +131,22 @@ $(call gb_ExtensionTarget_get_target,%) : \ # add deliverable # add dependency for outdir target to workdir target (pattern rule for delivery is in Package.mk) # -# gb_ExtensionTarget_ExtensionTarget extension srcdir l10n-srcdir? +# gb_ExtensionTarget_ExtensionTarget extension srcdir define gb_ExtensionTarget_ExtensionTarget $(call gb_ExtensionTarget_get_target,$(1)) : DESCRIPTION := $(call gb_ExtensionTarget_get_target,$(1)) : FILES := META-INF description.xml $(call gb_ExtensionTarget_get_target,$(1)) : LICENSE := -$(call gb_ExtensionTarget_get_target,$(1)) : LOCATION := $(2) +$(call gb_ExtensionTarget_get_target,$(1)) : LOCATION := $(SRCDIR)/$(2) $(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM := $(PLATFORMID) -$(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(3))) +$(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2))) $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : \ - $(2)/description.xml + $(SRCDIR)/$(2)/description.xml $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml :| \ $(call gb_ExtensionTarget__get_preparation_target,$(1)) ifneq ($(strip $(gb_WITH_LANG)),) -$(if $(3),$(call gb_ExtensionTarget_get_target,$(1)) : SDF := $(gb_SDFLOCATION)/$(3)/localize.sdf) -$(if $(3),$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $(gb_SDFLOCATION)/$(3)/localize.sdf) +$(call gb_ExtensionTarget_get_target,$(1)) : SDF := $(gb_SDFLOCATION)/$(2)/localize.sdf +$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $(gb_SDFLOCATION)/$(2)/localize.sdf endif $(foreach lang,$(gb_ExtensionTarget_ALL_LANGS), \ commit ca284bb7467dd2ae711e35a1735234c6e828ef04 Author: Michael Stahl <[email protected]> Date: Thu Oct 25 00:19:30 2012 +0200 ct2n: use a Zip target after all, because... ... the ExtensionTarget requires the description.xml to have a translation in the --with-lang case. Change-Id: I155e47d8a44590995ffcd63cb9ac8f02822a82e9 diff --git a/ct2n/Extension_ct2n.mk b/ct2n/Extension_ct2n.mk deleted file mode 100644 index c052cda..0000000 --- a/ct2n/Extension_ct2n.mk +++ /dev/null @@ -1,55 +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_Extension_Extension,ConvertTextToNumber,\ - $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber),nodefaults)) - -CT2N_DIR := $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber) - -$(eval $(call gb_Extension_use_unpacked,ConvertTextToNumber,ConvertTextToNumber)) - -# we have our own LICENSE file; force using it instead of the default one -$(call gb_Extension_set_license,ConvertTextToNumber,$(CT2N_DIR)/registration/COPYING) - -$(eval $(call gb_Extension_add_files,ConvertTextToNumber,,\ - $(CT2N_DIR)/Addons.xcu \ -)) - -$(eval $(call gb_Extension_add_files,ConvertTextToNumber,CT2N,\ - $(CT2N_DIR)/CT2N/MainCode.xba \ - $(CT2N_DIR)/CT2N/ToClipbord.xba \ - $(CT2N_DIR)/CT2N/Language.xba \ - $(CT2N_DIR)/CT2N/dialog.xlb \ - $(CT2N_DIR)/CT2N/dlgCode.xba \ - $(CT2N_DIR)/CT2N/script.xlb \ - $(CT2N_DIR)/CT2N/dlgCT2N.xdl \ - $(CT2N_DIR)/CT2N/UserSettings.xba \ -)) - -$(eval $(call gb_Extension_add_files,ConvertTextToNumber,Office/UI,\ - $(CT2N_DIR)/Office/UI/BaseWindowState.xcu \ - $(CT2N_DIR)/Office/UI/ImpressWindowState.xcu \ - $(CT2N_DIR)/Office/UI/StartModuleWindowState.xcu \ - $(CT2N_DIR)/Office/UI/BasicIDEWindowState.xcu \ - $(CT2N_DIR)/Office/UI/CalcWindowState.xcu \ - $(CT2N_DIR)/Office/UI/WriterWindowState.xcu \ - $(CT2N_DIR)/Office/UI/DrawWindowState.xcu \ - $(CT2N_DIR)/Office/UI/MathWindowState.xcu \ -)) - -$(eval $(call gb_Extension_add_files,ConvertTextToNumber,icons,\ - $(CT2N_DIR)/icons/image1_26.bmp \ - $(CT2N_DIR)/icons/image1_16.bmp \ -)) - -$(eval $(call gb_Extension_add_files,ConvertTextToNumber,pkg-desc,\ - $(CT2N_DIR)/pkg-desc/pkg-description.txt \ -)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/ct2n/Module_ct2n.mk b/ct2n/Module_ct2n.mk index 3fdb546..189222d 100644 --- a/ct2n/Module_ct2n.mk +++ b/ct2n/Module_ct2n.mk @@ -13,7 +13,7 @@ ifneq (,$(filter CT2N,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,ConvertTextToNumber,\ UnpackedTarball_ct2n \ - Extension_ct2n \ + Zip_ct2n \ )) endif diff --git a/ct2n/UnpackedTarball_ct2n.mk b/ct2n/UnpackedTarball_ct2n.mk index bf96226..df9f466 100644 --- a/ct2n/UnpackedTarball_ct2n.mk +++ b/ct2n/UnpackedTarball_ct2n.mk @@ -28,6 +28,4 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,ConvertTextToNumber,\ Office/UI/WriterWindowState.xcu \ )) -$(eval $(call gb_UnpackedTarball_mark_output_file,ConvertTextToNumber,description.xml)) - # vim: set noet sw=4 ts=4: diff --git a/ct2n/Zip_ct2n.mk b/ct2n/Zip_ct2n.mk index 611e134..c365dc9 100644 --- a/ct2n/Zip_ct2n.mk +++ b/ct2n/Zip_ct2n.mk @@ -7,11 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,ct2n,$(call gb_UnpackedTarball_get_dir,ct2n))) +$(eval $(call gb_Zip_Zip,ct2n,$(call gb_UnpackedTarball_get_dir,ConvertTextToNumber))) -$(eval $(call gb_Zip_add_dependencies,ct2n,\ - $(call gb_UnpackedTarball_get_target,ct2n) \ -)) +$(eval $(call gb_Zip_use_unpacked,ct2n,ConvertTextToNumber)) $(eval $(call gb_Zip_add_files,ct2n,\ Addons.xcu \ @@ -46,6 +44,8 @@ $(eval $(call gb_Zip_add_files,ct2n,\ registration/COPYING \ )) +# UGLY: the Zip target always has .zip suffix, so copy the file to .oxt here... + $(call gb_Zip_get_final_target,ct2n) : $(OUTDIR)/bin/ConvertTextToNumber.oxt $(call gb_Zip_get_clean_target,ct2n) : Clean_ConvertTextToNumber_oxt diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk index a7239cd..715b495 100644 --- a/solenv/gbuild/Zip.mk +++ b/solenv/gbuild/Zip.mk @@ -128,4 +128,10 @@ $(call gb_Zip_get_target,$(1)) : gb_Zip_ZIPCOMMAND += $(2) endef +define gb_Zip_use_unpacked +$(call gb_Zip__get_preparation_target,$(1)) \ + :| $(call gb_UnpackedTarball_get_final_target,$(2)) + +endef + # vim: set noet sw=4 ts=4: commit f5e2af01af58ca548a920b72d23a3086397e8c30 Author: David Ostrovsky <[email protected]> Date: Wed Oct 24 23:54:43 2012 +0200 ct2n: add Zip file from original gerrit patch Change-Id: I58a547db30dda833cf1dd6a7563cd1589876431e diff --git a/ct2n/Zip_ct2n.mk b/ct2n/Zip_ct2n.mk new file mode 100644 index 0000000..611e134 --- /dev/null +++ b/ct2n/Zip_ct2n.mk @@ -0,0 +1,59 @@ +# -*- 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_Zip_Zip,ct2n,$(call gb_UnpackedTarball_get_dir,ct2n))) + +$(eval $(call gb_Zip_add_dependencies,ct2n,\ + $(call gb_UnpackedTarball_get_target,ct2n) \ +)) + +$(eval $(call gb_Zip_add_files,ct2n,\ + Addons.xcu \ + CT2N \ + CT2N/MainCode.xba \ + CT2N/ToClipbord.xba \ + CT2N/Language.xba \ + CT2N/dialog.xlb \ + CT2N/dlgCode.xba \ + CT2N/script.xlb \ + CT2N/dlgCT2N.xdl \ + CT2N/UserSettings.xba \ + META-INF \ + META-INF/manifest.xml \ + Office \ + Office/UI \ + Office/UI/BaseWindowState.xcu \ + Office/UI/ImpressWindowState.xcu \ + Office/UI/StartModuleWindowState.xcu \ + Office/UI/BasicIDEWindowState.xcu \ + Office/UI/CalcWindowState.xcu \ + Office/UI/WriterWindowState.xcu \ + Office/UI/DrawWindowState.xcu \ + Office/UI/MathWindowState.xcu \ + description.xml \ + icons \ + icons/image1_26.bmp \ + icons/image1_16.bmp \ + pkg-desc \ + pkg-desc/pkg-description.txt \ + registration \ + registration/COPYING \ +)) + +$(call gb_Zip_get_final_target,ct2n) : $(OUTDIR)/bin/ConvertTextToNumber.oxt +$(call gb_Zip_get_clean_target,ct2n) : Clean_ConvertTextToNumber_oxt + +$(OUTDIR)/bin/ConvertTextToNumber.oxt : $(call gb_Zip_get_target,ct2n) + $(call gb_Deliver_deliver,$<,$@) + +.PHONY : Clean_ConvertTextToNumber_oxt +Clean_ConvertTextToNumber_oxt : + rm -f $(OUTDIR)/bin/ConvertTextToNumber.oxt + +# vim: set noet sw=4 ts=4: commit 13b000d639e96e3b4eda7e8527d74bf6f9edebcd Author: Michael Stahl <[email protected]> Date: Wed Oct 24 22:51:14 2012 +0200 sc: warning C4702: unreachable code Change-Id: I9a6668a785d1dd6d6f02716519dedb01fb90af00 diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index e72556f..773d60a 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -845,8 +845,6 @@ bool ScConditionEntry::IsDuplicate( double nArg, const rtl::OUString& rStr, cons return false; } } - - return false; } bool ScConditionEntry::IsValid( double nArg, const ScAddress& rAddr ) const _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
