openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1828757 - in /openoffice/trunk/main: ./ odk/pack/gendocu/ ridljar/ ridljar/com/ ridljar/java/ ridljar/java/ridl/ ridljar/java/ridl/src/ ridljar/java/ridl/src/main/ ridljar/java/ridl/src/main/java/ ridljar/java/ridl/src/main/java/com/ ridlj...
Date Mon, 09 Apr 2018 17:07:09 GMT
Author: damjan
Date: Mon Apr  9 17:07:08 2018
New Revision: 1828757

URL: http://svn.apache.org/viewvc?rev=1828757&view=rev
Log:
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


Added:
    openoffice/trunk/main/ridljar/Ant_ridl.mk
    openoffice/trunk/main/ridljar/Ant_unoloader.mk
    openoffice/trunk/main/ridljar/Makefile   (with props)
    openoffice/trunk/main/ridljar/Module_ridljar.mk
    openoffice/trunk/main/ridljar/Zip_ridl_src.mk
    openoffice/trunk/main/ridljar/Zip_unoloader_src.mk
    openoffice/trunk/main/ridljar/java/
    openoffice/trunk/main/ridljar/java/ridl/
    openoffice/trunk/main/ridljar/java/ridl/build.xml   (with props)
    openoffice/trunk/main/ridljar/java/ridl/src/
    openoffice/trunk/main/ridljar/java/ridl/src/main/
    openoffice/trunk/main/ridljar/java/ridl/src/main/java/
    openoffice/trunk/main/ridljar/java/ridl/src/main/java/com/
      - copied from r1828756, openoffice/trunk/main/ridljar/com/
    openoffice/trunk/main/ridljar/java/unoloader/
    openoffice/trunk/main/ridljar/java/unoloader/build.xml   (with props)
    openoffice/trunk/main/ridljar/java/unoloader/src/
    openoffice/trunk/main/ridljar/java/unoloader/src/main/
    openoffice/trunk/main/ridljar/java/unoloader/src/main/java/
    openoffice/trunk/main/ridljar/java/unoloader/src/main/java/com/
      - copied from r1828756, openoffice/trunk/main/ridljar/source/unoloader/com/
    openoffice/trunk/main/ridljar/prj/makefile.mk
Removed:
    openoffice/trunk/main/ridljar/com/
    openoffice/trunk/main/ridljar/source/
    openoffice/trunk/main/ridljar/util/
Modified:
    openoffice/trunk/main/Module_ooo.mk
    openoffice/trunk/main/odk/pack/gendocu/makefile.mk
    openoffice/trunk/main/ridljar/prj/build.lst
    openoffice/trunk/main/ridljar/prj/d.lst
    openoffice/trunk/main/solenv/ant/aoo-ant.xml
    openoffice/trunk/main/solenv/ant/idl.xml

Modified: openoffice/trunk/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1828757&r1=1828756&r2=1828757&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Mon Apr  9 17:07:08 2018
@@ -68,6 +68,7 @@ $(eval $(call gb_Module_add_moduledirs,o
 	registry \
 	remotebridges \
 	reportdesign \
+	ridljar \
 	sane \
 	sax \
 	sc \

Modified: openoffice/trunk/main/odk/pack/gendocu/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/pack/gendocu/makefile.mk?rev=1828757&r1=1828756&r2=1828757&view=diff
==============================================================================
--- openoffice/trunk/main/odk/pack/gendocu/makefile.mk (original)
+++ openoffice/trunk/main/odk/pack/gendocu/makefile.mk Mon Apr  9 17:07:08 2018
@@ -99,7 +99,7 @@ $(CPP_DOCU_INDEX_FILE) : $(CPP_DOCU_CLEA
 	-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

Added: openoffice/trunk/main/ridljar/Ant_ridl.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ridljar/Ant_ridl.mk?rev=1828757&view=auto
==============================================================================
--- openoffice/trunk/main/ridljar/Ant_ridl.mk (added)
+++ openoffice/trunk/main/ridljar/Ant_ridl.mk Mon Apr  9 17:07:08 2018
@@ -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,ridl,$(SRCDIR)/ridljar/java/ridl/build.xml))
+
+# vim: set noet sw=4 ts=4:
+

Added: openoffice/trunk/main/ridljar/Ant_unoloader.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ridljar/Ant_unoloader.mk?rev=1828757&view=auto
==============================================================================
--- openoffice/trunk/main/ridljar/Ant_unoloader.mk (added)
+++ openoffice/trunk/main/ridljar/Ant_unoloader.mk Mon Apr  9 17:07:08 2018
@@ -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:
+

Added: openoffice/trunk/main/ridljar/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ridljar/Makefile?rev=1828757&view=auto
==============================================================================
--- openoffice/trunk/main/ridljar/Makefile (added)
+++ openoffice/trunk/main/ridljar/Makefile Mon Apr  9 17:07:08 2018
@@ -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:

Propchange: openoffice/trunk/main/ridljar/Makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Added: openoffice/trunk/main/ridljar/Module_ridljar.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ridljar/Module_ridljar.mk?rev=1828757&view=auto
==============================================================================
--- openoffice/trunk/main/ridljar/Module_ridljar.mk (added)
+++ openoffice/trunk/main/ridljar/Module_ridljar.mk Mon Apr  9 17:07:08 2018
@@ -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:

Added: openoffice/trunk/main/ridljar/Zip_ridl_src.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ridljar/Zip_ridl_src.mk?rev=1828757&view=auto
==============================================================================
--- openoffice/trunk/main/ridljar/Zip_ridl_src.mk (added)
+++ openoffice/trunk/main/ridljar/Zip_ridl_src.mk Mon Apr  9 17:07:08 2018
@@ -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:

Added: openoffice/trunk/main/ridljar/Zip_unoloader_src.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ridljar/Zip_unoloader_src.mk?rev=1828757&view=auto
==============================================================================
--- openoffice/trunk/main/ridljar/Zip_unoloader_src.mk (added)
+++ openoffice/trunk/main/ridljar/Zip_unoloader_src.mk Mon Apr  9 17:07:08 2018
@@ -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:

Added: openoffice/trunk/main/ridljar/java/ridl/build.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ridljar/java/ridl/build.xml?rev=1828757&view=auto
==============================================================================
--- openoffice/trunk/main/ridljar/java/ridl/build.xml (added)
+++ openoffice/trunk/main/ridljar/java/ridl/build.xml Mon Apr  9 17:07:08 2018
@@ -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>
+

Propchange: openoffice/trunk/main/ridljar/java/ridl/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: openoffice/trunk/main/ridljar/java/unoloader/build.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ridljar/java/unoloader/build.xml?rev=1828757&view=auto
==============================================================================
--- openoffice/trunk/main/ridljar/java/unoloader/build.xml (added)
+++ openoffice/trunk/main/ridljar/java/unoloader/build.xml Mon Apr  9 17:07:08 2018
@@ -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>
+

Propchange: openoffice/trunk/main/ridljar/java/unoloader/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openoffice/trunk/main/ridljar/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ridljar/prj/build.lst?rev=1828757&r1=1828756&r2=1828757&view=diff
==============================================================================
--- openoffice/trunk/main/ridljar/prj/build.lst (original)
+++ openoffice/trunk/main/ridljar/prj/build.lst Mon Apr  9 17:07:08 2018
@@ -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

Modified: openoffice/trunk/main/ridljar/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ridljar/prj/d.lst?rev=1828757&r1=1828756&r2=1828757&view=diff
==============================================================================
--- openoffice/trunk/main/ridljar/prj/d.lst (original)
+++ openoffice/trunk/main/ridljar/prj/d.lst Mon Apr  9 17:07:08 2018
@@ -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

Added: openoffice/trunk/main/ridljar/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ridljar/prj/makefile.mk?rev=1828757&view=auto
==============================================================================
--- openoffice/trunk/main/ridljar/prj/makefile.mk (added)
+++ openoffice/trunk/main/ridljar/prj/makefile.mk Mon Apr  9 17:07:08 2018
@@ -0,0 +1,44 @@
+#**************************************************************
+#  
+#  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=..
+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

Modified: openoffice/trunk/main/solenv/ant/aoo-ant.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/ant/aoo-ant.xml?rev=1828757&r1=1828756&r2=1828757&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/ant/aoo-ant.xml (original)
+++ openoffice/trunk/main/solenv/ant/aoo-ant.xml Mon Apr  9 17:07:08 2018
@@ -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}"

Modified: openoffice/trunk/main/solenv/ant/idl.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/ant/idl.xml?rev=1828757&r1=1828756&r2=1828757&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/ant/idl.xml (original)
+++ openoffice/trunk/main/solenv/ant/idl.xml Mon Apr  9 17:07:08 2018
@@ -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>
 



Mime
View raw message