gbuildize jurt

Repository.mk

@@ -268,11 +268,20 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 endif
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
+    jpipe \
     sal_textenc \
     sunjavaplugin \
 	xmlreader \
 ))
 
+ifeq ($(OS),WNT)
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
+    jpipx \
+))
+
+endif
+
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	affine_uno \
 	avmediagst \

RepositoryModule_ooo.mk

@@ -59,6 +59,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     i18nutil \
     idl \
     jvmaccess \
+    jurt \
     lingucomponent \
     linguistic \
     lotuswordpro \

jurt/Jar_jurt.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Jar_Jar,jurt))
+
+$(eval $(call gb_Jar_add_jars,jurt,\
+    $(OUTDIR)/bin/ridl.jar \
+    $(OUTDIR)/bin/unoloader.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,jurt,com))
+
+$(eval $(call gb_Jar_set_manifest,jurt,$(SRCDIR)/jurt/util/manifest))
+
+$(eval $(call gb_Jar_add_sourcefiles,jurt,\
+    jurt/com/sun/star/comp/bridgefactory/BridgeFactory \
+    jurt/com/sun/star/comp/connections/Acceptor \
+    jurt/com/sun/star/comp/connections/Connector \
+    jurt/com/sun/star/comp/connections/ConstantInstanceProvider \
+    jurt/com/sun/star/comp/connections/Implementation \
+    jurt/com/sun/star/comp/connections/PipedConnection \
+    jurt/com/sun/star/comp/loader/FactoryHelper \
+    jurt/com/sun/star/comp/loader/JavaLoader \
+    jurt/com/sun/star/comp/loader/JavaLoaderFactory \
+    jurt/com/sun/star/comp/loader/RegistrationClassFinder \
+    jurt/com/sun/star/comp/servicemanager/ServiceManager \
+    jurt/com/sun/star/comp/urlresolver/UrlResolver \
+    jurt/com/sun/star/lib/connections/pipe/PipeConnection \
+    jurt/com/sun/star/lib/connections/pipe/pipeAcceptor \
+    jurt/com/sun/star/lib/connections/pipe/pipeConnector \
+    jurt/com/sun/star/lib/connections/socket/ConnectionDescriptor \
+    jurt/com/sun/star/lib/connections/socket/SocketConnection \
+    jurt/com/sun/star/lib/connections/socket/socketAcceptor \
+    jurt/com/sun/star/lib/connections/socket/socketConnector \
+    jurt/com/sun/star/lib/uno/Proxy \
+    jurt/com/sun/star/lib/uno/bridges/java_remote/BridgedObject \
+    jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory \
+    jurt/com/sun/star/lib/uno/bridges/java_remote/RequestHandler \
+    jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter \
+    jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter \
+    jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge \
+    jurt/com/sun/star/lib/uno/environments/java/java_environment \
+    jurt/com/sun/star/lib/uno/environments/remote/IProtocol \
+    jurt/com/sun/star/lib/uno/environments/remote/IReceiver \
+    jurt/com/sun/star/lib/uno/environments/remote/IThreadPool \
+    jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool \
+    jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory \
+    jurt/com/sun/star/lib/uno/environments/remote/Job \
+    jurt/com/sun/star/lib/uno/environments/remote/JobQueue \
+    jurt/com/sun/star/lib/uno/environments/remote/Message \
+    jurt/com/sun/star/lib/uno/environments/remote/NativeThreadPool \
+    jurt/com/sun/star/lib/uno/environments/remote/ThreadId \
+    jurt/com/sun/star/lib/uno/environments/remote/ThreadPoolManager \
+    jurt/com/sun/star/lib/uno/environments/remote/remote_environment \
+    jurt/com/sun/star/lib/uno/protocols/urp/Cache \
+    jurt/com/sun/star/lib/uno/protocols/urp/Marshal \
+    jurt/com/sun/star/lib/uno/protocols/urp/PendingRequests \
+    jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal \
+    jurt/com/sun/star/lib/uno/protocols/urp/UrpMessage \
+    jurt/com/sun/star/lib/uno/protocols/urp/urp \
+    jurt/com/sun/star/lib/util/AsynchronousFinalizer \
+    jurt/com/sun/star/lib/util/NativeLibraryLoader \
+    jurt/com/sun/star/lib/util/StringHelper \
+    jurt/com/sun/star/lib/util/UrlToFileMapper \
+    jurt/com/sun/star/uno/AnyConverter \
+    jurt/com/sun/star/uno/Ascii \
+    jurt/com/sun/star/uno/AsciiString \
+    jurt/com/sun/star/uno/MappingException \
+    jurt/com/sun/star/uno/WeakReference \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:

jurt/Library_jpipe.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,jpipe))
+
+$(eval $(call gb_Library_add_linked_libs,jpipe,\
+    $(gb_STDLIBS) \
+))
+
+ifeq ($(OS),WNT)
+
+# The real library is called jpipx on Windows. We build only a wrapper
+# for it here.
+$(eval $(call gb_Library_add_cobjects,jpipe,\
+    jurt/source/pipe/wrapper/wrapper \
+))
+
+else
+
+$(eval $(call gb_Library_add_linked_libs,jpipe,\
+    sal \
+))
+
+$(eval $(call gb_Library_add_cobjects,jpipe,\
+    jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection \
+))
+
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:

jurt/Library_jpipx.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,jpipx))
+
+$(eval $(call gb_Library_add_linked_libs,jpipx,\
+    sal \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_cobjects,jpipx,\
+    jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:

jurt/Makefile

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+gb_PARTIALBUILD := T
+ifeq ($(strip $(SOLARENV)),)
+include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
+else
+
+gb_SourceEnvAndRecurse_STAGE=gbuild
+include $(SOLARENV)/gbuild/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+endif
+# vim: set noet sw=4 ts=4:

jurt/Module_jurt.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,jurt))
+
+ifneq ($(SOLAR_JAVA),)
+
+$(eval $(call gb_Module_add_targets,jurt,\
+    Jar_jurt \
+    Library_jpipe \
+    Zip_jurt \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Module_add_targets,jurt,\
+    Library_jpipx \
+))
+endif
+
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:

jurt/Zip_jurt.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Zip_Zip,jurt_src,$(SRCDIR)/jurt))
+
+$(eval $(call gb_Zip_add_files,jurt_src,\
+    com/sun/star/comp/bridgefactory/BridgeFactory.java \
+    com/sun/star/comp/connections/Acceptor.java \
+    com/sun/star/comp/connections/Connector.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/loader/FactoryHelper.java \
+    com/sun/star/comp/loader/JavaLoader.java \
+    com/sun/star/comp/loader/JavaLoaderFactory.java \
+    com/sun/star/comp/loader/RegistrationClassFinder.java \
+    com/sun/star/comp/servicemanager/ServiceManager.java \
+    com/sun/star/comp/urlresolver/UrlResolver.java \
+    com/sun/star/lib/connections/pipe/PipeConnection.java \
+    com/sun/star/lib/connections/pipe/pipeAcceptor.java \
+    com/sun/star/lib/connections/pipe/pipeConnector.java \
+    com/sun/star/lib/connections/socket/ConnectionDescriptor.java \
+    com/sun/star/lib/connections/socket/SocketConnection.java \
+    com/sun/star/lib/connections/socket/socketAcceptor.java \
+    com/sun/star/lib/connections/socket/socketConnector.java \
+    com/sun/star/lib/uno/Proxy.java \
+    com/sun/star/lib/uno/bridges/java_remote/BridgedObject.java \
+    com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.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/XConnectionOutputStream_Adapter.java \
+    com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java \
+    com/sun/star/lib/uno/environments/java/java_environment.java \
+    com/sun/star/lib/uno/environments/remote/IProtocol.java \
+    com/sun/star/lib/uno/environments/remote/IReceiver.java \
+    com/sun/star/lib/uno/environments/remote/IThreadPool.java \
+    com/sun/star/lib/uno/environments/remote/JavaThreadPool.java \
+    com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory.java \
+    com/sun/star/lib/uno/environments/remote/Job.java \
+    com/sun/star/lib/uno/environments/remote/JobQueue.java \
+    com/sun/star/lib/uno/environments/remote/Message.java \
+    com/sun/star/lib/uno/environments/remote/NativeThreadPool.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/remote_environment.java \
+    com/sun/star/lib/uno/protocols/urp/Cache.java \
+    com/sun/star/lib/uno/protocols/urp/Marshal.java \
+    com/sun/star/lib/uno/protocols/urp/PendingRequests.java \
+    com/sun/star/lib/uno/protocols/urp/Unmarshal.java \
+    com/sun/star/lib/uno/protocols/urp/UrpMessage.java \
+    com/sun/star/lib/uno/protocols/urp/urp.java \
+    com/sun/star/lib/util/AsynchronousFinalizer.java \
+    com/sun/star/lib/util/NativeLibraryLoader.java \
+    com/sun/star/lib/util/StringHelper.java \
+    com/sun/star/lib/util/UrlToFileMapper.java \
+    com/sun/star/uno/AnyConverter.java \
+    com/sun/star/uno/Ascii.java \
+    com/sun/star/uno/AsciiString.java \
+    com/sun/star/uno/MappingException.java \
+    com/sun/star/uno/WeakReference.java \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:

jurt/prj/build.lst

 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\prj					nmake	-	all	ju_prj NULL

jurt/prj/d.lst

-..\%__SRC%\class\jurt.jar %_DEST%\bin\jurt.jar
-..\%__SRC%\bin\jpipe.dll %_DEST%\bin\jpipe.dll
-..\%__SRC%\bin\jpipx.dll %_DEST%\bin\jpipx.dll
-..\%__SRC%\lib\libjpipe*.so %_DEST%\lib\libjpipe*.so
-..\%__SRC%\lib\libjpipe.jnilib %_DEST%\lib\libjpipe.jnilib
-..\%__SRC%\lib\libjpipe*.jnilib %_DEST%\lib\libjpipe*.jnilib
-
-..\%__SRC%\bin\jurt_src.zip %COMMON_DEST%\bin\jurt_src.zip

jurt/prj/makefile.mk

+.INCLUDE : gbuildbridge.mk

odk/pack/gendocu/makefile.mk

@@ -53,10 +53,10 @@ JAVA_PACKAGES=\
 #        com.sun.star.beans \
 
 JAVA_SRC_FILES_BIN=\
-        $(JAVA_SRC_DIR)$/jurt_src.zip \
         $(JAVA_SRC_DIR)$/juh_src.zip
 
 JAVA_SRC_FILES_PCK=\
+        $(JAVA_SRC_DIR)$/jurt_src.zip \
         $(JAVA_SRC_DIR)$/ridl_src.zip \
         $(JAVA_SRC_DIR)$/unoloader_src.zip