You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2022/02/13 16:17:51 UTC
[openoffice] branch trunk updated (002e2b2 -> 6b9dcf4)
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git.
from 002e2b2 Fixed typos, removed whitespace
new 34f574c Create 'tmp' directory into solver
new 6b9dcf4 Add support for Azul and OpenJDK JDK's
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
main/scripting/java/build.xml | 6 +++++-
main/solenv/bin/deliver.pl | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
[openoffice] 01/02: Create 'tmp' directory into solver
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 34f574cbec79947489f26974ea2046b026f6d0dc
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Thu Feb 10 14:51:57 2022 +0100
Create 'tmp' directory into solver
Completes f110f2132c033266ae9e2e1ff7ec2f29347b01ab
(cherry picked from commit f76c88023642e2d81093a0f72c05e19cda1f23f3)
---
main/solenv/bin/deliver.pl | 1 +
1 file changed, 1 insertion(+)
diff --git a/main/solenv/bin/deliver.pl b/main/solenv/bin/deliver.pl
index f4b9df4..497757b 100755
--- a/main/solenv/bin/deliver.pl
+++ b/main/solenv/bin/deliver.pl
@@ -1005,6 +1005,7 @@ sub push_default_actions
'pck',
'rdb',
'res',
+ 'tmp',
'xml'
);
push(@subdirs, 'zip') if $opt_zip;
[openoffice] 02/02: Add support for Azul and OpenJDK JDK's
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 6b9dcf425c98079ba3243c445033c03406aeb447
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Fri Feb 11 09:45:16 2022 +0100
Add support for Azul and OpenJDK JDK's
---
main/scripting/java/build.xml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/main/scripting/java/build.xml b/main/scripting/java/build.xml
index db526af..c521d0a 100644
--- a/main/scripting/java/build.xml
+++ b/main/scripting/java/build.xml
@@ -91,7 +91,11 @@
<os family="mac"/>
<os family="unix"/>
<contains string="${java.version}" substring="1.8" casesensitive="false" />
- <contains string="${java.vendor}" substring="Oracle" casesensitive="false" />
+ <or>
+ <contains string="${java.vendor}" substring="Oracle" casesensitive="false" />
+ <contains string="${java.vendor}" substring="adoptopenjdk" casesensitive="false" />
+ <contains string="${java.vendor}" substring="azul" casesensitive="false" />
+ </or>
</and>
</condition>