You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2019/01/09 17:23:55 UTC
svn commit: r1850884 - in /openoffice/trunk/main: ./ bridges/inc/pch/
bridges/java/java_uno/
bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/
bridges/prj/ bridges/source/ bridges/source/cpp_uno/shared/
bridges/source/jni_uno/
Author: jim
Date: Wed Jan 9 17:23:55 2019
New Revision: 1850884
URL: http://svn.apache.org/viewvc?rev=1850884&view=rev
Log:
Back out the bridges conversion to gbuild (r1848262)
Modified:
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/bridges/inc/pch/precompiled_bridges_java_uno.cxx
openoffice/trunk/main/bridges/inc/pch/precompiled_bridges_java_uno.hxx
openoffice/trunk/main/bridges/java/java_uno/build.xml
openoffice/trunk/main/bridges/java/java_uno/manifest
openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/makefile.mk
openoffice/trunk/main/bridges/prj/build.lst
openoffice/trunk/main/bridges/prj/d.lst
openoffice/trunk/main/bridges/prj/makefile.mk
openoffice/trunk/main/bridges/source/bridge_exports.map
openoffice/trunk/main/bridges/source/cpp_uno/shared/component.cxx
openoffice/trunk/main/bridges/source/jni_uno/jni_bridge.cxx
openoffice/trunk/main/bridges/source/jni_uno/jni_data.cxx
openoffice/trunk/main/bridges/source/jni_uno/jni_info.cxx
openoffice/trunk/main/bridges/source/jni_uno/jni_java2uno.cxx
openoffice/trunk/main/bridges/source/jni_uno/jni_uno2java.cxx
openoffice/trunk/main/bridges/source/jni_uno/nativethreadpool.cxx
Modified: openoffice/trunk/main/Repository.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1850884&r1=1850883&r2=1850884&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Wed Jan 9 17:23:55 2019
@@ -44,8 +44,6 @@ $(eval $(call gb_Helper_register_executa
))
$(eval $(call gb_Helper_register_executables,OOO, \
- regsingleton \
- sp2bv \
spadmin.bin \
))
@@ -60,10 +58,8 @@ $(eval $(call gb_Helper_register_executa
$(eval $(call gb_Helper_register_executables,UREBIN, \
javaldx \
- regcomp \
regmerge \
regview \
- uno \
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
Modified: openoffice/trunk/main/bridges/inc/pch/precompiled_bridges_java_uno.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/inc/pch/precompiled_bridges_java_uno.cxx?rev=1850884&r1=1850883&r2=1850884&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/inc/pch/precompiled_bridges_java_uno.cxx (original)
+++ openoffice/trunk/main/bridges/inc/pch/precompiled_bridges_java_uno.cxx Wed Jan 9 17:23:55 2019
@@ -1,25 +0,0 @@
-/**************************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-
-
-#include "precompiled_bridges.hxx"
-
Modified: openoffice/trunk/main/bridges/inc/pch/precompiled_bridges_java_uno.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/inc/pch/precompiled_bridges_java_uno.hxx?rev=1850884&r1=1850883&r2=1850884&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/inc/pch/precompiled_bridges_java_uno.hxx (original)
+++ openoffice/trunk/main/bridges/inc/pch/precompiled_bridges_java_uno.hxx Wed Jan 9 17:23:55 2019
@@ -1,144 +0,0 @@
-/**************************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-
-
-// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:31.967936
-
-#ifdef PRECOMPILED_HEADERS
-//---MARKER---
-#include "boost/static_assert.hpp"
-
-#include "com/sun/star/bridge/InvalidProtocolChangeException.hdl"
-#include "com/sun/star/bridge/InvalidProtocolChangeException.hpp"
-#include "com/sun/star/bridge/ProtocolProperty.hdl"
-#include "com/sun/star/bridge/ProtocolProperty.hpp"
-#include "com/sun/star/bridge/XBridge.hpp"
-#include "com/sun/star/bridge/XBridgeFactory.hpp"
-#include "com/sun/star/bridge/XInstanceProvider.hpp"
-#include "com/sun/star/bridge/XUnoUrlResolver.hpp"
-#include "com/sun/star/connection/ConnectionSetupException.hpp"
-#include "com/sun/star/connection/NoConnectException.hpp"
-#include "com/sun/star/connection/XAcceptor.hpp"
-#include "com/sun/star/connection/XConnection.hpp"
-#include "com/sun/star/connection/XConnector.hpp"
-#include "com/sun/star/frame/XComponentLoader.hpp"
-#include "com/sun/star/io/XInputStream.hpp"
-#include "com/sun/star/io/XOutputStream.hpp"
-#include "com/sun/star/lang/IllegalArgumentException.hpp"
-#include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
-#include "com/sun/star/lang/XComponent.hpp"
-#include "com/sun/star/lang/XInitialization.hpp"
-#include "com/sun/star/lang/XMain.hpp"
-#include "com/sun/star/lang/XMultiComponentFactory.hpp"
-#include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/lang/XSingleComponentFactory.hpp"
-#include "com/sun/star/registry/InvalidRegistryException.hpp"
-#include "com/sun/star/registry/XImplementationRegistration.hpp"
-#include "com/sun/star/registry/XRegistryKey.hpp"
-#include "com/sun/star/text/XTextDocument.hpp"
-#include "com/sun/star/uno/Any.h"
-#include "com/sun/star/uno/Any.hxx"
-#include "com/sun/star/uno/DeploymentException.hpp"
-#include "com/sun/star/uno/Exception.hdl"
-#include "com/sun/star/uno/Exception.hpp"
-#include "com/sun/star/uno/Reference.h"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/RuntimeException.hdl"
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include "com/sun/star/uno/Sequence.h"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "com/sun/star/uno/Type.h"
-#include "com/sun/star/uno/Type.hxx"
-#include "com/sun/star/uno/TypeClass.hdl"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/uno/XInterface.hdl"
-#include "com/sun/star/uno/XInterface.hpp"
-#include "com/sun/star/uno/XNamingService.hpp"
-#include "com/sun/star/uno/genfunc.hxx"
-
-#include "cppu/macros.hxx"
-#include "cppu/unotype.hxx"
-
-#include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase1.hxx"
-#include "cppuhelper/implbase2.hxx"
-#include "cppuhelper/implbase3.hxx"
-#include "cppuhelper/implementationentry.hxx"
-#include "cppuhelper/servicefactory.hxx"
-#include "cppuhelper/weak.hxx"
-
-
-#include "osl/conditn.h"
-#include "osl/conditn.hxx"
-#include "osl/diagnose.h"
-#include "osl/doublecheckedlocking.h"
-#include "osl/getglobalmutex.hxx"
-#include "osl/interlck.h"
-#include "osl/module.h"
-#include "osl/module.hxx"
-#include "osl/mutex.h"
-#include "osl/mutex.hxx"
-#include "osl/process.h"
-#include "osl/semaphor.h"
-#include "osl/thread.h"
-#include "osl/thread.hxx"
-#include "osl/time.h"
-
-#include "rtl/alloc.h"
-#include "rtl/byteseq.h"
-#include "rtl/byteseq.hxx"
-#include "rtl/instance.hxx"
-#include "rtl/memory.h"
-#include "rtl/process.h"
-#include "rtl/random.h"
-#include "rtl/strbuf.hxx"
-#include "rtl/string.h"
-#include "rtl/string.hxx"
-#include "rtl/unload.h"
-#include "rtl/ustrbuf.hxx"
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
-#include "rtl/uuid.h"
-
-#include "sal/alloca.h"
-#include "sal/config.h"
-#include "sal/types.h"
-
-#include "sys/types.h"
-
-
-#include "typelib/typeclass.h"
-#include "typelib/typedescription.h"
-#include "typelib/typedescription.hxx"
-
-#include "uno/any2.h"
-#include "uno/data.h"
-#include "uno/dispatcher.h"
-#include "uno/environment.h"
-#include "uno/environment.hxx"
-#include "uno/lbnames.h"
-#include "uno/mapping.h"
-#include "uno/mapping.hxx"
-#include "uno/sequence2.h"
-#include "uno/threadpool.h"
-//---MARKER---
-#endif
Modified: openoffice/trunk/main/bridges/java/java_uno/build.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/java/java_uno/build.xml?rev=1850884&r1=1850883&r2=1850884&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/java/java_uno/build.xml (original)
+++ openoffice/trunk/main/bridges/java/java_uno/build.xml Wed Jan 9 17:23:55 2019
@@ -1,41 +0,0 @@
-<?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="java_uno" default="main" basedir=".">
-
- <property file="../../../ant.properties"/>
- <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/>
-
- <target name="init-project">
- <property name="jar.classpath" value="jurt.jar ridl.jar ../../lib/ ../bin/"/>
- <property name="jar.manifest" value="manifest"/>
-
- <path id="main.classpath">
- <pathelement location="${OUTDIR}/bin/jurt.jar"/>
- <pathelement location="${OUTDIR}/bin/ridl.jar"/>
- </path>
- </target>
-
-</project>
-
Modified: openoffice/trunk/main/bridges/java/java_uno/manifest
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/java/java_uno/manifest?rev=1850884&r1=1850883&r2=1850884&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/java/java_uno/manifest (original)
+++ openoffice/trunk/main/bridges/java/java_uno/manifest Wed Jan 9 17:23:55 2019
@@ -1 +0,0 @@
-Sealed: true
Modified: openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java?rev=1850884&r1=1850883&r2=1850884&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java (original)
+++ openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java Wed Jan 9 17:23:55 2019
@@ -1,48 +0,0 @@
-/**************************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-
-
-package com.sun.star.bridges.jni_uno;
-
-import com.sun.star.lib.util.NativeLibraryLoader;
-
-//==============================================================================
-public final class JNI_info_holder
-{
- static {
- NativeLibraryLoader.loadLibrary(JNI_info_holder.class.getClassLoader(),
- "java_uno");
- }
-
- private static JNI_info_holder s_holder = new JNI_info_holder();
-
- private static long s_jni_info_handle;
-
- //__________________________________________________________________________
- private native void finalize( long jni_info_handle );
-
- //__________________________________________________________________________
- protected void finalize()
- {
- finalize( s_jni_info_handle );
- }
-}
Modified: openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_proxy.java?rev=1850884&r1=1850883&r2=1850884&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_proxy.java (original)
+++ openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_proxy.java Wed Jan 9 17:23:55 2019
@@ -1,214 +0,0 @@
-/**************************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-
-
-package com.sun.star.bridges.jni_uno;
-
-import com.sun.star.lib.util.AsynchronousFinalizer;
-import com.sun.star.lib.util.NativeLibraryLoader;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.IEnvironment;
-import com.sun.star.uno.IQueryInterface;
-
-
-//==============================================================================
-public final class JNI_proxy implements java.lang.reflect.InvocationHandler
-{
- static {
- NativeLibraryLoader.loadLibrary(JNI_proxy.class.getClassLoader(),
- "java_uno");
- }
- protected static ClassLoader s_classloader =
- JNI_proxy.class.getClassLoader();
- protected static Class s_InvocationHandler [] =
- new Class [] { java.lang.reflect.InvocationHandler.class };
-
- protected long m_bridge_handle;
- protected IEnvironment m_java_env;
- protected long m_receiver_handle;
- protected long m_td_handle;
- protected Type m_type;
- protected String m_oid;
- protected Class m_class;
-
- //__________________________________________________________________________
- public static String get_stack_trace( Throwable throwable )
- throws Throwable
- {
- boolean current_trace = false;
- if (null == throwable)
- {
- throwable = new Throwable();
- current_trace = true;
- }
- java.io.StringWriter string_writer =
- new java.io.StringWriter();
- java.io.PrintWriter print_writer =
- new java.io.PrintWriter( string_writer, true );
- throwable.printStackTrace( print_writer );
- print_writer.flush();
- print_writer.close();
- string_writer.flush();
- String trace = string_writer.toString();
- if (current_trace)
- {
- // cut out first two lines
- int n = trace.indexOf( '\n' );
- n = trace.indexOf( '\n', n +1 );
- trace = trace.substring( n +1 );
- }
- return "\njava stack trace:\n" + trace;
- }
-
- //__________________________________________________________________________
- private native void finalize( long bridge_handle );
-
- //__________________________________________________________________________
- public void finalize()
- {
- AsynchronousFinalizer.add(new AsynchronousFinalizer.Job() {
- public void run() throws Throwable {
- JNI_proxy.this.finalize( m_bridge_handle );
- }
- });
- }
-
- //__________________________________________________________________________
- private JNI_proxy(
- long bridge_handle, IEnvironment java_env,
- long receiver_handle, long td_handle, Type type, String oid )
- {
- m_bridge_handle = bridge_handle;
- m_java_env = java_env;
- m_receiver_handle = receiver_handle;
- m_td_handle = td_handle;
- m_type = type;
- m_oid = oid;
- m_class = m_type.getZClass();
- }
-
- //__________________________________________________________________________
- public static Object create(
- long bridge_handle, IEnvironment java_env,
- long receiver_handle, long td_handle, Type type, String oid,
- java.lang.reflect.Constructor proxy_ctor )
- throws Throwable
- {
- JNI_proxy handler = new JNI_proxy(
- bridge_handle, java_env, receiver_handle, td_handle, type, oid );
- Object proxy = proxy_ctor.newInstance( new Object [] { handler } );
- return java_env.registerInterface( proxy, new String [] { oid }, type );
- }
-
- //__________________________________________________________________________
- public static java.lang.reflect.Constructor get_proxy_ctor( Class clazz )
- throws Throwable
- {
- Class proxy_class = java.lang.reflect.Proxy.getProxyClass(
- s_classloader,
- new Class [] { clazz, IQueryInterface.class,
- com.sun.star.lib.uno.Proxy.class } );
- return proxy_class.getConstructor( s_InvocationHandler );
- }
-
- //__________________________________________________________________________
- private native Object dispatch_call(
- long bridge_handle, String decl_class, String method, Object args [] )
- throws Throwable;
-
- // InvocationHandler impl
- //__________________________________________________________________________
- public Object invoke(
- Object proxy, java.lang.reflect.Method method, Object args [] )
- throws Throwable
- {
- Class decl_class = method.getDeclaringClass();
- String method_name = method.getName();
-
- if (Object.class.equals( decl_class ))
- {
- if (method_name.equals( "hashCode" ))
- {
- // int hashCode()
- return Integer.valueOf( m_oid.hashCode() );
- }
- else if (method_name.equals( "equals" ))
- {
- // boolean equals( Object obj )
- return isSame(args[0]);
- }
- else if (method_name.equals( "toString" ))
- {
- // String toString()
- return this.toString() + " [oid=" + m_oid +
- ", type=" + m_type.getTypeName() + "]";
- }
- }
- // UNO interface call
- else if (decl_class.isAssignableFrom( m_class ))
- {
- // dispatch interface call
- return dispatch_call(
- m_bridge_handle, decl_class.getName(), method_name, args );
- }
- // IQueryInterface impl
- else if (IQueryInterface.class.equals( decl_class ))
- {
- if (method_name.equals( "queryInterface" ))
- {
- // Object queryInterface( Type type )
- Object registered_proxy =
- m_java_env.getRegisteredInterface( m_oid, (Type)args[ 0 ] );
- if (null == registered_proxy)
- {
- return dispatch_call(
- m_bridge_handle,
- "com.sun.star.uno.XInterface", method_name, args );
- }
- else
- {
- return registered_proxy;
- }
- }
- else if (method_name.equals( "isSame" ))
- {
- // boolean isSame( Object object )
- return isSame(args[0]);
- }
- else if (method_name.equals( "getOid" ))
- {
- // String getOid()
- return m_oid;
- }
- }
-
- throw new com.sun.star.uno.RuntimeException(
- "[jni_uno bridge error] unexpected call on proxy " +
- proxy.toString() + ": " + method.toString() );
- }
-
- private Boolean isSame(Object obj) {
- return obj != null
- && m_oid.equals(UnoRuntime.generateOid(obj));
- }
-}
Modified: openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/makefile.mk?rev=1850884&r1=1850883&r2=1850884&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/makefile.mk (original)
+++ openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/makefile.mk Wed Jan 9 17:23:55 2019
@@ -1,49 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-PRJ=..$/..$/..$/..$/..$/..$/..$/..
-
-PRJNAME=bridges
-TARGET=java_uno
-PACKAGE=com$/sun$/star$/bridges$/jni_uno
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-JARFILES=jurt.jar ridl.jar
-JAVAFILES=$(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))
-
-JAVACLASSFILES= \
- $(CLASSDIR)$/$(PACKAGE)$/JNI_proxy.class \
- $(CLASSDIR)$/$(PACKAGE)$/JNI_info_holder.class
-
-JARCLASSDIRS=$(PACKAGE)
-JARTARGET=$(TARGET).jar
-JARCOMPRESS=TRUE
-JARCLASSPATH = $(JARFILES) ../../lib/ ../bin/
-CUSTOMMANIFESTFILE = manifest
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
Modified: openoffice/trunk/main/bridges/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/prj/build.lst?rev=1850884&r1=1850883&r2=1850884&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/prj/build.lst (original)
+++ openoffice/trunk/main/bridges/prj/build.lst Wed Jan 9 17:23:55 2019
@@ -1,2 +1,36 @@
br bridges : cppuhelper jurt jvmaccess salhelper NULL
-br bridges\prj nmake - all br_prj NULL
+br bridges usr1 - all br_mkout NULL
+br bridges\inc nmake - all br_inc NULL
+br bridges\unotypes nmake - all br_unotypes NULL
+br bridges\source\cpp_uno\mingw_intel nmake - w br_gcc3i br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\msvc_win32_intel nmake - w br_msci br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_linux_intel nmake - u br_gcc3li br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_os2_intel nmake - p br_gcc3os br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u br_gcc3fi br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_linux_x86-64 nmake - u br_gcc3lx br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_freebsd_x86-64 nmake - u br_gcc3fx br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_freebsd_powerpc nmake - u br_gcc3fp br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_freebsd_powerpc64 nmake - u br_gcc3fp_64 br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_linux_powerpc nmake - u br_gcc3lp br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_linux_powerpc64 nmake - u br_gcc3lp_64 br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_linux_mips nmake - u br_gcc3lmips br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_linux_m68k nmake - u br_gcc3lm68k br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_linux_s390 nmake - u br_gcc3l3 br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_linux_s390x nmake - u br_gcc3l3_64 br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_linux_sparc nmake - u br_gcc3ls br_unotypes br_cppuno_shared br_inc NULL
+br bridges\source\cpp_uno\gcc3_linux_arm nmake - u br_gcc3lr br_unotypes NULL
+br bridges\source\cpp_uno\gcc3_linux_ia64 nmake - u br_gcc3la br_unotypes NULL
+br bridges\source\cpp_uno\gcc3_linux_hppa nmake - u br_gcc3lh br_unotypes NULL
+br bridges\source\cpp_uno\gcc3_linux_alpha nmake - u br_gcc3ll br_unotypes NULL
+br bridges\source\cpp_uno\gcc3_macosx_intel nmake - u br_gcc3macoxi br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_macosx_powerpc nmake - u br_gcc3macoxp br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\s5abi_macosx_x86-64 nmake - u br_cxxmacoxx br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes br_cppuno_shared br_inc NULL
+br bridges\source\cpp_uno\cc5_solaris_sparc64 nmake - u br_cc5sols64 br_unotypes br_cppuno_shared br_inc NULL
+br bridges\source\cpp_uno\cc50_solaris_intel nmake - u br_cc50soli br_unotypes br_cppuno_shared br_inc NULL
+br bridges\source\cpp_uno\gcc3_solaris_sparc nmake - u br_gcc3sogs br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_solaris_intel nmake - u br_gcc3sogi br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_netbsd_intel nmake - u br_gccni br_unotypes br_inc NULL
+br bridges\source\cpp_uno\shared nmake - all br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\jni_uno nmake - all br_jni_uno br_unotypes br_inc NULL
+br bridges\source\jni_uno\java\com\sun\star\bridges\jni_uno nmake - all br_jni_uno_java br_unotypes br_inc NULL
Modified: openoffice/trunk/main/bridges/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/prj/d.lst?rev=1850884&r1=1850883&r2=1850884&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/prj/d.lst (original)
+++ openoffice/trunk/main/bridges/prj/d.lst Wed Jan 9 17:23:55 2019
@@ -0,0 +1,11 @@
+..\%__SRC%\lib\libjava_uno* %_DEST%\lib%_EXT%\libjava_uno*
+..\%__SRC%\bin\java_uno* %_DEST%\bin%_EXT%\java_uno*
+..\%__SRC%\class\java_uno*.jar %_DEST%\bin%_EXT%\java_uno*.jar
+
+..\%__SRC%\bin\msci_uno.* %_DEST%\bin%_EXT%\msci_uno.*
+..\%__SRC%\bin\gcc3_uno.dll %_DEST%\bin%_EXT%\gcc3_uno.dll
+..\%__SRC%\lib\libgcc2_uno.* %_DEST%\lib%_EXT%\libgcc2_uno.*
+..\%__SRC%\lib\libgcc3_uno.* %_DEST%\lib%_EXT%\libgcc3_uno.*
+..\%__SRC%\lib\libs5abi_uno.* %_DEST%\lib%_EXT%\libs5abi_uno.*
+..\%__SRC%\bin\gcc3_uno.* %_DEST%\bin%_EXT%\gcc3_uno.*
+..\%__SRC%\lib\libsunpro5_uno.* %_DEST%\lib%_EXT%\libsunpro5_uno.*
Modified: openoffice/trunk/main/bridges/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/prj/makefile.mk?rev=1850884&r1=1850883&r2=1850884&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/prj/makefile.mk (original)
+++ openoffice/trunk/main/bridges/prj/makefile.mk Wed Jan 9 17:23:55 2019
@@ -1,44 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ=..
-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/bridges/source/bridge_exports.map
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/bridge_exports.map?rev=1850884&r1=1850883&r2=1850884&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/source/bridge_exports.map (original)
+++ openoffice/trunk/main/bridges/source/bridge_exports.map Wed Jan 9 17:23:55 2019
@@ -23,24 +23,6 @@ UDK_3_0_0 {
component_canUnload;
uno_initEnvironment;
uno_ext_getMapping;
-
-
- ###############################################
- # C++ RTTI for exception handling:
- ###############################################
-
- # typeinfo for com::sun::star::uno::RuntimeException
- _ZTIN3com3sun4star3uno16RuntimeExceptionE;
-
- # typeinfo for com::sun::star::uno::Exception
- _ZTIN3com3sun4star3uno9ExceptionE;
-
- # typeinfo name for com::sun::star::uno::RuntimeException
- _ZTSN3com3sun4star3uno16RuntimeExceptionE;
-
- # typeinfo name for com::sun::star::uno::Exception
- _ZTSN3com3sun4star3uno9ExceptionE;
-
local:
*;
};
Modified: openoffice/trunk/main/bridges/source/cpp_uno/shared/component.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/cpp_uno/shared/component.cxx?rev=1850884&r1=1850883&r2=1850884&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/source/cpp_uno/shared/component.cxx (original)
+++ openoffice/trunk/main/bridges/source/cpp_uno/shared/component.cxx Wed Jan 9 17:23:55 2019
@@ -192,12 +192,12 @@ static void SAL_CALL environmentDisposin
&bridges::cpp_uno::shared::g_moduleCount.modCnt );
}
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload(TimeValue * pTime) SAL_THROW_EXTERN_C() {
+sal_Bool SAL_CALL component_canUnload(TimeValue * pTime) SAL_THROW_EXTERN_C() {
return bridges::cpp_uno::shared::g_moduleCount.canUnload(
&bridges::cpp_uno::shared::g_moduleCount, pTime);
}
-SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment(uno_Environment * pCppEnv)
+void SAL_CALL uno_initEnvironment(uno_Environment * pCppEnv)
SAL_THROW_EXTERN_C()
{
OSL_ENSURE( pCppEnv->pExtEnv, "### expected extended environment!" );
@@ -215,7 +215,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_i
pCppEnv->environmentDisposing = environmentDisposing;
}
-SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping(
+void SAL_CALL uno_ext_getMapping(
uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo)
SAL_THROW_EXTERN_C()
{
Modified: openoffice/trunk/main/bridges/source/jni_uno/jni_bridge.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/jni_uno/jni_bridge.cxx?rev=1850884&r1=1850883&r2=1850884&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/source/jni_uno/jni_bridge.cxx (original)
+++ openoffice/trunk/main/bridges/source/jni_uno/jni_bridge.cxx Wed Jan 9 17:23:55 2019
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges_java_uno.hxx"
+#include "precompiled_bridges.hxx"
#include "jni_bridge.h"
@@ -452,7 +452,7 @@ void SAL_CALL java_env_disposing( uno_En
}
//------------------------------------------------------------------------------
-JNIEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * java_env )
+void SAL_CALL uno_initEnvironment( uno_Environment * java_env )
SAL_THROW_EXTERN_C()
{
java_env->environmentDisposing = java_env_disposing;
@@ -466,7 +466,7 @@ JNIEXPORT void SAL_CALL uno_initEnvironm
}
//------------------------------------------------------------------------------
-JNIEXPORT void SAL_CALL uno_ext_getMapping(
+void SAL_CALL uno_ext_getMapping(
uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
SAL_THROW_EXTERN_C()
{
@@ -557,7 +557,7 @@ JNIEXPORT void SAL_CALL uno_ext_getMappi
}
//------------------------------------------------------------------------------
-JNIEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
+sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
SAL_THROW_EXTERN_C()
{
return (*g_moduleCount.canUnload)( &g_moduleCount, pTime );
Modified: openoffice/trunk/main/bridges/source/jni_uno/jni_data.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/jni_uno/jni_data.cxx?rev=1850884&r1=1850883&r2=1850884&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/source/jni_uno/jni_data.cxx (original)
+++ openoffice/trunk/main/bridges/source/jni_uno/jni_data.cxx Wed Jan 9 17:23:55 2019
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges_java_uno.hxx"
+#include "precompiled_bridges.hxx"
#include "jni_bridge.h"
Modified: openoffice/trunk/main/bridges/source/jni_uno/jni_info.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/jni_uno/jni_info.cxx?rev=1850884&r1=1850883&r2=1850884&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/source/jni_uno/jni_info.cxx (original)
+++ openoffice/trunk/main/bridges/source/jni_uno/jni_info.cxx Wed Jan 9 17:23:55 2019
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges_java_uno.hxx"
+#include "precompiled_bridges.hxx"
#include "jni_bridge.h"
#include "com/sun/star/uno/RuntimeException.hpp"
Modified: openoffice/trunk/main/bridges/source/jni_uno/jni_java2uno.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/jni_uno/jni_java2uno.cxx?rev=1850884&r1=1850883&r2=1850884&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/source/jni_uno/jni_java2uno.cxx (original)
+++ openoffice/trunk/main/bridges/source/jni_uno/jni_java2uno.cxx Wed Jan 9 17:23:55 2019
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges_java_uno.hxx"
+#include "precompiled_bridges.hxx"
#include <sal/alloca.h>
Modified: openoffice/trunk/main/bridges/source/jni_uno/jni_uno2java.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/jni_uno/jni_uno2java.cxx?rev=1850884&r1=1850883&r2=1850884&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/source/jni_uno/jni_uno2java.cxx (original)
+++ openoffice/trunk/main/bridges/source/jni_uno/jni_uno2java.cxx Wed Jan 9 17:23:55 2019
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges_java_uno.hxx"
+#include "precompiled_bridges.hxx"
#include <sal/alloca.h>
Modified: openoffice/trunk/main/bridges/source/jni_uno/nativethreadpool.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/jni_uno/nativethreadpool.cxx?rev=1850884&r1=1850883&r2=1850884&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/source/jni_uno/nativethreadpool.cxx (original)
+++ openoffice/trunk/main/bridges/source/jni_uno/nativethreadpool.cxx Wed Jan 9 17:23:55 2019
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges_java_uno.hxx"
+#include "precompiled_bridges.hxx"
#include "jvmaccess/virtualmachine.hxx"
#include "rtl/byteseq.h"