Author: damjan
Date: Sun Apr 8 12:55:05 2018
New Revision: 1828636
URL: http://svn.apache.org/viewvc?rev=1828636&view=rev
Log:
Added an Ant target type to gbuild, that can be used to call Ant to build
a deliverable. Added Ant support files that provide build infrastructure
that can be used by Java projects, including testing with JUnit at
compile time, processing of external dependencies, using the IDL
toolchain (idlc, regmerge, javamaker), and general build support like
compiling into class files, building the JAR file and cleaning. These
features require Ant version >= 1.9.1.
Ported main/jurt to gbuild and this Ant infrastructure.
Patch by: me
Added:
openoffice/trunk/main/jurt/Ant_jurt.mk
openoffice/trunk/main/jurt/Library_jpipe.mk
openoffice/trunk/main/jurt/Library_wrapper.mk
openoffice/trunk/main/jurt/Makefile
openoffice/trunk/main/jurt/Module_jurt.mk
openoffice/trunk/main/jurt/Zip_jurt-src.mk
openoffice/trunk/main/jurt/java/
openoffice/trunk/main/jurt/java/jurt/
openoffice/trunk/main/jurt/java/jurt/build.xml
openoffice/trunk/main/jurt/java/jurt/src/
openoffice/trunk/main/jurt/java/jurt/src/main/
openoffice/trunk/main/jurt/java/jurt/src/main/java/
openoffice/trunk/main/jurt/java/jurt/src/main/java/com/
- copied from r1828635, openoffice/trunk/main/jurt/com/
openoffice/trunk/main/jurt/java/jurt/src/test/
openoffice/trunk/main/jurt/java/jurt/src/test/java/
openoffice/trunk/main/jurt/java/jurt/src/test/java/com/
openoffice/trunk/main/jurt/java/jurt/src/test/java/com/sun/
openoffice/trunk/main/jurt/java/jurt/src/test/java/com/sun/star/
openoffice/trunk/main/jurt/java/jurt/src/test/java/com/sun/star/lib/
openoffice/trunk/main/jurt/java/jurt/src/test/java/com/sun/star/lib/uno/
openoffice/trunk/main/jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/
openoffice/trunk/main/jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/
- copied from r1828635,
openoffice/trunk/main/jurt/test/com/sun/star/lib/uno/protocols/urp/
openoffice/trunk/main/solenv/ant/
openoffice/trunk/main/solenv/ant/aoo-ant.xml
openoffice/trunk/main/solenv/ant/externals.xml
openoffice/trunk/main/solenv/ant/idl.xml
openoffice/trunk/main/solenv/ant/manifest.empty
openoffice/trunk/main/solenv/gbuild/Ant.mk
Removed:
openoffice/trunk/main/jurt/com/
openoffice/trunk/main/jurt/test/com/sun/star/lib/uno/protocols/urp/
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/jurt/prj/build.lst
openoffice/trunk/main/jurt/prj/d.lst
openoffice/trunk/main/odk/pack/gendocu/makefile.mk
openoffice/trunk/main/solenv/gbuild/TargetLocations.mk
openoffice/trunk/main/solenv/gbuild/gbuild.mk
Modified: openoffice/trunk/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1828636&r1=1828635&r2=1828636&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Sun Apr 8 12:55:05 2018
@@ -54,6 +54,7 @@ $(eval $(call gb_Module_add_moduledirs,o
idl \
io \
javaunohelper \
+ jurt \
jvmaccess \
lingucomponent \
linguistic \
Modified: openoffice/trunk/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1828636&r1=1828635&r2=1828636&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Sun Apr 8 12:55:05 2018
@@ -177,6 +177,8 @@ $(eval $(call gb_Helper_register_librari
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
+ jpipe \
+ jpipx \
xmlreader \
))
Added: openoffice/trunk/main/jurt/Ant_jurt.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/jurt/Ant_jurt.mk?rev=1828636&view=auto
==============================================================================
--- openoffice/trunk/main/jurt/Ant_jurt.mk (added)
+++ openoffice/trunk/main/jurt/Ant_jurt.mk Sun Apr 8 12:55:05 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,jurt,$(SRCDIR)/jurt/java/jurt/build.xml))
+
+# vim: set noet sw=4 ts=4:
+
Added: openoffice/trunk/main/jurt/Library_jpipe.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/jurt/Library_jpipe.mk?rev=1828636&view=auto
==============================================================================
--- openoffice/trunk/main/jurt/Library_jpipe.mk (added)
+++ openoffice/trunk/main/jurt/Library_jpipe.mk Sun Apr 8 12:55:05 2018
@@ -0,0 +1,38 @@
+#**************************************************************
+#
+# 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_Library_Library,$(JPIPE_NAME)))
+
+$(eval $(call gb_Library_set_include,$(JPIPE_NAME),\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,$(JPIPE_NAME),\
+ sal \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_cobjects,$(JPIPE_NAME),\
+ jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/jurt/Library_wrapper.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/jurt/Library_wrapper.mk?rev=1828636&view=auto
==============================================================================
--- openoffice/trunk/main/jurt/Library_wrapper.mk (added)
+++ openoffice/trunk/main/jurt/Library_wrapper.mk Sun Apr 8 12:55:05 2018
@@ -0,0 +1,38 @@
+#**************************************************************
+#
+# 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_Library_Library,jpipe))
+
+$(eval $(call gb_Library_set_include,jpipe,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,jpipe,\
+ sal \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_cobjects,jpipe,\
+ jurt/source/pipe/wrapper/wrapper \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/jurt/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/jurt/Makefile?rev=1828636&view=auto
==============================================================================
--- openoffice/trunk/main/jurt/Makefile (added)
+++ openoffice/trunk/main/jurt/Makefile Sun Apr 8 12:55:05 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:
Added: openoffice/trunk/main/jurt/Module_jurt.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/jurt/Module_jurt.mk?rev=1828636&view=auto
==============================================================================
--- openoffice/trunk/main/jurt/Module_jurt.mk (added)
+++ openoffice/trunk/main/jurt/Module_jurt.mk Sun Apr 8 12:55:05 2018
@@ -0,0 +1,52 @@
+#**************************************************************
+#
+# 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,jurt))
+
+
+
+ifeq ($(GUIBASE),WIN)
+ JPIPE_NAME := jpipx
+else
+ JPIPE_NAME := jpipe
+endif
+
+
+
+$(eval $(call gb_Module_add_targets,jurt,\
+ Ant_jurt \
+ Library_jpipe \
+ Zip_jurt-src \
+))
+
+
+
+ifeq ($(GUIBASE),WIN)
+$(eval $(call gb_Module_add_targets,jurt,\
+ Library_wrapper \
+))
+endif
+
+
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/jurt/Zip_jurt-src.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/jurt/Zip_jurt-src.mk?rev=1828636&view=auto
==============================================================================
--- openoffice/trunk/main/jurt/Zip_jurt-src.mk (added)
+++ openoffice/trunk/main/jurt/Zip_jurt-src.mk Sun Apr 8 12:55:05 2018
@@ -0,0 +1,83 @@
+###############################################################
+#
+# 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,jurt_src,$(SRCDIR)/jurt/java/jurt/src/main/java))
+
+$(eval $(call gb_Zip_add_files,jurt_src,\
+ com/sun/star/comp/loader/RegistrationClassFinder.java \
+ com/sun/star/comp/loader/FactoryHelper.java \
+ com/sun/star/comp/loader/JavaLoaderFactory.java \
+ com/sun/star/comp/loader/JavaLoader.java \
+ com/sun/star/comp/bridgefactory/BridgeFactory.java \
+ com/sun/star/comp/connections/ConstantInstanceProvider.java \
+ com/sun/star/comp/connections/Implementation.java \
+ com/sun/star/comp/connections/PipedConnection.java \
+ com/sun/star/comp/connections/Connector.java \
+ com/sun/star/comp/connections/Acceptor.java \
+ com/sun/star/comp/urlresolver/UrlResolver.java \
+ com/sun/star/comp/servicemanager/ServiceManager.java \
+ com/sun/star/uno/MappingException.java \
+ com/sun/star/uno/AsciiString.java \
+ com/sun/star/uno/Ascii.java \
+ com/sun/star/uno/WeakReference.java \
+ com/sun/star/uno/AnyConverter.java \
+ com/sun/star/lib/util/UrlToFileMapper.java \
+ com/sun/star/lib/util/AsynchronousFinalizer.java \
+ com/sun/star/lib/util/StringHelper.java \
+ com/sun/star/lib/util/NativeLibraryLoader.java \
+ com/sun/star/lib/connections/socket/socketAcceptor.java \
+ com/sun/star/lib/connections/socket/SocketConnection.java \
+ com/sun/star/lib/connections/socket/ConnectionDescriptor.java \
+ com/sun/star/lib/connections/socket/socketConnector.java \
+ com/sun/star/lib/connections/pipe/pipeAcceptor.java \
+ com/sun/star/lib/connections/pipe/pipeConnector.java \
+ com/sun/star/lib/connections/pipe/PipeConnection.java \
+ com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory.java \
+ com/sun/star/lib/uno/environments/remote/IProtocol.java \
+ com/sun/star/lib/uno/environments/remote/Job.java \
+ com/sun/star/lib/uno/environments/remote/IReceiver.java \
+ com/sun/star/lib/uno/environments/remote/remote_environment.java \
+ com/sun/star/lib/uno/environments/remote/IThreadPool.java \
+ com/sun/star/lib/uno/environments/remote/Message.java \
+ com/sun/star/lib/uno/environments/remote/JavaThreadPool.java \
+ com/sun/star/lib/uno/environments/remote/JobQueue.java \
+ com/sun/star/lib/uno/environments/remote/ThreadId.java \
+ com/sun/star/lib/uno/environments/remote/ThreadPoolManager.java \
+ com/sun/star/lib/uno/environments/remote/NativeThreadPool.java \
+ com/sun/star/lib/uno/environments/java/java_environment.java \
+
com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java \
+ com/sun/star/lib/uno/bridges/java_remote/RequestHandler.java \
+
com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java \
+ com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java \
+ com/sun/star/lib/uno/bridges/java_remote/BridgedObject.java \
+ com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java \
+ com/sun/star/lib/uno/Proxy.java \
+ com/sun/star/lib/uno/protocols/urp/PendingRequests.java \
+ com/sun/star/lib/uno/protocols/urp/UrpMessage.java \
+ com/sun/star/lib/uno/protocols/urp/Cache.java \
+ com/sun/star/lib/uno/protocols/urp/Unmarshal.java \
+ com/sun/star/lib/uno/protocols/urp/Marshal.java \
+ com/sun/star/lib/uno/protocols/urp/urp.java \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/jurt/java/jurt/build.xml
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/jurt/java/jurt/build.xml?rev=1828636&view=auto
==============================================================================
--- openoffice/trunk/main/jurt/java/jurt/build.xml (added)
+++ openoffice/trunk/main/jurt/java/jurt/build.xml Sun Apr 8 12:55:05 2018
@@ -0,0 +1,46 @@
+<?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="jurt" default="main">
+
+ <property file="../../../ant.properties"/>
+ <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/>
+
+ <target name="init-project">
+
+ <property name="jar.classpath" value="ridl.jar unoloader.jar
../../lib/ ../bin/"/>
+ <property name="jar.manifest" value="${SRC_ROOT}/jurt/util/manifest"/>
+
+ <path id="main.classpath">
+ <pathelement location="${OUTDIR}/bin/ridl.jar"/>
+ <pathelement location="${OUTDIR}/bin/unoloader.jar"/>
+ </path>
+
+ <filelist id="idl.files">
+ <file
name="${test.src.dir}/com/sun/star/lib/uno/protocols/urp/interfaces.idl"/>
+ </filelist>
+
+ </target>
+
+</project>
+
Modified: openoffice/trunk/main/jurt/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/jurt/prj/build.lst?rev=1828636&r1=1828635&r2=1828636&view=diff
==============================================================================
--- openoffice/trunk/main/jurt/prj/build.lst (original)
+++ openoffice/trunk/main/jurt/prj/build.lst Sun Apr 8 12:55:05 2018
@@ -1,20 +1,2 @@
-ju jurt : ridljar sal NULL
-ju jurt
usr1 - all ju_mkout NULL
-ju jurt\com\sun\star\lib\util nmake -
all ju_libutil NULL
-ju jurt\com\sun\star\uno nmake -
all ju_uno NULL
-ju jurt\com\sun\star\comp\loader nmake - all
ju_co_loader ju_uno ju_libutil NULL
-ju jurt\com\sun\star\comp\bridgefactory nmake - all
ju_co_bfactr ju_co_loader NULL
-ju jurt\com\sun\star\lib\uno nmake - all ju_cssl_uno NULL
-ju jurt\com\sun\star\lib\uno\environments\java nmake
- all ju_env_java ju_cssl_uno NULL
-ju jurt\com\sun\star\lib\uno\environments\remote nmake -
all ju_env_remote ju_env_java NULL
-ju jurt\com\sun\star\lib\uno\protocols\urp nmake - all
ju_prot_urp ju_env_remote NULL
-ju jurt\com\sun\star\lib\uno\bridges\java_remote nmake -
all ju_brid_jrm ju_co_loader ju_cssl_uno ju_env_remote NULL
-ju jurt\com\sun\star\lib\connections\socket nmake
- all ju_con_sock ju_co_loader NULL
-ju jurt\com\sun\star\lib\connections\pipe nmake -
all ju_con_pipe ju_co_loader ju_libutil NULL
-ju jurt\com\sun\star\comp\connections nmake - all
ju_con ju_co_loader NULL
-ju jurt\com\sun\star\comp\servicemanager nmake - all
ju_servman NULL
-ju jurt\com\sun\star\comp\urlresolver nmake - all
ju_urlres ju_co_loader NULL
-ju jurt\source\pipe nmake - all
ju_src_pipe NULL
-ju jurt\source\pipe\wrapper nmake - w ju_src_pipe_wrapper NULL
-ju jurt\util
nmake - all ju_ut ju_brid_jrm ju_co_bfactr ju_con ju_con_sock
ju_con_pipe ju_cssl_uno ju_env_java ju_prot_urp ju_servman ju_urlres
ju_src_pipe ju_libutil ju_uno NULL
-ju jurt\test\com\sun\star\lib\uno\protocols\urp nmake - all
ju_test_css_lib_uno_protocols_urp NULL
+ju jurt : ridljar offapi sal NULL
+ju jurt\prj
nmake - all ju_prj NULL
Modified: openoffice/trunk/main/jurt/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/jurt/prj/d.lst?rev=1828636&r1=1828635&r2=1828636&view=diff
==============================================================================
--- openoffice/trunk/main/jurt/prj/d.lst (original)
+++ openoffice/trunk/main/jurt/prj/d.lst Sun Apr 8 12:55:05 2018
@@ -1,8 +0,0 @@
-..\%__SRC%\class\jurt.jar %_DEST%\bin%_EXT%\jurt.jar
-..\%__SRC%\bin\jpipe.dll %_DEST%\bin%_EXT%\jpipe.dll
-..\%__SRC%\bin\jpipx.dll %_DEST%\bin%_EXT%\jpipx.dll
-..\%__SRC%\lib\libjpipe*.so %_DEST%\lib%_EXT%\libjpipe*.so
-..\%__SRC%\lib\libjpipe*.dylib %_DEST%\lib%_EXT%\libjpipe*.dylib
-..\%__SRC%\lib\libjpipe*.jnilib %_DEST%\lib%_EXT%\libjpipe*.jnilib
-
-..\%__SRC%\bin\jurt_src.zip %COMMON_DEST%\bin%_EXT%\jurt_src.zip
Modified: openoffice/trunk/main/odk/pack/gendocu/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/odk/pack/gendocu/makefile.mk?rev=1828636&r1=1828635&r2=1828636&view=diff
==============================================================================
--- openoffice/trunk/main/odk/pack/gendocu/makefile.mk (original)
+++ openoffice/trunk/main/odk/pack/gendocu/makefile.mk Sun Apr 8 12:55:05 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) : $(SOLARCOMMONBINDIR)$/jurt_src.zip
$(SOLARCOMMONBINDIR)$/ridl_src.zip $(SOLARCOMMONBINDIR)$/unoloader_src.zip
$(SOLARCOMMONPCKDIR)$/juh_src.zip
+$(JAVA_SRC_FILES) : $(SOLARCOMMONPCKDIR)$/jurt_src.zip
$(SOLARCOMMONBINDIR)$/ridl_src.zip $(SOLARCOMMONBINDIR)$/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/solenv/ant/aoo-ant.xml
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/ant/aoo-ant.xml?rev=1828636&view=auto
==============================================================================
--- openoffice/trunk/main/solenv/ant/aoo-ant.xml (added)
+++ openoffice/trunk/main/solenv/ant/aoo-ant.xml Sun Apr 8 12:55:05 2018
@@ -0,0 +1,184 @@
+<?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="aoo-ant" default="main" xmlns:if="ant:if"
xmlns:unless="ant:unless">
+
+ <!-- ================================================================= -->
+ <!-- settings -->
+ <!-- ================================================================= -->
+
+ <dirname property="aoo-ant.basedir" file="${ant.file.aoo-ant}"/>
+
+ <!-- global properties -->
+ <property file="${aoo-ant.basedir}/../../ant.properties"/>
+ <!-- RSCREVISION: -->
+ <property file="${aoo-ant.basedir}/../inc/minor.mk"/>
+
+ <property name="build.base.dir"
location="${WORKDIR}/Ant/${ant.project.name}"/>
+ <property name="main.src.dir" location="src/main/java"/>
+ <property name="main.build.dir" location="${build.base.dir}/main"/>
+ <property name="test.src.dir" location="src/test/java"/>
+ <property name="test.build.dir" location="${build.base.dir}/test"/>
+ <property name="test.reports.dir"
location="${build.base.dir}/test-reports"/>
+ <property name="jar.dir" location="${WORKDIR}/Ant"/>
+
+ <property name="main.debug" value="true"/>
+ <property name="main.deprecation" value="false"/>
+ <property name="test.debug" value="true"/>
+ <property name="test.deprecation" value="false"/>
+
+ <import file="${aoo-ant.basedir}/externals.xml"/>
+ <import file="${aoo-ant.basedir}/idl.xml"/>
+
+ <target name="init-project"/>
+
+ <target name="prepare" depends="init-project">
+ <property name="jar.enabled" value="true"/>
+ <property name="jar.name" value="${ant.project.name}"/>
+ <property name="jar.classpath" value=""/>
+ <property name="jar.manifest" value
="${aoo-ant.basedir}/manifest.empty"/>
+
+ <local name="has.main.classpath"/>
+ <condition property="has.main.classpath">
+ <isreference refid="main.classpath"/>
+ </condition>
+ <path id="main.classpath" unless:set="has.main.classpath"/>
+
+ <local name="has.test.classpath"/>
+ <condition property="has.test.classpath">
+ <isreference refid="test.classpath"/>
+ </condition>
+ <path id="internal.test.classpath">
+ <pathelement location="${main.build.dir}"/>
+ <pathelement location="${test.build.dir}"/>
+ <path refid="main.classpath"/>
+ <path refid="test.classpath" if:set="has.test.classpath"/>
+ <pathelement location="${idl.classes.build.dir}"/>
+ <pathelement location="${OOO_JUNIT_JAR}"/>
+ </path>
+
+ <local name="has.idl.files"/>
+ <condition property="has.idl.files">
+ <isreference refid="idl.files"/>
+ </condition>
+ <filelist id="idl.files" unless:set="has.idl.files">
+ <filelist refid="idl.files"/>
+ </filelist>
+ </target>
+
+ <target name="res" depends="prepare">
+ <mkdir dir="${main.build.dir}"/>
+ <copy todir="${main.build.dir}">
+ <fileset dir="${main.src.dir}">
+ <include name="**/*.properties"/>
+ <include name="**/*.css"/>
+ <include name="**/*.dtd"/>
+ <include name="**/*.form"/>
+ <include name="**/*.gif "/>
+ <include name="**/*.htm"/>
+ <include name="**/*.html"/>
+ <include name="**/*.js"/>
+ <include name="**/*.mod"/>
+ <include name="**/*.sql"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.xsl"/>
+ <include name="**/*.map"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="compile" depends="prepare,res">
+ <mkdir dir="${main.build.dir}"/>
+ <javac srcdir="${main.src.dir}"
+ destdir="${main.build.dir}"
+ debug="${main.debug}"
+ debuglevel="lines,vars,source"
+ deprecation="${main.deprecation}"
+ classpathref="main.classpath"
+ includeantruntime="false"/>
+ </target>
+
+ <target name="test-compile" depends="compile,idl">
+ <property property="test.skip" value="true"
if:blank="${OOO_JUNIT_JAR}"/>
+ <echo message="No junit, skipping tests" if:blank="${OOO_JUNIT_JAR}"/>
+
+ <mkdir dir="${test.build.dir}" unless:blank="${OOO_JUNIT_JAR}"/>
+ <javac srcdir="${test.src.dir}"
+ destdir="${test.build.dir}"
+ debug="${test.debug}"
+ debuglevel="lines,vars,source"
+ deprecation="${test.deprecation}"
+ classpathref="internal.test.classpath"
+ includeantruntime="false"
+ unless:blank="${OOO_JUNIT_JAR}"/>
+ </target>
+
+ <!-- fork="true" is sadly necessary on Ubuntu due to multiple versions of
junit confusing Ant,
+ see https://github.com/real-logic/simple-binary-encoding/issues/96 -->
+ <target name="test" depends="test-compile" unless:set="${test.skip}">
+ <mkdir dir="${test.reports.dir}"/>
+ <junit printsummary="yes" haltonfailure="yes" showoutput="true"
filtertrace="false" fork="true">
+ <classpath refid="internal.test.classpath"/>
+ <formatter type="plain"/>
+ <batchtest todir="${test.reports.dir}">
+ <fileset dir="${test.src.dir}">
+ <include name="**/*_Test.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="jar" depends="compile" if="${jar.enabled}">
+ <jar destfile="${jar.dir}/${jar.name}.jar"
+ basedir="${main.build.dir}"
+ manifest="${jar.manifest}">
+ <manifest>
+ <attribute name="Class-Path" value="${jar.classpath}"
unless:blank="${jar.classpath}"/>
+ <attribute name="Solar-Version" value="${RSCREVISION}"/>
+ </manifest>
+ <include name="**/*.class"/>
+ <include name="**/*.properties"/>
+ <include name="**/*.css"/>
+ <include name="**/*.dtd"/>
+ <include name="**/*.form"/>
+ <include name="**/*.gif "/>
+ <include name="**/*.htm"/>
+ <include name="**/*.html"/>
+ <include name="**/*.js"/>
+ <include name="**/*.mod"/>
+ <include name="**/*.sql"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.xsl"/>
+ <include name="**/*.map"/>
+ </jar>
+ </target>
+
+ <target name="clean" depends="prepare">
+ <delete dir="${build.base.dir}"/>
+ <delete file="${jar.dir}/${jar.name}.jar"/>
+ </target>
+
+ <target name="main" depends="test,jar"/>
+
+</project>
+
Added: openoffice/trunk/main/solenv/ant/externals.xml
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/ant/externals.xml?rev=1828636&view=auto
==============================================================================
--- openoffice/trunk/main/solenv/ant/externals.xml (added)
+++ openoffice/trunk/main/solenv/ant/externals.xml Sun Apr 8 12:55:05 2018
@@ -0,0 +1,76 @@
+<?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="externals">
+
+ <!-- Each external has 3 properties set, for example for "commons-lang":
+ external.commons-lang.internalfilename - the filename when built
internally, eg. commons-lang3-3.3.jar
+ external.commons-lang.jarclasspath - the path to be placed in the
"Class-Path:" entry in JAR files linking to this JAR
+ external.commons-lang.path - the full path to the JAR
+ -->
+
+ <dirname property="externals.basedir" file="${ant.file.externals}"/>
+
+ <!-- global properties -->
+ <property file="${externals.basedir}/../../ant.properties"/>
+
+ <macrodef name="define-external">
+ <attribute name="name"/>
+ <attribute name="system-test"/>
+ <attribute name="system-path"/>
+ <attribute name="internal-filename"/>
+ <sequential>
+ <property name="external.@{name}.internalfilename"
value="@{internal-filename}"/>
+ <condition property="external.@{name}.jarclasspath"
value="@{system-path}" else="${external.@{name}.internalfilename}">
+ <equals arg1="@{system-test}" arg2="YES"/>
+ </condition>
+ <condition property="external.@{name}.path" value="@{system-path}"
else="${OUTDIR}/bin/${external.@{name}.internalfilename}">
+ <equals arg1="@{system-test}" arg2="YES"/>
+ </condition>
+ </sequential>
+ </macrodef>
+
+ <define-external
+ name="commons-codec"
+ system-test="${SYSTEM_APACHE_COMMONS}"
+ system-path="${COMMONS_CODEC_JAR}"
+ internal-filename="commons-codec-1.9.jar"/>
+
+ <define-external
+ name="commons-httpclient"
+ system-test="${SYSTEM_APACHE_COMMONS}"
+ system-path="${COMMONS_HTTPCLIENT_JAR}"
+ internal-filename="commons-httpclient-3.1.jar"/>
+
+ <define-external
+ name="commons-lang"
+ system-test="${SYSTEM_APACHE_COMMONS}"
+ system-path="${COMMONS_LANG_JAR}"
+ internal-filename="commons-lang3-3.3.jar"/>
+
+ <define-external
+ name="commons-logging"
+ system-test="${SYSTEM_APACHE_COMMONS}"
+ system-path="${COMMONS_LOGGING_JAR}"
+ internal-filename="commons-logging-1.1.3.jar"/>
+
+</project>
Added: openoffice/trunk/main/solenv/ant/idl.xml
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/ant/idl.xml?rev=1828636&view=auto
==============================================================================
--- openoffice/trunk/main/solenv/ant/idl.xml (added)
+++ openoffice/trunk/main/solenv/ant/idl.xml Sun Apr 8 12:55:05 2018
@@ -0,0 +1,99 @@
+<?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="idl" xmlns:if="ant:if" xmlns:unless="ant:unless">
+
+ <dirname property="idl.basedir" file="${ant.file.idl}"/>
+
+ <!-- global properties -->
+ <property file="${idl.basedir}/../../ant.properties"/>
+
+
+
+ <property name="idl.build.dir" location="${build.base.dir}/idl"/>
+ <property name="idl.urd.build.dir" location="${idl.build.dir}/urd"/>
+ <property name="idl.rdb.build.dir" location="${idl.build.dir}/rdb"/>
+ <property name="idl.classes.build.dir"
location="${idl.build.dir}/classes"/>
+ <property name="idl.javamaker.flag"
location="${idl.build.dir}/idl.javamaker.flag"/>
+
+ <target name="idl" depends="idl-check,idl-javamaker"/>
+
+ <target name="idl-check">
+ <local name="idl.files.exist"/>
+ <condition property="idl.files.exist">
+ <resourcecount refid="idl.files" when="greater" count="0"/>
+ </condition>
+
+ <local name="idl.files.union"/>
+ <union id="idl.files.union" if:set="idl.files.exist">
+ <filelist refid="idl.files"/>
+ </union>
+ <uptodate property="idl.uptodate" targetfile="${idl.javamaker.flag}"
if:set="idl.files.exist">
+ <srcresources refid="idl.files.union"/>
+ </uptodate>
+ <property name="idl.uptodate" value="true"
unless:set="idl.files.exist"/>
+ </target>
+
+ <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>
+ <touch file="${idl.javamaker.flag}"/>
+ </target>
+
+ <target name="idl-regmerge" depends="idl-idlc" unless="idl.uptodate">
+ <mkdir dir="${idl.rdb.build.dir}"/>
+ <delete file="${idl.rdb.build.dir}/registry.rdb"/>
+ <apply executable="${OUTDIR}/bin/regmerge" failonerror="true">
+ <env key="LD_LIBRARY_PATH" value="${OUTDIR}/lib"/>
+ <env key="DYLD_LIBRARY_PATH" value="${OUTDIR}/lib"/>
+ <arg value="${idl.rdb.build.dir}/registry.rdb"/>
+ <arg value="/UCR"/>
+ <fileset dir="${idl.urd.build.dir}" includes="**/*.urd"/>
+ </apply>
+ </target>
+
+ <target name="idl-idlc" unless="idl.uptodate">
+ <mkdir dir="${idl.urd.build.dir}"/>
+ <apply executable="${OUTDIR}/bin/idlc" failonerror="true">
+ <env key="LD_LIBRARY_PATH" value="${OUTDIR}/lib"/>
+ <env key="DYLD_LIBRARY_PATH" value="${OUTDIR}/lib"/>
+ <arg value="-I${OUTDIR}/idl"/>
+ <arg value="-O"/>
+ <arg value="${idl.urd.build.dir}"/>
+ <arg value="-verbose"/>
+ <arg value="-cid"/>
+ <arg value="-we"/>
+ <filelist refid="idl.files"/>
+ </apply>
+ </target>
+
+</project>
+
Added: openoffice/trunk/main/solenv/ant/manifest.empty
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/ant/manifest.empty?rev=1828636&view=auto
==============================================================================
(empty)
Added: openoffice/trunk/main/solenv/gbuild/Ant.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/Ant.mk?rev=1828636&view=auto
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/Ant.mk (added)
+++ openoffice/trunk/main/solenv/gbuild/Ant.mk Sun Apr 8 12:55:05 2018
@@ -0,0 +1,82 @@
+###############################################################
+#
+# 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.
+#
+###############################################################
+
+
+
+# Ant class
+
+gb_Ant_ANTCOMMAND := $(ANT)
+
+# clean target
+$(call gb_Ant_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),ANT,3)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(call gb_Ant_get_target,$*) $(call
gb_Jar_get_outdir_target,$*) && \
+ $(gb_Ant_ANTCOMMAND) -f $(ANTBUILDFILE) clean)
+
+# the outdir target depends on the workdir target and is built by delivering
the latter
+
+# rule for creating the jar file
+# creates the target folder of the jar file if it doesn't exist
+# creates the jar file
+$(call gb_Ant_get_target,%) : FORCE
+ $(call gb_Output_announce,$*,$(true),ANT,3)
+ $(call gb_Helper_abbreviate_dirs_native,\
+ mkdir -p $(dir $@) && \
+ $(gb_Ant_ANTCOMMAND) -f $(ANTBUILDFILE) )
+
+FORCE:
+
+
+# registers target and clean target
+# adds jar files to DeliverLogTarget
+# adds dependency for outdir target to workdir target (pattern rule for
delivery is in Package.mk)
+define gb_Ant_Ant
+$(call gb_Ant_get_target,$(1)) : ANTBUILDFILE := $(2)
+$(call gb_Ant_get_clean_target,$(1)) : ANTBUILDFILE := $(2)
+$(eval $(call gb_Module_register_target,$(call
gb_Jar_get_outdir_target,$(1)),$(call gb_Ant_get_clean_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))
+
+endef
+
+
+# possible directories for jar files containing UNO services
+gb_Ant_COMPONENTPREFIXES := \
+ OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/classes/ \
+ URE:vnd.sun.star.expand:\dURE_INTERNAL_JAVA_DIR/ \
+ INTERN:vnd.sun.star.expand:\dOOO_INBUILD_JAVA_DIR/
+
+# get component prefix from layer name ("OOO", "URE", "INTERN")
+gb_Ant__get_componentprefix = \
+ $(patsubst $(1):%,%,$(or \
+ $(filter $(1):%,$(gb_Ant_COMPONENTPREFIXES)), \
+ $(call gb_Output_error,no ComponentTarget native prefix for layer
'$(1)')))
+
+# layer must be specified explicitly in this macro (different to libraries)
+define gb_Ant_set_componentfile
+$(call gb_ComponentTarget_ComponentTarget,$(2),$(call
gb_Ant__get_componentprefix,$(3)),$(notdir $(call gb_Ant_get_target,$(1))))
+$(call gb_Ant_get_target,$(1)) : $(call
gb_ComponentTarget_get_outdir_target,$(2))
+$(call gb_Ant_get_clean_target,$(1)) : $(call
gb_ComponentTarget_get_clean_target,$(2))
+
+endef
+
+# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/solenv/gbuild/TargetLocations.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/TargetLocations.mk?rev=1828636&r1=1828635&r2=1828636&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/TargetLocations.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/TargetLocations.mk Sun Apr 8 12:55:05
2018
@@ -45,6 +45,7 @@ endef
# workdir target patterns
gb_AllLangResTarget_get_target = $(WORKDIR)/AllLangRes/$(1)
+gb_Ant_get_target = $(WORKDIR)/Ant/$(1).jar
gb_CObject_get_target = $(WORKDIR)/CObject/$(1).o
gb_ComponentTarget_get_target = $(WORKDIR)/ComponentTarget/$(1).component
gb_ComponentTarget_get_inbuild_target =
$(WORKDIR)/ComponentTarget/$(1).inbuild.component
@@ -109,6 +110,7 @@ endef
$(eval $(call gb_Helper_make_clean_targets,\
AllLangResTarget \
+ Ant \
ComponentTarget \
JavaClassSet \
Jar \
Modified: openoffice/trunk/main/solenv/gbuild/gbuild.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/gbuild.mk?rev=1828636&r1=1828635&r2=1828636&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/gbuild.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/gbuild.mk Sun Apr 8 12:55:05 2018
@@ -254,6 +254,7 @@ include $(foreach class, \
CustomTarget \
PrecompiledHeaders \
GoogleTest \
+ Ant \
Jar \
JavaClassSet \
JunitTest \
