[Libreoffice-commits] .: 4 commits - configure.ac solenv/gbuild

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Oct 22 05:35:15 PDT 2012 

 configure.ac                     |    6 +++---
 solenv/gbuild/CliAssembly.mk     |   34 ++++++++++++++++++++++++++++------
 solenv/gbuild/TargetLocations.mk |    3 ++-
 3 files changed, 33 insertions(+), 10 deletions(-)

New commits:
commit bec62421a45da89d2812bdff30fbbab73291cf91
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Oct 22 13:57:11 2012 +0200

    factor out common code
    
    Change-Id: I733dc593b2395e06bf86d8ad9dec16c958c880b9

diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk
index 13eaaa2..b6e216a 100644
--- a/solenv/gbuild/CliAssembly.mk
+++ b/solenv/gbuild/CliAssembly.mk
@@ -158,9 +158,14 @@ $(call gb_CliAssembly_get_clean_target,$(1)) : $(call gb_Package_get_clean_targe
 
 endef
 
+define gb_CliAssembly__add_file
+$(call gb_Package_add_file,$(1)_assembly,bin/$(notdir $(2)),$(subst $(WORKDIR)/,,$(2)))
+
+endef
+
 define gb_CliAssembly__set_configfile_impl
 $(call gb_CliAssemblyTarget_set_configfile,$(1),$(2))
-$(call gb_Package_add_file,$(1)_assembly,bin/$(notdir $(2)),$(subst $(WORKDIR)/,,$(2)))
+$(call gb_CliAssembly__add_file,$(1),$(2))
 
 endef
 
@@ -185,15 +190,10 @@ $(call gb_CliAssemblyTarget_set_platform,$(1),$(2))
 
 endef
 
-define gb_CliAssembly__set_policy
-$(call gb_Package_add_file,$(1)_assembly,bin/$(notdir $(2)),$(subst $(WORKDIR)/,,$(2)))
-
-endef
-
 define gb_CliAssembly_set_policy
 $(call gb_CliAssemblyTarget_set_version,$(1),$(3))
 $(call gb_CliAssemblyTarget_set_name,$(1),$(2))
-$(call gb_CliAssembly__set_policy,$(1),$(call gb_CliAssemblyTarget_get_assembly_target,$(2)))
+$(call gb_CliAssembly__add_file,$(1),$(call gb_CliAssemblyTarget_get_assembly_target,$(2)))
 
 endef
 
commit cbd9dddb4d259df3ab7b3e58e5b7165d18037c1a
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Oct 22 13:55:17 2012 +0200

    fdo#55290 create CLI assemblies with the right name
    
    Change-Id: I521a8a1fc013684fde6055d7e2c32790462e64c6

diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk
index 440b408..13eaaa2 100644
--- a/solenv/gbuild/CliAssembly.mk
+++ b/solenv/gbuild/CliAssembly.mk
@@ -56,11 +56,12 @@ define gb_CliAssemblyTarget__command
 $(call gb_Output_announce,$(2),$(true),AL ,2)
 $(call gb_Helper_abbreviate_dirs,\
 	al \
-		-out:$(1) \
+		-out:$(CLI_ASSEMBLY_OUTFILE) \
 		-version:$(CLI_ASSEMBLY_VERSION) \
 		-keyfile:$(call gb_Helper_windows_path,$(CLI_ASSEMBLY_KEYFILE)) \
 		-link:$(CLI_ASSEMBLY_CONFIGFILE) \
-		$(if $(CLI_ASSEMBLY_PLATFORM),-platform:$(CLI_ASSEMBLY_PLATFORM)) \
+		$(if $(CLI_ASSEMBLY_PLATFORM),-platform:$(CLI_ASSEMBLY_PLATFORM)) && \
+	touch $(1) \
 )
 endef
 
@@ -73,22 +74,29 @@ $(dir $(call gb_CliAssemblyTarget_get_target,%))%/.dir :
 $(call gb_CliAssemblyTarget_get_target,%) :
 	$(if $(strip $(CLI_ASSEMBLY_VERSION)),,$(call gb_Output_error,assembly version not set))
 	$(if $(strip $(CLI_ASSEMBLY_CONFIGFILE)),,$(call gb_Output_error,assembly configuration file not set))
+	$(if $(strip $(CLI_ASSEMBLY_NAME)),,$(call gb_Output_error,assembly name not set))
 	$(call gb_CliAssemblyTarget__command,$@,$*,$<)
 
+$(call gb_CliAssemblyTarget_get_assembly_target,%) :
+	touch $@
+
 .PHONY : $(call gb_CliAssemblyTarget_get_clean_target,%)
 $(call gb_CliAssemblyTarget_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),AL ,2)
 	$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_CliAssemblyTarget_get_target,$*) \
+		rm -f $(call gb_CliAssemblyTarget_get_target,$*) $(CLI_ASSEMBLY_OUTFILE) \
 	)
 
 # Create a CLI assembly
 define gb_CliAssemblyTarget_CliAssemblyTarget
 $(call gb_CliAssemblyTarget_get_target,$(1)) : CLI_ASSEMBLY_CONFIGFILE :=
 $(call gb_CliAssemblyTarget_get_target,$(1)) : CLI_ASSEMBLY_KEYFILE := $(gb_CliAssemblyTarget_KEYFILE_DEFAULT)
+$(call gb_CliAssemblyTarget_get_target,$(1)) : CLI_ASSEMBLY_OUTFILE :=
 $(call gb_CliAssemblyTarget_get_target,$(1)) : CLI_ASSEMBLY_PLATFORM :=
 $(call gb_CliAssemblyTarget_get_target,$(1)) : CLI_ASSEMBLY_VERSION :=
 
+$(call gb_CliAssemblyTarget_get_clean_target,$(1)) : CLI_ASSEMBLY_OUTFILE :=
+
 $(call gb_CliAssemblyTarget_get_target,$(1)) :| $(dir $(call gb_CliAssemblyTarget_get_target,$(1))).dir
 
 endef
@@ -105,6 +113,14 @@ $(call gb_CliAssemblyTarget_get_target,$(1)) : $(2)
 
 endef
 
+define gb_CliAssemblyTarget_set_name
+$(call gb_CliAssemblyTarget_get_target,$(1)) \
+$(call gb_CliAssemblyTarget_get_clean_target,$(1)) : \
+	CLI_ASSEMBLY_OUTFILE := $(call gb_CliAssemblyTarget_get_assembly_target,$(2))
+$(call gb_CliAssemblyTarget_get_assembly_target,$(2)) : $(call gb_CliAssemblyTarget_get_target,$(1))
+
+endef
+
 define gb_CliAssemblyTarget_set_platform
 $(call gb_CliAssemblyTarget_get_target,$(1)) : CLI_ASSEMBLY_PLATFORM := $(2)
 
@@ -169,9 +185,15 @@ $(call gb_CliAssemblyTarget_set_platform,$(1),$(2))
 
 endef
 
+define gb_CliAssembly__set_policy
+$(call gb_Package_add_file,$(1)_assembly,bin/$(notdir $(2)),$(subst $(WORKDIR)/,,$(2)))
+
+endef
+
 define gb_CliAssembly_set_policy
 $(call gb_CliAssemblyTarget_set_version,$(1),$(3))
-$(call gb_Package_add_file,$(1)_assembly,bin/$(2)$(gb_CliAssembly_POLICYEXT),$(subst $(WORKDIR)/,,$(call gb_CliAssemblyTarget_get_target,$(1))))
+$(call gb_CliAssemblyTarget_set_name,$(1),$(2))
+$(call gb_CliAssembly__set_policy,$(1),$(call gb_CliAssemblyTarget_get_assembly_target,$(2)))
 
 endef
 
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 514c7f3..36ff8ed 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -83,7 +83,8 @@ gb_AsmObject_get_target = $(WORKDIR)/AsmObject/$(1).o
 gb_CObject_get_target = $(WORKDIR)/CObject/$(1).o
 gb_GenCObject_get_target = $(WORKDIR)/GenCObject/$(1).o
 gb_CliAssembly_get_target = $(WORKDIR)/CliAssembly/$(1).done
-gb_CliAssemblyTarget_get_target = $(WORKDIR)/CliAssemblyTarget/$(1)$(gb_CliAssemblyTarget_POLICYEXT)
+gb_CliAssemblyTarget_get_target = $(WORKDIR)/CliAssemblyTarget/$(1).done
+gb_CliAssemblyTarget_get_assembly_target = $(WORKDIR)/CliAssemblyTarget/$(1)$(gb_CliAssemblyTarget_POLICYEXT)
 gb_CliConfigTarget_get_target = $(WORKDIR)/CliConfigTarget/$(1).config
 gb_CliLibraryTarget_get_target = $(WORKDIR)/CliLibraryTarget/$(1)$(gb_CliLibraryTarget_EXT)
 gb_CliNativeLibraryTarget_get_external_target = $(WORKDIR)/CliNativeLibraryTarget/$(1).external
commit 39f4b3d6dfc2a7709aa8c4a39fa049cd3c6cf9a0
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Oct 22 13:27:19 2012 +0200

    add missing dep
    
    Change-Id: Ic902a7399a810fcf3331dc9c728c22a1f2a14d4d

diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk
index e3a87bd..440b408 100644
--- a/solenv/gbuild/CliAssembly.mk
+++ b/solenv/gbuild/CliAssembly.mk
@@ -89,7 +89,6 @@ $(call gb_CliAssemblyTarget_get_target,$(1)) : CLI_ASSEMBLY_KEYFILE := $(gb_CliA
 $(call gb_CliAssemblyTarget_get_target,$(1)) : CLI_ASSEMBLY_PLATFORM :=
 $(call gb_CliAssemblyTarget_get_target,$(1)) : CLI_ASSEMBLY_VERSION :=
 
-$(call gb_CliAssemblyTarget_get_target,$(1)) : $$(CLI_ASSEMBLY_KEYFILE)
 $(call gb_CliAssemblyTarget_get_target,$(1)) :| $(dir $(call gb_CliAssemblyTarget_get_target,$(1))).dir
 
 endef
@@ -102,6 +101,7 @@ endef
 
 define gb_CliAssemblyTarget_set_keyfile
 $(call gb_CliAssemblyTarget_get_target,$(1)) : CLI_ASSEMBLY_KEYFILE := $(2)
+$(call gb_CliAssemblyTarget_get_target,$(1)) : $(2)
 
 endef
 
commit 7f82096840a76ace982d1210cc098014a149b6a6
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Oct 22 13:26:57 2012 +0200

    use absolute path
    
    Change-Id: Ic814cba74dede2f5a079242d0194fe7579e670ab

diff --git a/configure.ac b/configure.ac
index da5d5a7..78836b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12257,9 +12257,9 @@ AC_SUBST(GIT_NEEDED_SUBMODULES)
 PathFormat "$SRC_ROOT/translations"
 L10N_MODULE="$formatted_path"
 WITH_POOR_HELP_LOCALIZATIONS=
-if test -d "./translations/source"; then
-    for l in `ls -1 translations/source`; do
-        if test ! -d translations/source/$l/helpcontent2; then
+if test -d "$SRC_ROOT/translations/source"; then
+    for l in `ls -1 $SRC_ROOT/translations/source`; do
+        if test ! -d "$SRC_ROOT/translations/source/$l/helpcontent2"; then
             WITH_POOR_HELP_LOCALIZATIONS="$WITH_POOR_HELP_LOCALIZATIONS $l"
         fi
     done

More information about the Libreoffice-commits mailing list