[Libreoffice-commits] core.git: Branch 'aoo/trunk' - jurt/java ridljar/java solenv/ant
ridljar/java/ridl/build.xml |4 -
solenv/ant/aoo-ant.xml | 52 +++-
solenv/ant/idl.xml | 143 +---
3 files changed, 84 insertions(+), 115 deletions(-)
New commits:
commit 063857bd52709009430d2c2a36d5b2dc80390769
Author: Damjan Jovanovic
AuthorDate: Wed Aug 29 17:45:06 2018 +
Commit: Damjan Jovanovic
CommitDate: Wed Aug 29 17:45:06 2018 +
Automatically build .idl files found in src/main/idl and src/test/idl
without having to specify them.
Clean up the Ant build a little, removing the unused cppumaker
functions I was experimenting with, and fully generalize IDL building
so it doesn't use any Ant properties, only macrodefs.
Patch by: me
diff --git
a/jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/interfaces.idl
b/jurt/java/jurt/src/test/idl/com/sun/star/lib/uno/protocols/urp/interfaces.idl
similarity index 100%
rename from
jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/interfaces.idl
rename to
jurt/java/jurt/src/test/idl/com/sun/star/lib/uno/protocols/urp/interfaces.idl
diff --git a/ridljar/java/ridl/build.xml b/ridljar/java/ridl/build.xml
index f4fcab15a901..b99799c34aae 100644
--- a/ridljar/java/ridl/build.xml
+++ b/ridljar/java/ridl/build.xml
@@ -44,8 +44,8 @@
+rdbFile="${OUTDIR}/bin/udkapi.rdb"
+outputDir="${main.build.dir}"/>
diff --git a/solenv/ant/aoo-ant.xml b/solenv/ant/aoo-ant.xml
index 37ffb804e123..e47f2b52b1ed 100644
--- a/solenv/ant/aoo-ant.xml
+++ b/solenv/ant/aoo-ant.xml
@@ -35,11 +35,20 @@
+
-
+
+
+
+
+
+
+
+
+
@@ -63,7 +72,10 @@
-
+
+
+
+
@@ -71,19 +83,14 @@
+
+
-
-
-
-
-
-
-
@@ -109,7 +116,14 @@
-
+
+
+
+
+
+
@@ -146,7 +160,14 @@
-
+
+
+
+
+
+
+ manifest="${jar.manifest}"
+ duplicate="fail">
+
+
+
diff --git a/solenv/ant/idl.xml b/solenv/ant/idl.xml
index 24174332d01c..f7bf0ac3a17d 100644
--- a/solenv/ant/idl.xml
+++ b/solenv/ant/idl.xml
@@ -28,160 +28,105 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+urdDir="@{idlBuildDir}/urd"
+rdbFile="@{idlBuildDir}/registry.rdb"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
-
+
-
+
-
-
-
+
-
-
+
+
-
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - jurt/java
jurt/java/jurt/src/main/java/com/sun/star/comp/bridgefactory/makefile.mk | 39 jurt/java/jurt/src/main/java/com/sun/star/comp/connections/makefile.mk | 39 jurt/java/jurt/src/main/java/com/sun/star/comp/loader/makefile.mk | 43 jurt/java/jurt/src/main/java/com/sun/star/comp/servicemanager/makefile.mk | 39 jurt/java/jurt/src/main/java/com/sun/star/comp/urlresolver/makefile.mk | 39 jurt/java/jurt/src/main/java/com/sun/star/lib/connections/pipe/makefile.mk | 37 --- jurt/java/jurt/src/main/java/com/sun/star/lib/connections/socket/makefile.mk | 38 --- jurt/java/jurt/src/main/java/com/sun/star/lib/uno/bridges/java_remote/makefile.mk | 40 jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/java/makefile.mk | 40 jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/makefile.mk | 46 - jurt/java/jurt/src/main/java/com/sun/star/lib/uno/makefile.mk | 33 -- jurt/java/jurt/src/main/java/com/sun/star/lib/uno/protocols/urp/makefile.mk | 40 jurt/java/jurt/src/main/java/com/sun/star/lib/util/makefile.mk | 38 --- jurt/java/jurt/src/main/java/com/sun/star/uno/makefile.mk | 48 -- jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/makefile.mk | 47 - 15 files changed, 606 deletions(-) New commits: commit 263c6b0f859e1b8cc6bfcbaaeddfb17601992747 Author: Damjan Jovanovic Date: Sun Apr 8 15:49:22 2018 + We don't need dmake makefiles in main/jurt any more. Patch by: me diff --git a/jurt/java/jurt/src/main/java/com/sun/star/comp/bridgefactory/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/comp/bridgefactory/makefile.mk deleted file mode 100644 index a16a581fe942.. --- a/jurt/java/jurt/src/main/java/com/sun/star/comp/bridgefactory/makefile.mk +++ /dev/null @@ -1,39 +0,0 @@ -#** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -#http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#** - - - -PRJ= ..$/..$/..$/..$/.. -PRJNAME = jurt -PACKAGE = com$/sun$/star$/comp$/bridgefactory -TARGET = com_sun_star_comp_bridgefactory - -# --- Settings - - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files - -JAVAFILES = BridgeFactory.java - -# --- Targets -- - -.INCLUDE : target.mk diff --git a/jurt/java/jurt/src/main/java/com/sun/star/comp/connections/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/comp/connections/makefile.mk deleted file mode 100644 index 5b56bdb3f486.. --- a/jurt/java/jurt/src/main/java/com/sun/star/comp/connections/makefile.mk +++ /dev/null @@ -1,39 +0,0 @@ -#** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -#http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#** - - - -PRJ = ..$/..$/..$/..$/.. -PRJNAME = jurt -TARGET = com_sun_star_comp_connections - -PACKAGE = com$/sun$/star$/comp$/connections - -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -JAVAFILES = \ -Acceptor.java \ -
