merge feature/gbuild_java

24 files changed, 462 insertions, 384 deletions

diff --git a/ridljar/Jar_ridl.mk b/ridljar/Jar_ridl.mk
new file mode 100644
index 000000000000..b4c60e344291
--- /dev/null
+++ b/ridljar/Jar_ridl.mk
@@ -0,0 +1,73 @@
+# -*- 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,ridl))
+
+$(eval $(call gb_Jar_add_package_dependencies,ridl,\
+    ridljar_javamaker \
+))
+
+$(eval $(call gb_Jar_add_jars,ridl,\
+    $(WORKDIR)/CustomTarget/ridljar/javamaker/class \
+))
+
+$(eval $(call gb_Jar_set_packageroot,ridl,com))
+
+$(eval $(call gb_Jar_add_packagedirs,ridl,\
+    $(WORKDIR)/CustomTarget/ridljar/javamaker/class/com \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,ridl,\
+    ridljar/com/sun/star/lib/uno/typedesc/FieldDescription \
+    ridljar/com/sun/star/lib/uno/typedesc/MemberDescriptionHelper \
+    ridljar/com/sun/star/lib/uno/typedesc/MethodDescription \
+    ridljar/com/sun/star/lib/uno/typedesc/TypeDescription \
+    ridljar/com/sun/star/lib/uno/typeinfo/AttributeTypeInfo \
+    ridljar/com/sun/star/lib/uno/typeinfo/ConstantTypeInfo \
+    ridljar/com/sun/star/lib/uno/typeinfo/MemberTypeInfo \
+    ridljar/com/sun/star/lib/uno/typeinfo/MethodTypeInfo \
+    ridljar/com/sun/star/lib/uno/typeinfo/ParameterTypeInfo \
+    ridljar/com/sun/star/lib/uno/typeinfo/TypeInfo \
+    ridljar/com/sun/star/lib/util/DisposeListener \
+    ridljar/com/sun/star/lib/util/DisposeNotifier \
+    ridljar/com/sun/star/lib/util/WeakMap \
+    ridljar/com/sun/star/uno/Any \
+    ridljar/com/sun/star/uno/Enum \
+    ridljar/com/sun/star/uno/IBridge \
+    ridljar/com/sun/star/uno/IEnvironment \
+    ridljar/com/sun/star/uno/IFieldDescription \
+    ridljar/com/sun/star/uno/IMapping \
+    ridljar/com/sun/star/uno/IMemberDescription \
+    ridljar/com/sun/star/uno/IMethodDescription \
+    ridljar/com/sun/star/uno/IQueryInterface \
+    ridljar/com/sun/star/uno/ITypeDescription \
+    ridljar/com/sun/star/uno/Type \
+    ridljar/com/sun/star/uno/Union \
+    ridljar/com/sun/star/uno/UnoRuntime \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ridljar/Jar_unoloader.mk b/ridljar/Jar_unoloader.mk
new file mode 100644
index 000000000000..4654892e0f8f
--- /dev/null
+++ b/ridljar/Jar_unoloader.mk
@@ -0,0 +1,39 @@
+# -*- 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,unoloader))
+
+$(eval $(call gb_Jar_set_packageroot,unoloader,com))
+
+$(eval $(call gb_Jar_set_manifest,unoloader,$(SRCDIR)/ridljar/source/unoloader/com/sun/star/lib/unoloader/manifest))
+
+$(eval $(call gb_Jar_add_sourcefiles,unoloader,\
+    ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader \
+    ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoLoader \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ridljar/JunitTest_typedesc.mk b/ridljar/JunitTest_typedesc.mk
new file mode 100644
index 000000000000..2242e9daf065
--- /dev/null
+++ b/ridljar/JunitTest_typedesc.mk
@@ -0,0 +1,39 @@
+# -*- 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_JunitTest_JunitTest,ridljar_typedesc))
+
+$(eval $(call gb_JunitTest_add_jars,ridljar_typedesc,\
+    $(OUTDIR)/bin/OOoRunnerLight.jar \
+    $(OUTDIR)/bin/ridl.jar \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,ridljar_typedesc,\
+    ridljar/test/com/sun/star/lib/uno/typedesc/TypeDescription_Test \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ridljar/JunitTest_uno.mk b/ridljar/JunitTest_uno.mk
new file mode 100644
index 000000000000..62ca80c19779
--- /dev/null
+++ b/ridljar/JunitTest_uno.mk
@@ -0,0 +1,41 @@
+# -*- 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_JunitTest_JunitTest,ridljar_uno))
+
+$(eval $(call gb_JunitTest_add_jars,ridljar_uno,\
+    $(OUTDIR)/bin/OOoRunnerLight.jar \
+    $(OUTDIR)/bin/ridl.jar \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,ridljar_uno,\
+    ridljar/test/com/sun/star/uno/Any_Test \
+    ridljar/test/com/sun/star/uno/Type_Test \
+    ridljar/test/com/sun/star/uno/UnoRuntime_Test \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ridljar/JunitTest_util.mk b/ridljar/JunitTest_util.mk
new file mode 100644
index 000000000000..976554e1f597
--- /dev/null
+++ b/ridljar/JunitTest_util.mk
@@ -0,0 +1,39 @@
+# -*- 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_JunitTest_JunitTest,ridljar_util))
+
+$(eval $(call gb_JunitTest_add_jars,ridljar_util,\
+    $(OUTDIR)/bin/OOoRunnerLight.jar \
+    $(OUTDIR)/bin/ridl.jar \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,ridljar_util,\
+    ridljar/test/com/sun/star/lib/util/WeakMap_Test \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ridljar/javamaker/makefile.mk b/ridljar/Makefile
index cf4e70d38c87..7bbbe6c703e6 100644
--- a/ridljar/javamaker/makefile.mk
+++ b/ridljar/Makefile
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,22 +26,15 @@
 #
 #*************************************************************************
 
-PRJ := ..
-PRJNAME := ridljar
-TARGET := javamaker
+gb_PARTIALBUILD := T
+ifeq ($(strip $(SOLARENV)),)
+include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
+else
 
-.INCLUDE: settings.mk
+gb_SourceEnvAndRecurse_STAGE=gbuild
+include $(SOLARENV)/gbuild/gbuild.mk
 
-RDB = $(SOLARBINDIR)$/udkapi.rdb
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
-.INCLUDE: target.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-
-ALLTAR: $(MISC)$/javamaker.done
-
-$(MISC)$/javamaker.done .ERRREMOVE: $(RDB)
-    $(JAVAMAKER) -BUCR -O$(CLASSDIR) $<
-    $(TOUCH) $@
-
-.ENDIF
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/ridljar/Module_ridljar.mk b/ridljar/Module_ridljar.mk
new file mode 100644
index 000000000000..dde756f983b7
--- /dev/null
+++ b/ridljar/Module_ridljar.mk
@@ -0,0 +1,48 @@
+# -*- 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,ridljar))
+
+ifneq ($(SOLAR_JAVA),)
+$(eval $(call gb_Module_add_targets,ridljar,\
+    Jar_ridl \
+    Jar_unoloader \
+    Package_javamaker \
+    Zip_ridl \
+    Zip_unoloader \
+))
+
+# unfortunately, these tests depend on qadevOOo, which depends on
+# ridl.jar for build...
+$(eval $(call gb_Module_add_subsequentcheck_targets,ridljar,\
+    JunitTest_typedesc \
+    JunitTest_uno \
+    JunitTest_util \
+))
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ridljar/Package_javamaker.mk b/ridljar/Package_javamaker.mk
new file mode 100644
index 000000000000..2d73aeaf4d7b
--- /dev/null
+++ b/ridljar/Package_javamaker.mk
@@ -0,0 +1,37 @@
+# -*- 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_Package_Package,ridljar_javamaker,$(WORKDIR)/CustomTarget/ridljar/javamaker))
+
+$(eval $(call gb_Package_add_customtarget,ridljar_javamaker,ridljar/javamaker))
+
+$(eval $(call gb_CustomTarget_add_outdir_dependencies,ridljar/javamaker,\
+    $(OUTDIR_FOR_BUILD)/bin/javamaker$(gb_Executable_EXT_for_build) \
+    $(OUTDIR)/bin/udkapi.rdb \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ridljar/Zip_ridl.mk b/ridljar/Zip_ridl.mk
new file mode 100644
index 000000000000..1b6c7c2cac16
--- /dev/null
+++ b/ridljar/Zip_ridl.mk
@@ -0,0 +1,59 @@
+# -*- 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,ridl_src,$(SRCDIR)/ridljar))
+
+$(eval $(call gb_Zip_add_files,ridl_src,\
+    com/sun/star/lib/uno/typedesc/FieldDescription.java \
+    com/sun/star/lib/uno/typedesc/MemberDescriptionHelper.java \
+    com/sun/star/lib/uno/typedesc/MethodDescription.java \
+    com/sun/star/lib/uno/typedesc/TypeDescription.java \
+    com/sun/star/lib/uno/typeinfo/AttributeTypeInfo.java \
+    com/sun/star/lib/uno/typeinfo/ConstantTypeInfo.java \
+    com/sun/star/lib/uno/typeinfo/MemberTypeInfo.java \
+    com/sun/star/lib/uno/typeinfo/MethodTypeInfo.java \
+    com/sun/star/lib/uno/typeinfo/ParameterTypeInfo.java \
+    com/sun/star/lib/uno/typeinfo/TypeInfo.java \
+    com/sun/star/lib/util/DisposeListener.java \
+    com/sun/star/lib/util/DisposeNotifier.java \
+    com/sun/star/lib/util/WeakMap.java \
+    com/sun/star/uno/Any.java \
+    com/sun/star/uno/Enum.java \
+    com/sun/star/uno/IBridge.java \
+    com/sun/star/uno/IEnvironment.java \
+    com/sun/star/uno/IFieldDescription.java \
+    com/sun/star/uno/IMapping.java \
+    com/sun/star/uno/IMemberDescription.java \
+    com/sun/star/uno/IMethodDescription.java \
+    com/sun/star/uno/IQueryInterface.java \
+    com/sun/star/uno/ITypeDescription.java \
+    com/sun/star/uno/Type.java \
+    com/sun/star/uno/Union.java \
+    com/sun/star/uno/UnoRuntime.java \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ridljar/Zip_unoloader.mk b/ridljar/Zip_unoloader.mk
new file mode 100644
index 000000000000..0174743d5f9c
--- /dev/null
+++ b/ridljar/Zip_unoloader.mk
@@ -0,0 +1,35 @@
+# -*- 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,unoloader_src,$(SRCDIR)/ridljar/source/unoloader))
+
+$(eval $(call gb_Zip_add_files,unoloader_src,\
+    com/sun/star/lib/unoloader/UnoLoader.java \
+    com/sun/star/lib/unoloader/UnoClassLoader.java \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ridljar/com/makefile.mk b/ridljar/com/makefile.mk
deleted file mode 100644
index df816364060a..000000000000
--- a/ridljar/com/makefile.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ := ..
-PRJNAME := ridljar
-TARGET := com
-
-PACKAGE := com
-
-.INCLUDE: settings.mk
-
-JAVAFILES = \
-    sun$/star$/lib$/uno$/typedesc$/FieldDescription.java \
-    sun$/star$/lib$/uno$/typedesc$/MemberDescriptionHelper.java \
-    sun$/star$/lib$/uno$/typedesc$/MethodDescription.java \
-    sun$/star$/lib$/uno$/typedesc$/TypeDescription.java \
-    sun$/star$/lib$/uno$/typeinfo$/AttributeTypeInfo.java \
-    sun$/star$/lib$/uno$/typeinfo$/ConstantTypeInfo.java \
-    sun$/star$/lib$/uno$/typeinfo$/MemberTypeInfo.java \
-    sun$/star$/lib$/uno$/typeinfo$/MethodTypeInfo.java \
-    sun$/star$/lib$/uno$/typeinfo$/ParameterTypeInfo.java \
-    sun$/star$/lib$/uno$/typeinfo$/TypeInfo.java \
-    sun$/star$/lib$/util$/DisposeListener.java \
-    sun$/star$/lib$/util$/DisposeNotifier.java \
-    sun$/star$/lib$/util$/WeakMap.java \
-    sun$/star$/uno$/Any.java \
-    sun$/star$/uno$/Enum.java \
-    sun$/star$/uno$/IBridge.java \
-    sun$/star$/uno$/IEnvironment.java \
-    sun$/star$/uno$/IFieldDescription.java \
-    sun$/star$/uno$/IMapping.java \
-    sun$/star$/uno$/IMemberDescription.java \
-    sun$/star$/uno$/IMethodDescription.java \
-    sun$/star$/uno$/IQueryInterface.java \
-    sun$/star$/uno$/ITypeDescription.java \
-    sun$/star$/uno$/Type.java \
-    sun$/star$/uno$/Union.java \
-    sun$/star$/uno$/UnoRuntime.java
-
-.INCLUDE: target.mk
diff --git a/ridljar/javamaker/Makefile b/ridljar/javamaker/Makefile
new file mode 100644
index 000000000000..d2fe741f5f7e
--- /dev/null
+++ b/ridljar/javamaker/Makefile
@@ -0,0 +1,39 @@
+# -*- 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.
+
+gb_PARTIALBUILD := T
+include $(GBUILDDIR)/gbuild_simple.mk
+
+done : $(OUTDIR)/bin/udkapi.rdb
+	$(call gb_Helper_abbreviate_dirs_native, \
+	$(call gb_Helper_execute,javamaker -BUCR -O./class $<) && touch $@)
+
+.DEFAULT_GOAL := all
+.PHONY : all
+all : done
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/ridljar/prj/build.lst b/ridljar/prj/build.lst
index b0aca0888e6c..2a23210fc060 100644
--- a/ridljar/prj/build.lst
+++ b/ridljar/prj/build.lst
@@ -1,6 +1,3 @@
 ri ridljar : DESKTOP:codemaker solenv udkapi NULL
-ri ridljar\javamaker nmake - all javamaker NULL
-ri ridljar\com nmake - all com javamaker NULL
-ri ridljar\util nmake - all util javamaker com NULL
-ri ridljar\source\unoloader nmake - all unoloader NULL
-ri ridljar\source\unoloader\com\sun\star\lib\unoloader nmake - all unoloader_cssl_unoloader NULL
+ri ridljar\prj nmake - all ri_prj NULL
+
diff --git a/ridljar/prj/d.lst b/ridljar/prj/d.lst
index 007fd9dd4e15..e69de29bb2d1 100644
--- a/ridljar/prj/d.lst
+++ b/ridljar/prj/d.lst
@@ -1,4 +0,0 @@
-..\%__SRC%\bin\ridl_src.zip %COMMON_DEST%\bin\ridl_src.zip
-..\%__SRC%\class\ridl.jar %_DEST%\bin\ridl.jar
-..\%__SRC%\class\unoloader\unoloader.jar %_DEST%\bin\unoloader.jar
-..\%__SRC%\bin\unoloader_src.zip %COMMON_DEST%\bin\unoloader_src.zip
diff --git a/ridljar/prj/makefile.mk b/ridljar/prj/makefile.mk
new file mode 100644
index 000000000000..0997622e00f6
--- /dev/null
+++ b/ridljar/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/ridljar/source/unoloader/com/sun/star/lib/unoloader/makefile.mk b/ridljar/source/unoloader/com/sun/star/lib/unoloader/makefile.mk
deleted file mode 100644
index a9f8b1d0b9e0..000000000000
--- a/ridljar/source/unoloader/com/sun/star/lib/unoloader/makefile.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..$/..$/..$/..$/..
-PRJNAME := ridljar
-
-TARGET := unoloader_cssl_unoloader
-PACKAGE := com$/sun$/star$/lib$/unoloader
-
-.INCLUDE: settings.mk
-
-# Use a non-default CLASSDIR, so that the util/makefile.mk can use
-# JARCLASSDIRS=com and nevertheless not include this package in ridl.jar:
-CLASSDIR != $(OUT)$/class$/unoloader
-
-JAVAFILES = \
-    UnoClassLoader.java \
-    UnoLoader.java
-
-JARTARGET = unoloader.jar
-JARCLASSDIRS = $(PACKAGE)
-CUSTOMMANIFESTFILE = manifest
-
-.INCLUDE: target.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-
-.IF "$(depend)" == ""
-$(JAVACLASSFILES): $(MISC)$/$(TARGET).mkdir.done
-.ENDIF
-
-$(MISC)$/$(TARGET).mkdir.done .ERRREMOVE:
-    $(MKDIRHIER) $(CLASSDIR)
-    $(TOUCH) $@
-
-.ENDIF
diff --git a/ridljar/source/unoloader/delzip b/ridljar/source/unoloader/delzip
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/ridljar/source/unoloader/delzip
+++ /dev/null
diff --git a/ridljar/source/unoloader/makefile.mk b/ridljar/source/unoloader/makefile.mk
deleted file mode 100644
index 9cb7b0efa139..000000000000
--- a/ridljar/source/unoloader/makefile.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ := ..$/..
-PRJNAME := ridljar
-
-TARGET := unoloader
-
-.INCLUDE: settings.mk
-
-ZIP1TARGET = $(TARGET)_src
-ZIP1FLAGS = -r
-ZIP1LIST = com -x '*makefile.mk' -x '*manifest'
-
-.INCLUDE: target.mk
diff --git a/ridljar/test/com/sun/star/lib/uno/typedesc/makefile.mk b/ridljar/test/com/sun/star/lib/uno/typedesc/makefile.mk
deleted file mode 100644
index e329026542cd..000000000000
--- a/ridljar/test/com/sun/star/lib/uno/typedesc/makefile.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..$/..$/..$/..$/..
-PRJNAME := ridljar
-TARGET := test_com_sun_star_lib_uno_typedesc
-
-PACKAGE := com$/sun$/star$/lib$/uno$/typedesc
-JAVATESTFILES := TypeDescription_Test.java
-
-.INCLUDE: javaunittest.mk
diff --git a/ridljar/test/com/sun/star/lib/util/makefile.mk b/ridljar/test/com/sun/star/lib/util/makefile.mk
deleted file mode 100644
index 7da28b6e1b47..000000000000
--- a/ridljar/test/com/sun/star/lib/util/makefile.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..$/..$/..$/..
-PRJNAME := ridljar
-TARGET := test_com_sun_star_lib_util
-
-PACKAGE := com$/sun$/star$/lib$/util
-JAVATESTFILES := \
-    WeakMap_Test.java
-
-.INCLUDE: javaunittest.mk
diff --git a/ridljar/test/com/sun/star/uno/makefile.mk b/ridljar/test/com/sun/star/uno/makefile.mk
deleted file mode 100644
index 6f2fd8332378..000000000000
--- a/ridljar/test/com/sun/star/uno/makefile.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..$/..$/..
-PRJNAME := ridljar
-TARGET := test_com_sun_star_uno
-
-PACKAGE := com$/sun$/star$/uno
-JAVATESTFILES := \
-    Any_Test.java \
-    Type_Test.java \
-    UnoRuntime_Test.java
-
-.INCLUDE: javaunittest.mk
diff --git a/ridljar/test/makefile.mk b/ridljar/test/makefile.mk
deleted file mode 100644
index 86b432dc3bb4..000000000000
--- a/ridljar/test/makefile.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-# Quick and dirty way to run all tests in sub-directories; probably only works
-# on Unix.
-# Can be removed once tests are included in regular builds.
-
-all .PHONY:
-    cd com/sun/star/lib/uno/typedesc && dmake
-    cd com/sun/star/lib/util && dmake
-    cd com/sun/star/uno && dmake
diff --git a/ridljar/util/delzip b/ridljar/util/delzip
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/ridljar/util/delzip
+++ /dev/null
diff --git a/ridljar/util/makefile.mk b/ridljar/util/makefile.mk
deleted file mode 100644
index b97690422b2d..000000000000
--- a/ridljar/util/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ		= ..
-PRJNAME	= ridljar
-TARGET	= ridl
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS	= com
-JARTARGET		= $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-# Special work necessary for building java reference with javadoc.
-# The source of puplic APIs must be delivered and used later in the
-# odk module.
-ZIP1TARGET=$(TARGET)_src
-ZIP1FLAGS=-u -r
-ZIP1DIR=$(PRJ)
-ZIP1LIST=com -x "*makefile.mk"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk