Module_ooo.mk | 1
odk/pack/gendocu/makefile.mk | 2
ridljar/Ant_ridl.mk | 12
--
ridljar/Ant_unoloader.mk | 27
+++++
ridljar/Makefile | 32
+++++
ridljar/Module_ridljar.mk | 33
++++++
ridljar/Zip_ridl_src.mk | 54
++++++++++
ridljar/Zip_unoloader_src.mk | 31
+++++
ridljar/java/ridl/build.xml | 53
+++++++++
ridljar/java/ridl/src/main/java/com/sun/star/uno/IFieldDescription.java | 2
ridljar/java/ridl/src/main/java/com/sun/star/uno/ITypeDescription.java | 4
ridljar/java/unoloader/build.xml | 34
++++++
ridljar/prj/build.lst | 6
-
ridljar/prj/d.lst | 4
ridljar/prj/makefile.mk | 46
+++-----
solenv/ant/aoo-ant.xml | 8
-
solenv/ant/idl.xml | 35
++++--
17 files changed, 323 insertions(+), 61 deletions(-)
New commits:
commit a1f7ca4f8b8e34eacd4ae5736ffec9104c8feb47
Author: Damjan Jovanovic <dam...@apache.org>
Date: Mon Apr 9 17:07:08 2018 +0000
Port main/ridljar to gbuild / Ant.
Generalize the Ant build a bit, to make using javamaker
more flexible, and allow arbitrary "pre-compile" actions
to be plugged in.
Patch by: me
diff --git a/Module_ooo.mk b/Module_ooo.mk
index ad9bdbb29561..67cea532ba17 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -68,6 +68,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
registry \
remotebridges \
reportdesign \
+ ridljar \
sane \
sax \
sc \
diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk
index ba8ff2c8cf0e..fe6ee9741c16 100644
--- a/odk/pack/gendocu/makefile.mk
+++ b/odk/pack/gendocu/makefile.mk
@@ -99,7 +99,7 @@ $(CPP_DOCU_INDEX_FILE) : $(CPP_DOCU_CLEANUP_FLAG)
-rm $(@:d:d)$/cpp.css
$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/docs$/cpp$/ref$/cpp.css
$(MY_TEXTCOPY_TARGETPRE) $(@:d:d)$/cpp.css
-$(JAVA_SRC_FILES) : $(SOLARCOMMONPCKDIR)$/jurt_src.zip
$(SOLARCOMMONBINDIR)$/ridl_src.zip $(SOLARCOMMONBINDIR)$/unoloader_src.zip
$(SOLARCOMMONPCKDIR)$/juh_src.zip
+$(JAVA_SRC_FILES) : $(SOLARCOMMONPCKDIR)$/jurt_src.zip
$(SOLARCOMMONPCKDIR)$/ridl_src.zip $(SOLARCOMMONPCKDIR)$/unoloader_src.zip
$(SOLARCOMMONPCKDIR)$/juh_src.zip
-$(MKDIRHIER) $(@:d)
$(MY_COPY) $^ $(JAVA_SRC_DIR)
cd $(JAVA_SRC_DIR) && unzip -qu jurt_src.zip && unzip -qu ridl_src.zip &&
unzip -qu unoloader_src.zip && unzip -qu juh_src.zip
diff --git a/ridljar/source/unoloader/makefile.mk b/ridljar/Ant_ridl.mk
similarity index 83%
rename from ridljar/source/unoloader/makefile.mk
rename to ridljar/Ant_ridl.mk
index 42b1c1e67021..5c0a918bd9a8 100644
--- a/ridljar/source/unoloader/makefile.mk
+++ b/ridljar/Ant_ridl.mk
@@ -21,15 +21,7 @@
-PRJ := ..$/..
-PRJNAME := ridljar
+$(eval $(call gb_Ant_Ant,ridl,$(SRCDIR)/ridljar/java/ridl/build.xml))
-TARGET := unoloader
+# vim: set noet sw=4 ts=4:
-.INCLUDE: settings.mk
-
-ZIP1TARGET = $(TARGET)_src
-ZIP1FLAGS = -r
-ZIP1LIST = com -x '*makefile.mk' -x '*manifest'
-
-.INCLUDE: target.mk
diff --git a/ridljar/Ant_unoloader.mk b/ridljar/Ant_unoloader.mk
new file mode 100644
index 000000000000..26f630d79e97
--- /dev/null
+++ b/ridljar/Ant_unoloader.mk
@@ -0,0 +1,27 @@
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Ant_Ant,unoloader,$(SRCDIR)/ridljar/java/unoloader/build.xml))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/ridljar/Makefile b/ridljar/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/ridljar/Makefile
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath
$(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ridljar/Module_ridljar.mk b/ridljar/Module_ridljar.mk
new file mode 100644
index 000000000000..f2074c3943a4
--- /dev/null
+++ b/ridljar/Module_ridljar.mk
@@ -0,0 +1,33 @@
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,ridljar))
+
+$(eval $(call gb_Module_add_targets,ridljar,\
+ Ant_ridl \
+ Ant_unoloader \
+ Zip_ridl_src \
+ Zip_unoloader_src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ridljar/Zip_ridl_src.mk b/ridljar/Zip_ridl_src.mk
new file mode 100644
index 000000000000..06147b987587
--- /dev/null
+++ b/ridljar/Zip_ridl_src.mk
@@ -0,0 +1,54 @@
+###############################################################
+#
+# 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.
+#
+###############################################################
+
+
+
+$(eval $(call gb_Zip_Zip,ridl_src,$(SRCDIR)/ridljar/java/ridl/src/main/java))
+
+$(eval $(call gb_Zip_add_files,ridl_src,\
+ com/sun/star/lib/uno/typedesc/MethodDescription.java \
+ com/sun/star/lib/uno/typedesc/MemberDescriptionHelper.java \
+ com/sun/star/lib/uno/typedesc/FieldDescription.java \
+ com/sun/star/lib/uno/typeinfo/MemberTypeInfo.java \
+ com/sun/star/lib/uno/typeinfo/ParameterTypeInfo.java \
+ com/sun/star/lib/uno/typeinfo/TypeInfo.java \
+ com/sun/star/lib/uno/typeinfo/AttributeTypeInfo.java \
+ com/sun/star/lib/uno/typeinfo/ConstantTypeInfo.java \
+ com/sun/star/lib/uno/typeinfo/MethodTypeInfo.java \
+ com/sun/star/lib/util/WeakMap.java \
+ com/sun/star/lib/util/DisposeNotifier.java \
+ com/sun/star/lib/util/DisposeListener.java \
+ com/sun/star/uno/Type.java \
+ com/sun/star/uno/IMemberDescription.java \
+ com/sun/star/uno/UnoRuntime.java \
+ com/sun/star/uno/IMapping.java \
+ com/sun/star/uno/Union.java \
+ com/sun/star/uno/IEnvironment.java \
+ com/sun/star/uno/IQueryInterface.java \
+ com/sun/star/uno/Any.java \
+ com/sun/star/uno/IBridge.java \
+ com/sun/star/uno/IMethodDescription.java \
+ com/sun/star/uno/ITypeDescription.java \
+ com/sun/star/uno/IFieldDescription.java \
+ com/sun/star/uno/Enum.java \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ridljar/Zip_unoloader_src.mk b/ridljar/Zip_unoloader_src.mk
new file mode 100644
index 000000000000..22775a1f2634
--- /dev/null
+++ b/ridljar/Zip_unoloader_src.mk
@@ -0,0 +1,31 @@
+###############################################################
+#
+# 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.
+#
+###############################################################
+
+
+
+$(eval $(call
gb_Zip_Zip,unoloader_src,$(SRCDIR)/ridljar/java/unoloader/src/main/java))
+
+$(eval $(call gb_Zip_add_files,unoloader_src,\
+ com/sun/star/lib/unoloader/UnoClassLoader.java \
+ com/sun/star/lib/unoloader/UnoLoader.java \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ridljar/java/ridl/build.xml b/ridljar/java/ridl/build.xml
new file mode 100644
index 000000000000..8ecc91ed71e8
--- /dev/null
+++ b/ridljar/java/ridl/build.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
+ * 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.
+ *
+ ***********************************************************-->
+
+
+<project name="ridl" default="main">
+
+ <property file="../../../ant.properties"/>
+ <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/>
+
+ <target name="init-project">
+
+ <path id="main.classpath">
+ <pathelement location="${OUTDIR}/bin/ridl.jar"/>
+ <pathelement location="${OUTDIR}/bin/unoloader.jar"/>
+ </path>
+
+ </target>
+
+ <property name="javamaker.udkapi.flag"
location="${main.build.dir}/javamaker.udkapi.flag"/>
+
+ <target name="check-javamaker-udkapi">
+ <uptodate property="javamaker.udkapi.skip"
srcfile="${OUTDIR}/bin/udkapi.rdb" targetfile="${javamaker.udkapi.flag}"/>
+ </target>
+
+ <target name="javamaker-udkapi" depends="check-javamaker-udkapi"
extensionOf="pre-compile" unless="${javamaker.udkapi.skip}">
+ <mkdir dir="${main.build.dir}"/>
+ <javamaker
+ input-rdb="${OUTDIR}/bin/udkapi.rdb"
+ output-directory="${main.build.dir}"/>
+ <touch file="${javamaker.udkapi.flag}"/>
+ </target>
+
+</project>
+
diff --git a/ridljar/com/makefile.mk
b/ridljar/java/ridl/src/main/java/com/makefile.mk
similarity index 100%
rename from ridljar/com/makefile.mk
rename to ridljar/java/ridl/src/main/java/com/makefile.mk
diff --git a/ridljar/com/sun/star/lib/uno/typedesc/FieldDescription.java
b/ridljar/java/ridl/src/main/java/com/sun/star/lib/uno/typedesc/FieldDescription.java
similarity index 100%
rename from ridljar/com/sun/star/lib/uno/typedesc/FieldDescription.java
rename to
ridljar/java/ridl/src/main/java/com/sun/star/lib/uno/typedesc/FieldDescription.java
diff --git a/ridljar/com/sun/star/lib/uno/typedesc/MemberDescriptionHelper.java
b/ridljar/java/ridl/src/main/java/com/sun/star/lib/uno/typedesc/MemberDescriptionHelper.java
similarity index 100%
rename from ridljar/com/sun/star/lib/uno/typedesc/MemberDescriptionHelper.java
rename to
ridljar/java/ridl/src/main/java/com/sun/star/lib/uno/typedesc/MemberDescriptionHelper.java
diff --git a/ridljar/com/sun/star/lib/uno/typedesc/MethodDescription.java
b/ridljar/java/ridl/src/main/java/com/sun/star/lib/uno/typedesc/MethodDescription.java
similarity index 100%
rename from ridljar/com/sun/star/lib/uno/typedesc/MethodDescription.java
rename to
ridljar/java/ridl/src/main/java/com/sun/star/lib/uno/typedesc/MethodDescription.java
diff --git a/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java
b/ridljar/java/ridl/src/main/java/com/sun/star/lib/uno/typedesc/TypeDescription.java
similarity index 100%
rename from ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java
rename to
ridljar/java/ridl/src/main/java/com/sun/star/lib/uno/typedesc/TypeDescription.java
diff --git a/ridljar/com/sun/star/lib/uno/typeinfo/AttributeTypeInfo.java
b/ridljar/java/ridl/src/main/java/com/sun/star/lib/uno/typeinfo/AttributeTypeInfo.java
similarity index 100%
rename from ridljar/com/sun/star/lib/uno/typeinfo/AttributeTypeInfo.java
rename to
ridljar/java/ridl/src/main/java/com/sun/star/lib/uno/typeinfo/AttributeTypeInfo.java
diff --git a/ridljar/com/sun/star/lib/uno/typeinfo/ConstantTypeInfo.java
b/ridljar/java/ridl/src/main/java/com/sun/star/lib/uno/typeinfo/ConstantTypeInfo.java
similarity index 100%
rename from ridljar/com/sun/star/lib/uno/typeinfo/ConstantTypeInfo.java
rename to
ridljar/java/ridl/src/main/java/com/sun/star/lib/uno/typeinfo/ConstantTypeInfo.java
diff --git a/ridljar/com/sun/star/lib/uno/typeinfo/MemberTypeInfo.java
b/ridljar/java/ridl/src/main/java/com/sun/star/lib/uno/typeinfo/MemberTypeInfo.java
similarity index 100%
rename from ridljar/com/sun/star/lib/uno/typeinfo/MemberTypeInfo.java
rename to
ridljar/java/ridl/src/main/java/com/sun/star/lib/uno/typeinfo/MemberTypeInfo.java
diff --git a/ridljar/com/sun/star/lib/uno/typeinfo/MethodTypeInfo.java
b/ridljar/java/ridl/src/main/java/com/sun/star/lib/uno/typeinfo/MethodTypeInfo.java
similarity index 100%
rename from ridljar/com/sun/star/lib/uno/typeinfo/MethodTypeInfo.java
rename to
ridljar/java/ridl/src/main/java/com/sun/star/lib/uno/typeinfo/MethodTypeInfo.java
diff --git a/ridljar/com/sun/star/lib/uno/typeinfo/ParameterTypeInfo.java
b/ridljar/java/ridl/src/main/java/com/sun/star/lib/uno/typeinfo/ParameterTypeInfo.java
similarity index 100%
rename from ridljar/com/sun/star/lib/uno/typeinfo/ParameterTypeInfo.java
rename to
ridljar/java/ridl/src/main/java/com/sun/star/lib/uno/typeinfo/ParameterTypeInfo.java
diff --git a/ridljar/com/sun/star/lib/uno/typeinfo/TypeInfo.java
b/ridljar/java/ridl/src/main/java/com/sun/star/lib/uno/typeinfo/TypeInfo.java
similarity index 100%
rename from ridljar/com/sun/star/lib/uno/typeinfo/TypeInfo.java
rename to
ridljar/java/ridl/src/main/java/com/sun/star/lib/uno/typeinfo/TypeInfo.java
diff --git a/ridljar/com/sun/star/lib/util/DisposeListener.java
b/ridljar/java/ridl/src/main/java/com/sun/star/lib/util/DisposeListener.java
similarity index 100%
rename from ridljar/com/sun/star/lib/util/DisposeListener.java
rename to
ridljar/java/ridl/src/main/java/com/sun/star/lib/util/DisposeListener.java
diff --git a/ridljar/com/sun/star/lib/util/DisposeNotifier.java
b/ridljar/java/ridl/src/main/java/com/sun/star/lib/util/DisposeNotifier.java
similarity index 100%
rename from ridljar/com/sun/star/lib/util/DisposeNotifier.java
rename to
ridljar/java/ridl/src/main/java/com/sun/star/lib/util/DisposeNotifier.java
diff --git a/ridljar/com/sun/star/lib/util/WeakMap.java
b/ridljar/java/ridl/src/main/java/com/sun/star/lib/util/WeakMap.java
similarity index 100%
rename from ridljar/com/sun/star/lib/util/WeakMap.java
rename to ridljar/java/ridl/src/main/java/com/sun/star/lib/util/WeakMap.java
diff --git a/ridljar/com/sun/star/uno/Any.java
b/ridljar/java/ridl/src/main/java/com/sun/star/uno/Any.java
similarity index 100%
rename from ridljar/com/sun/star/uno/Any.java
rename to ridljar/java/ridl/src/main/java/com/sun/star/uno/Any.java
diff --git a/ridljar/com/sun/star/uno/Enum.java
b/ridljar/java/ridl/src/main/java/com/sun/star/uno/Enum.java
similarity index 100%
rename from ridljar/com/sun/star/uno/Enum.java
rename to ridljar/java/ridl/src/main/java/com/sun/star/uno/Enum.java
diff --git a/ridljar/com/sun/star/uno/IBridge.java
b/ridljar/java/ridl/src/main/java/com/sun/star/uno/IBridge.java
similarity index 100%
rename from ridljar/com/sun/star/uno/IBridge.java
rename to ridljar/java/ridl/src/main/java/com/sun/star/uno/IBridge.java
diff --git a/ridljar/com/sun/star/uno/IEnvironment.java
b/ridljar/java/ridl/src/main/java/com/sun/star/uno/IEnvironment.java
similarity index 100%
rename from ridljar/com/sun/star/uno/IEnvironment.java
rename to ridljar/java/ridl/src/main/java/com/sun/star/uno/IEnvironment.java
diff --git a/ridljar/com/sun/star/uno/IFieldDescription.java
b/ridljar/java/ridl/src/main/java/com/sun/star/uno/IFieldDescription.java
similarity index 98%
rename from ridljar/com/sun/star/uno/IFieldDescription.java
rename to
ridljar/java/ridl/src/main/java/com/sun/star/uno/IFieldDescription.java
index 40c707aae292..d9e0dc0b35ab 100644
--- a/ridljar/com/sun/star/uno/IFieldDescription.java
+++ b/ridljar/java/ridl/src/main/java/com/sun/star/uno/IFieldDescription.java
@@ -47,5 +47,5 @@ public interface IFieldDescription extends IMemberDescription
{
* <p>
* @return the java field
*/
- Field getField();
+ Field getField();
}
diff --git a/ridljar/com/sun/star/uno/IMapping.java
b/ridljar/java/ridl/src/main/java/com/sun/star/uno/IMapping.java
similarity index 100%
rename from ridljar/com/sun/star/uno/IMapping.java
rename to ridljar/java/ridl/src/main/java/com/sun/star/uno/IMapping.java
diff --git a/ridljar/com/sun/star/uno/IMemberDescription.java
b/ridljar/java/ridl/src/main/java/com/sun/star/uno/IMemberDescription.java
similarity index 100%
rename from ridljar/com/sun/star/uno/IMemberDescription.java
rename to
ridljar/java/ridl/src/main/java/com/sun/star/uno/IMemberDescription.java
diff --git a/ridljar/com/sun/star/uno/IMethodDescription.java
b/ridljar/java/ridl/src/main/java/com/sun/star/uno/IMethodDescription.java
similarity index 100%
rename from ridljar/com/sun/star/uno/IMethodDescription.java
rename to
ridljar/java/ridl/src/main/java/com/sun/star/uno/IMethodDescription.java
diff --git a/ridljar/com/sun/star/uno/IQueryInterface.java
b/ridljar/java/ridl/src/main/java/com/sun/star/uno/IQueryInterface.java
similarity index 100%
rename from ridljar/com/sun/star/uno/IQueryInterface.java
rename to ridljar/java/ridl/src/main/java/com/sun/star/uno/IQueryInterface.java
diff --git a/ridljar/com/sun/star/uno/ITypeDescription.java
b/ridljar/java/ridl/src/main/java/com/sun/star/uno/ITypeDescription.java
similarity index 98%
rename from ridljar/com/sun/star/uno/ITypeDescription.java
rename to ridljar/java/ridl/src/main/java/com/sun/star/uno/ITypeDescription.java
index 3c67cf4f564b..2d85769bd276 100644
--- a/ridljar/com/sun/star/uno/ITypeDescription.java
+++ b/ridljar/java/ridl/src/main/java/com/sun/star/uno/ITypeDescription.java
@@ -74,7 +74,7 @@ public interface ITypeDescription {
* <p>
* @return the <code>IFieldDescription[]</code>.
*/
- IFieldDescription []getFieldDescriptions();
+ IFieldDescription []getFieldDescriptions();
/**
* Gets the <code>IFieldDescription</code> for the
@@ -83,7 +83,7 @@ public interface ITypeDescription {
* <p>
* @return the <code>IFieldDescription</code>.
*/
- IFieldDescription getFieldDescription(String name);
+ IFieldDescription getFieldDescription(String name);
/**
* Gets the IDL <code>TypeClass</code> of the type.
diff --git a/ridljar/com/sun/star/uno/Type.java
b/ridljar/java/ridl/src/main/java/com/sun/star/uno/Type.java
similarity index 100%
rename from ridljar/com/sun/star/uno/Type.java
rename to ridljar/java/ridl/src/main/java/com/sun/star/uno/Type.java
diff --git a/ridljar/com/sun/star/uno/Union.java
b/ridljar/java/ridl/src/main/java/com/sun/star/uno/Union.java
similarity index 100%
rename from ridljar/com/sun/star/uno/Union.java
rename to ridljar/java/ridl/src/main/java/com/sun/star/uno/Union.java
diff --git a/ridljar/com/sun/star/uno/UnoRuntime.java
b/ridljar/java/ridl/src/main/java/com/sun/star/uno/UnoRuntime.java
similarity index 100%
rename from ridljar/com/sun/star/uno/UnoRuntime.java
rename to ridljar/java/ridl/src/main/java/com/sun/star/uno/UnoRuntime.java
diff --git a/ridljar/java/unoloader/build.xml b/ridljar/java/unoloader/build.xml
new file mode 100644
index 000000000000..d0166c315ab6
--- /dev/null
+++ b/ridljar/java/unoloader/build.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
+ * 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.
+ *
+ ***********************************************************-->
+
+
+<project name="unoloader" default="main">
+
+ <property file="../../../ant.properties"/>
+ <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/>
+
+ <target name="init-project">
+ <property name="jar.manifest"
location="${main.src.dir}/com/sun/star/lib/unoloader/manifest"/>
+ </target>
+
+</project>
+
diff --git
a/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader.java
b/ridljar/java/unoloader/src/main/java/com/sun/star/lib/unoloader/UnoClassLoader.java
similarity index 100%
rename from
ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader.java
rename to
ridljar/java/unoloader/src/main/java/com/sun/star/lib/unoloader/UnoClassLoader.java
diff --git a/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoLoader.java
b/ridljar/java/unoloader/src/main/java/com/sun/star/lib/unoloader/UnoLoader.java
similarity index 100%
rename from ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoLoader.java
rename to
ridljar/java/unoloader/src/main/java/com/sun/star/lib/unoloader/UnoLoader.java
diff --git a/ridljar/source/unoloader/com/sun/star/lib/unoloader/makefile.mk
b/ridljar/java/unoloader/src/main/java/com/sun/star/lib/unoloader/makefile.mk
similarity index 100%
rename from ridljar/source/unoloader/com/sun/star/lib/unoloader/makefile.mk
rename to
ridljar/java/unoloader/src/main/java/com/sun/star/lib/unoloader/makefile.mk
diff --git a/ridljar/source/unoloader/com/sun/star/lib/unoloader/manifest
b/ridljar/java/unoloader/src/main/java/com/sun/star/lib/unoloader/manifest
similarity index 100%
rename from ridljar/source/unoloader/com/sun/star/lib/unoloader/manifest
rename to
ridljar/java/unoloader/src/main/java/com/sun/star/lib/unoloader/manifest
diff --git a/ridljar/prj/build.lst b/ridljar/prj/build.lst
index ac91c68bd9c1..5fc4e7bca0f7 100644
--- a/ridljar/prj/build.lst
+++ b/ridljar/prj/build.lst
@@ -1,6 +1,2 @@
ri ridljar : codemaker solenv udkapi NULL
-ri ridljar\javamaker nmake - all javamaker NULL
-ri ridljar\com nmake - all com javamaker NULL
-ri ridljar\util nmake - all util javamaker com NULL
-ri ridljar\source\unoloader nmake - all unoloader NULL
-ri ridljar\source\unoloader\com\sun\star\lib\unoloader nmake - all
unoloader_cssl_unoloader NULL
+ri ridljar\prj nmake - all ri_prj NULL
diff --git a/ridljar/prj/d.lst b/ridljar/prj/d.lst
index 12cde6f2815e..e69de29bb2d1 100644
--- a/ridljar/prj/d.lst
+++ b/ridljar/prj/d.lst
@@ -1,4 +0,0 @@
-..\%__SRC%\bin\ridl_src.zip %COMMON_DEST%\bin%_EXT%\ridl_src.zip
-..\%__SRC%\class\ridl.jar %_DEST%\bin%_EXT%\ridl.jar
-..\%__SRC%\class\unoloader\unoloader.jar %_DEST%\bin%_EXT%\unoloader.jar
-..\%__SRC%\bin\unoloader_src.zip %COMMON_DEST%\bin%_EXT%\unoloader_src.zip
diff --git a/ridljar/util/makefile.mk b/ridljar/prj/makefile.mk
similarity index 63%
rename from ridljar/util/makefile.mk
rename to ridljar/prj/makefile.mk
index d3b72a8caaef..c62c6a657d16 100644
--- a/ridljar/util/makefile.mk
+++ b/ridljar/prj/makefile.mk
@@ -21,28 +21,24 @@
-PRJ = ..
-PRJNAME = ridljar
-TARGET = ridl
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS = com
-JARTARGET = $(TARGET).jar
-JARCOMPRESS = TRUE
-
-# Special work necessary for building java reference with javadoc.
-# The source of puplic APIs must be delivered and used later in the
-# odk module.
-ZIP1TARGET=$(TARGET)_src
-ZIP1FLAGS=-u -r
-ZIP1DIR=$(PRJ)
-ZIP1LIST=com -x "*makefile.mk"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
$(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/ridljar/source/unoloader/delzip b/ridljar/source/unoloader/delzip
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/ridljar/util/delzip b/ridljar/util/delzip
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/solenv/ant/aoo-ant.xml b/solenv/ant/aoo-ant.xml
index 94f4fa9442cd..6eda8af41072 100644
--- a/solenv/ant/aoo-ant.xml
+++ b/solenv/ant/aoo-ant.xml
@@ -81,9 +81,7 @@
<condition property="has.idl.files">
<isreference refid="idl.files"/>
</condition>
- <filelist id="idl.files" unless:set="has.idl.files">
- <filelist refid="idl.files"/>
- </filelist>
+ <filelist id="idl.files" unless:set="has.idl.files"/>
</target>
<target name="res" depends="prepare">
@@ -107,7 +105,9 @@
</copy>
</target>
- <target name="compile" depends="prepare,res">
+ <extension-point name="pre-compile" depends="prepare,res"/>
+
+ <target name="compile" depends="pre-compile">
<mkdir dir="${main.build.dir}"/>
<javac srcdir="${main.src.dir}"
destdir="${main.build.dir}"
diff --git a/solenv/ant/idl.xml b/solenv/ant/idl.xml
index 0325c9a7a722..750237b3f53e 100644
--- a/solenv/ant/idl.xml
+++ b/solenv/ant/idl.xml
@@ -54,17 +54,34 @@
<property name="idl.uptodate" value="true"
unless:set="idl.files.exist"/>
</target>
+ <macrodef name="javamaker">
+ <attribute name="input-rdb"/>
+ <attribute name="output-directory"/>
+ <attribute name="no-dependent-types" default="false"/>
+ <attribute name="excludes" default=""/>
+ <sequential>
+ <mkdir dir="@{output-directory}"/>
+ <exec executable="${OUTDIR}/bin/javamaker" failonerror="true">
+ <env key="LD_LIBRARY_PATH" value="${OUTDIR}/lib"/>
+ <env key="DYLD_LIBRARY_PATH" value="${OUTDIR}/lib"/>
+ <arg value="-O@{output-directory}"/>
+ <arg value="-BUCR"/>
+ <arg value="-nD"
+ if:true="@{no-dependent-types}"/>
+ <arg value="@{input-rdb}"/>
+ <arg value="-X@{excludes}"
+ unless:blank="@{excludes}"/>
+ </exec>
+ </sequential>
+ </macrodef>
+
<target name="idl-javamaker" depends="idl-regmerge" unless="idl.uptodate">
<mkdir dir="${idl.classes.build.dir}"/>
- <exec executable="${OUTDIR}/bin/javamaker" failonerror="true">
- <env key="LD_LIBRARY_PATH" value="${OUTDIR}/lib"/>
- <env key="DYLD_LIBRARY_PATH" value="${OUTDIR}/lib"/>
- <arg value="-O${idl.classes.build.dir}"/>
- <arg value="-BUCR"/>
- <arg value="-nD"/>
- <arg value="${idl.rdb.build.dir}/registry.rdb"/>
- <arg value="-X${OUTDIR}/bin/types.rdb"/>
- </exec>
+ <javamaker
+ input-rdb="${idl.rdb.build.dir}/registry.rdb"
+ output-directory="${idl.classes.build.dir}"
+ no-dependent-types="true"
+ excludes="${OUTDIR}/bin/types.rdb"/>
<touch file="${idl.javamaker.flag}"/>
</target>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
