[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - rat-excludes solenv/ant solenv/gbuild
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Nov 27 01:09:43 UTC 2018
rat-excludes | 1 +
solenv/ant/aoo-ant.xml | 2 +-
solenv/gbuild/Ant.mk | 3 +--
solenv/gbuild/platform/freebsd.mk | 10 ++++++++++
solenv/gbuild/platform/linux.mk | 10 ++++++++++
solenv/gbuild/platform/macosx.mk | 10 ++++++++++
solenv/gbuild/platform/os2.mk | 9 +++++++++
solenv/gbuild/platform/solaris.mk | 10 ++++++++++
solenv/gbuild/platform/windows.mk | 10 ++++++++++
solenv/gbuild/platform/winmingw.mk | 9 +++++++++
10 files changed, 71 insertions(+), 3 deletions(-)
New commits:
commit 12a5af41357ade9fd8b966930ff36bf402eb0b2d
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Tue Nov 27 00:51:01 2018 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Tue Nov 27 00:51:01 2018 +0000
Fix the Ant dependency extraction for the case when
there are no dependencies.
Fix the format of Ant paths on Windows.
Patch by: me
diff --git a/solenv/ant/aoo-ant.xml b/solenv/ant/aoo-ant.xml
index 2fd708f2eb18..45fcb7fe30a1 100644
--- a/solenv/ant/aoo-ant.xml
+++ b/solenv/ant/aoo-ant.xml
@@ -102,7 +102,7 @@
</condition>
<pathconvert refid="main.classpath" setonempty="true" pathsep=" " property="deps" if:set="has.main.classpath"/>
- <property name="dep" value=""/>
+ <property name="deps" value=""/>
<echo message="${deps}" file="${dependencies.outfile}"/>
</target>
diff --git a/solenv/gbuild/Ant.mk b/solenv/gbuild/Ant.mk
index 3fd2c32c4610..f45d70a86db2 100644
--- a/solenv/gbuild/Ant.mk
+++ b/solenv/gbuild/Ant.mk
@@ -66,8 +66,7 @@ $(eval $(call gb_Module_register_target,$(call gb_Jar_get_outdir_target,$(1)),$(
$(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Ant_get_target,$(1)),$(1))
$(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Ant_get_target,$(1))
-__ant_out:=$(shell $(gb_Ant_ANTCOMMAND) -v -Ddependencies.outfile=$(WORKDIR)/Ant/$(1)/deps -f $(2) dependencies)
-$$(eval $(foreach dep,$(shell cat $(WORKDIR)/Ant/$(1)/deps),$$(call gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(dep))))
+$(call gb_Ant_add_dependencies,$(1),$(2))
endef
diff --git a/solenv/gbuild/platform/freebsd.mk b/solenv/gbuild/platform/freebsd.mk
index 31c041274c58..e7f49f83ed6a 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -457,6 +457,16 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
endef
+
+# Ant class
+
+define gb_Ant_add_dependencies
+__ant_out:=$(shell $(gb_Ant_ANTCOMMAND) -v -Ddependencies.outfile=$(WORKDIR)/Ant/$(1)/deps -f $(2) dependencies)
+$$(eval $(foreach dep,$(shell cat $(WORKDIR)/Ant/$(1)/deps),$$(call gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(dep))))
+
+endef
+
+
# SdiTarget class
gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 86710beab6df..4e9f4936b400 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -433,6 +433,16 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
endef
+
+# Ant class
+
+define gb_Ant_add_dependencies
+__ant_out:=$(shell $(gb_Ant_ANTCOMMAND) -v -Ddependencies.outfile=$(WORKDIR)/Ant/$(1)/deps -f $(2) dependencies)
+$$(eval $(foreach dep,$(shell cat $(WORKDIR)/Ant/$(1)/deps),$$(call gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(dep))))
+
+endef
+
+
# SdiTarget class
gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index e7ea6d6c383f..84d84198b971 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -471,6 +471,16 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
endef
+
+# Ant class
+
+define gb_Ant_add_dependencies
+__ant_out:=$(shell $(gb_Ant_ANTCOMMAND) -v -Ddependencies.outfile=$(WORKDIR)/Ant/$(1)/deps -f $(2) dependencies)
+$$(eval $(foreach dep,$(shell cat $(WORKDIR)/Ant/$(1)/deps),$$(call gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(dep))))
+
+endef
+
+
# SdiTarget class
gb_SdiTarget_SVIDLPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
diff --git a/solenv/gbuild/platform/os2.mk b/solenv/gbuild/platform/os2.mk
index 0c783b898eb4..8bd8faf1c5ca 100644
--- a/solenv/gbuild/platform/os2.mk
+++ b/solenv/gbuild/platform/os2.mk
@@ -550,6 +550,15 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
endef
+# Ant class
+
+define gb_Ant_add_dependencies
+__ant_out:=$(shell $(gb_Ant_ANTCOMMAND) -Ddependencies.outfile=`cygpath -m $(WORKDIR)/Ant/$(1)/deps` -f `cygpath -m $(2)` dependencies)
+$$(eval $(foreach dep,$(shell cat $(WORKDIR)/Ant/$(1)/deps),$$(call gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(shell cygpath -u $(dep)))))
+
+endef
+
+
# SdiTarget class
gb_SdiTarget_SVIDLPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 60d6cf6f573a..d60eeb1da1f0 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -400,6 +400,16 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
endef
+
+# Ant class
+
+define gb_Ant_add_dependencies
+__ant_out:=$(shell $(gb_Ant_ANTCOMMAND) -v -Ddependencies.outfile=$(WORKDIR)/Ant/$(1)/deps -f $(2) dependencies)
+$$(eval $(foreach dep,$(shell cat $(WORKDIR)/Ant/$(1)/deps),$$(call gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(dep))))
+
+endef
+
+
# SdiTarget class
gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index ca9e6b8ee1cb..361d9cd7b1d7 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -696,6 +696,16 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
endef
+# Ant class
+
+define gb_Ant_add_dependencies
+__ant_out:=$(shell $(gb_Ant_ANTCOMMAND) -Ddependencies.outfile=`cygpath -m $(WORKDIR)/Ant/$(1)/deps` -f `cygpath -m $(2)` dependencies)
+$$(eval $(foreach dep,$(shell cat $(WORKDIR)/Ant/$(1)/deps),$$(call gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(shell cygpath -u $(dep)))))
+
+endef
+
+
+
# SdiTarget class
gb_SdiTarget_SVIDLPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index c366b9c5e952..9a7373499700 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -635,6 +635,15 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
endef
+# Ant class
+
+define gb_Ant_add_dependencies
+__ant_out:=$(shell $(gb_Ant_ANTCOMMAND) -Ddependencies.outfile=`cygpath -m $(WORKDIR)/Ant/$(1)/deps` -f `cygpath -m $(2)` dependencies)
+$$(eval $(foreach dep,$(shell cat $(WORKDIR)/Ant/$(1)/deps),$$(call gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(shell cygpath -u $(dep)))))
+
+endef
+
+
# SdiTarget class
gb_SdiTarget_SVIDLPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
commit ae2f9c80a4e0337560a83638677dd76dff1378c6
Author: Matthias Seidel <mseidel at apache.org>
AuthorDate: Mon Nov 26 23:47:32 2018 +0000
Commit: Matthias Seidel <mseidel at apache.org>
CommitDate: Mon Nov 26 23:47:32 2018 +0000
Updated excludes
See:
https://ci.apache.org/projects/openoffice/rat-output.html
diff --git a/rat-excludes b/rat-excludes
index 15524ff85764..3690697e20c3 100644
--- a/rat-excludes
+++ b/rat-excludes
@@ -1181,6 +1181,7 @@ main/testautomation/writer/optional/input/number/format86.txt
main/writerfilter/documentation/sprms.txt
main/xmerge/source/activesync/guids.txt
main/xmerge/source/bridge/antcall.txt
+main/xmerge/java/XMergeBridge/antcall.txt
main/xmlsecurity/test_docs/CAs/Root_1/demoCA/index.txt
main/xmlsecurity/test_docs/CAs/Root_10/demoCA/index.txt
main/xmlsecurity/test_docs/CAs/Root_11/demoCA/index.txt
More information about the Libreoffice-commits
mailing list