[Libreoffice-commits] core.git: Branch 'aoo/trunk' - jurt/java

Damjan Jovanovic damjan at apache.org
Sun Apr 8 16:09:30 UTC 2018


 jurt/java/jurt/src/main/java/com/sun/star/comp/bridgefactory/makefile.mk          |   39 --------
 jurt/java/jurt/src/main/java/com/sun/star/comp/connections/makefile.mk            |   39 --------
 jurt/java/jurt/src/main/java/com/sun/star/comp/loader/makefile.mk                 |   43 --------
 jurt/java/jurt/src/main/java/com/sun/star/comp/servicemanager/makefile.mk         |   39 --------
 jurt/java/jurt/src/main/java/com/sun/star/comp/urlresolver/makefile.mk            |   39 --------
 jurt/java/jurt/src/main/java/com/sun/star/lib/connections/pipe/makefile.mk        |   37 -------
 jurt/java/jurt/src/main/java/com/sun/star/lib/connections/socket/makefile.mk      |   38 -------
 jurt/java/jurt/src/main/java/com/sun/star/lib/uno/bridges/java_remote/makefile.mk |   40 --------
 jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/java/makefile.mk   |   40 --------
 jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/makefile.mk |   46 ---------
 jurt/java/jurt/src/main/java/com/sun/star/lib/uno/makefile.mk                     |   33 ------
 jurt/java/jurt/src/main/java/com/sun/star/lib/uno/protocols/urp/makefile.mk       |   40 --------
 jurt/java/jurt/src/main/java/com/sun/star/lib/util/makefile.mk                    |   38 -------
 jurt/java/jurt/src/main/java/com/sun/star/uno/makefile.mk                         |   48 ----------
 jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/makefile.mk       |   47 ---------
 15 files changed, 606 deletions(-)

New commits:
commit 263c6b0f859e1b8cc6bfcbaaeddfb17601992747
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Sun Apr 8 15:49:22 2018 +0000

    We don't need dmake makefiles in main/jurt any more.
    
    Patch by: me

diff --git a/jurt/java/jurt/src/main/java/com/sun/star/comp/bridgefactory/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/comp/bridgefactory/makefile.mk
deleted file mode 100644
index a16a581fe942..000000000000
--- a/jurt/java/jurt/src/main/java/com/sun/star/comp/bridgefactory/makefile.mk
+++ /dev/null
@@ -1,39 +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 = jurt
-PACKAGE = com$/sun$/star$/comp$/bridgefactory
-TARGET  = com_sun_star_comp_bridgefactory
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES = BridgeFactory.java
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/jurt/java/jurt/src/main/java/com/sun/star/comp/connections/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/comp/connections/makefile.mk
deleted file mode 100644
index 5b56bdb3f486..000000000000
--- a/jurt/java/jurt/src/main/java/com/sun/star/comp/connections/makefile.mk
+++ /dev/null
@@ -1,39 +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 = jurt
-TARGET = com_sun_star_comp_connections
-
-PACKAGE = com$/sun$/star$/comp$/connections
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-JAVAFILES = \
-    Acceptor.java \
-    Connector.java \
-    ConstantInstanceProvider.java \
-    Implementation.java \
-    PipedConnection.java
-
-.INCLUDE:  target.mk
diff --git a/jurt/java/jurt/src/main/java/com/sun/star/comp/loader/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/comp/loader/makefile.mk
deleted file mode 100644
index cec99e2b5f09..000000000000
--- a/jurt/java/jurt/src/main/java/com/sun/star/comp/loader/makefile.mk
+++ /dev/null
@@ -1,43 +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 = jurt
-PACKAGE = com$/sun$/star$/comp$/loader
-TARGET  = com_sun_star_comp_loader
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES = \
-    FactoryHelper.java \
-    JavaLoader.java \
-    JavaLoaderFactory.java \
-    RegistrationClassFinder.java
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/jurt/java/jurt/src/main/java/com/sun/star/comp/servicemanager/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/comp/servicemanager/makefile.mk
deleted file mode 100644
index 2d4bafed0120..000000000000
--- a/jurt/java/jurt/src/main/java/com/sun/star/comp/servicemanager/makefile.mk
+++ /dev/null
@@ -1,39 +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 = jurt
-PACKAGE = com$/sun$/star$/comp$/servicemanager
-TARGET  = com_sun_star_comp_servicemanager
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES = ServiceManager.java
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/jurt/java/jurt/src/main/java/com/sun/star/comp/urlresolver/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/comp/urlresolver/makefile.mk
deleted file mode 100644
index bbb91aa09d77..000000000000
--- a/jurt/java/jurt/src/main/java/com/sun/star/comp/urlresolver/makefile.mk
+++ /dev/null
@@ -1,39 +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 = jurt
-PACKAGE = com$/sun$/star$/comp$/urlresolver
-TARGET  = com_sun_star_comp_urlresolver
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# Files --------------------------------------------------------
-
-JAVAFILES = UrlResolver.java
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/jurt/java/jurt/src/main/java/com/sun/star/lib/connections/pipe/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/lib/connections/pipe/makefile.mk
deleted file mode 100644
index 4d3ec91e9524..000000000000
--- a/jurt/java/jurt/src/main/java/com/sun/star/lib/connections/pipe/makefile.mk
+++ /dev/null
@@ -1,37 +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 = jurt
-TARGET = com_sun_star_connections_pipe
-
-PACKAGE = com$/sun$/star$/lib$/connections$/pipe
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-JAVAFILES = \
-    PipeConnection.java \
-    pipeAcceptor.java \
-    pipeConnector.java
-
-.INCLUDE:  target.mk
diff --git a/jurt/java/jurt/src/main/java/com/sun/star/lib/connections/socket/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/lib/connections/socket/makefile.mk
deleted file mode 100644
index 7df24d8b56c9..000000000000
--- a/jurt/java/jurt/src/main/java/com/sun/star/lib/connections/socket/makefile.mk
+++ /dev/null
@@ -1,38 +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 = jurt
-TARGET = com_sun_star_connections_socket
-
-PACKAGE = com$/sun$/star$/lib$/connections$/socket
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-JAVAFILES = \
-    ConnectionDescriptor.java \
-    SocketConnection.java \
-    socketAcceptor.java \
-    socketConnector.java
-
-.INCLUDE:  target.mk
diff --git a/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/bridges/java_remote/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/bridges/java_remote/makefile.mk
deleted file mode 100644
index 6b1ed1a3dea3..000000000000
--- a/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/bridges/java_remote/makefile.mk
+++ /dev/null
@@ -1,40 +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 := jurt
-
-TARGET := com_sun_star_lib_uno_bridges_java_remote
-PACKAGE = com$/sun$/star$/lib$/uno$/bridges$/java_remote
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-JAVAFILES = \
-    BridgedObject.java \
-    ProxyFactory.java \
-    RequestHandler.java \
-    XConnectionInputStream_Adapter.java \
-    XConnectionOutputStream_Adapter.java \
-    java_remote_bridge.java
-
-.INCLUDE: target.mk
diff --git a/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/java/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/java/makefile.mk
deleted file mode 100644
index b2b6f0a9b70f..000000000000
--- a/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/java/makefile.mk
+++ /dev/null
@@ -1,40 +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 = jurt
-PACKAGE = com$/sun$/star$/lib$/uno$/environments$/java
-TARGET  = com_sun_star_lib_uno_environments_java
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES = java_environment.java
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/makefile.mk
deleted file mode 100644
index f586ddef4e0a..000000000000
--- a/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/makefile.mk
+++ /dev/null
@@ -1,46 +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 := jurt
-
-TARGET := com_sun_star_lib_uno_environments_remote
-PACKAGE := com$/sun$/star$/lib$/uno$/environments$/remote
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-JAVAFILES = \
-    IProtocol.java \
-    IReceiver.java \
-    IThreadPool.java \
-    JavaThreadPool.java \
-    JavaThreadPoolFactory.java \
-    Job.java \
-    JobQueue.java \
-    Message.java \
-    NativeThreadPool.java \
-    ThreadId.java \
-    ThreadPoolManager.java \
-    remote_environment.java
-
-.INCLUDE: target.mk
diff --git a/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/makefile.mk
deleted file mode 100644
index 3b5bb92df9ea..000000000000
--- a/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/makefile.mk
+++ /dev/null
@@ -1,33 +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 = jurt
-TARGET = com_sun_star_lib_uno
-PACKAGE = com$/sun$/star$/lib$/uno
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-JAVAFILES = Proxy.java
-
-.INCLUDE: target.mk
diff --git a/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/protocols/urp/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/protocols/urp/makefile.mk
deleted file mode 100644
index 9162a1f7485f..000000000000
--- a/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/protocols/urp/makefile.mk
+++ /dev/null
@@ -1,40 +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 := jurt
-
-TARGET := com_sun_star_lib_uno_protocols_urp
-PACKAGE := com$/sun$/star$/lib$/uno$/protocols$/urp
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-JAVAFILES = \
-    Cache.java \
-    Marshal.java \
-    PendingRequests.java \
-    Unmarshal.java \
-    UrpMessage.java \
-    urp.java
-
-.INCLUDE: target.mk
diff --git a/jurt/java/jurt/src/main/java/com/sun/star/lib/util/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/lib/util/makefile.mk
deleted file mode 100644
index 6c4ab6850aa6..000000000000
--- a/jurt/java/jurt/src/main/java/com/sun/star/lib/util/makefile.mk
+++ /dev/null
@@ -1,38 +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 := jurt
-
-TARGET := com_sun_star_lib_util
-PACKAGE := com$/sun$/star$/lib$/util
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-JAVAFILES = \
-    AsynchronousFinalizer.java \
-    NativeLibraryLoader.java \
-    StringHelper.java \
-    UrlToFileMapper.java
-
-.INCLUDE: target.mk
diff --git a/jurt/java/jurt/src/main/java/com/sun/star/uno/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/uno/makefile.mk
deleted file mode 100644
index 38387b28ecc2..000000000000
--- a/jurt/java/jurt/src/main/java/com/sun/star/uno/makefile.mk
+++ /dev/null
@@ -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.
-#  
-#**************************************************************
-
-
-
-PRJ		= ..$/..$/..$/..
-PRJNAME = jurt
-PACKAGE = com$/sun$/star$/uno
-TARGET  = com_sun_star_uno
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES = \
-    AnyConverter.java \
-    Ascii.java \
-    AsciiString.java \
-    MappingException.java \
-    WeakReference.java
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-doc:
-    pwd
-    cd $(PRJ) && javadoc -sourcepath /usr/local/java/src:unxlngi3.pro/japi:.:../jlibs  com.sun.star.lib.util com.sun.star.uno com.sun.star.lib.uno.typeinfo com.sun.star.lib.uno.environments.java com.sun.star.lib.uno.environments.remote com.sun.star.lib.uno.protocols.iiop com.sun.star.lib.uno.bridges.java_remote com.sun.star.comp.loader com.sun.star.comp.connections -d unxlngi3.pro/doc 
diff --git a/jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/makefile.mk b/jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/makefile.mk
deleted file mode 100644
index 53d4f7d2680b..000000000000
--- a/jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/makefile.mk
+++ /dev/null
@@ -1,47 +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.
-#  
-#**************************************************************
-
-
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ := ..$/..$/..$/..$/..$/..$/..$/..
-PRJNAME := jurt
-TARGET := test_com_sun_star_lib_uno_protocols_urp
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE := com$/sun$/star$/lib$/uno$/protocols$/urp
-JAVATESTFILES := \
-    Cache_Test.java \
-    Marshaling_Test.java \
-    Protocol_Test.java
-JAVAFILES := \
-    TestBridge.java \
-    TestObject.java
-JARFILES := ridl.jar
-IDLTESTFILES := interfaces.idl
-.END
-
-.INCLUDE: javaunittest.mk
-
-.END


More information about the Libreoffice-commits mailing list