From 0659148988041764ee567a0199627beb5b5f4cb4 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 23 Dec 2011 13:32:50 +0100 Subject: gbuildize ridljar --- ridljar/Jar_ridl.mk | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 ridljar/Jar_ridl.mk (limited to 'ridljar/Jar_ridl.mk') diff --git a/ridljar/Jar_ridl.mk b/ridljar/Jar_ridl.mk new file mode 100644 index 000000000000..b94229da054d --- /dev/null +++ b/ridljar/Jar_ridl.mk @@ -0,0 +1,70 @@ +# -*- 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 +# (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_jars,ridl,\ + $(WORKDIR)/CustomTarget/ridljar/javamaker/class \ +)) + +$(eval $(call gb_Jar_set_packageroot,ridl,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 \ +)) + +# gb_Jar_add_jars adds dependency on all "jars", but the .../class dir +# is created by a custom target, so there is no visible rule for it, +# which is something make does not like. We add one to satisfy it. +$(WORKDIR)/CustomTarget/ridljar/javamaker/class :| $(call gb_Package_get_target,ridljar_javamaker) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: -- cgit From 63712b8439fd954ec4247cd62224dbba49dea35f Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 24 Dec 2011 08:40:00 +0100 Subject: pack generated UNO API classes --- ridljar/Jar_ridl.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ridljar/Jar_ridl.mk') diff --git a/ridljar/Jar_ridl.mk b/ridljar/Jar_ridl.mk index b94229da054d..337c03f49056 100644 --- a/ridljar/Jar_ridl.mk +++ b/ridljar/Jar_ridl.mk @@ -33,6 +33,10 @@ $(eval $(call gb_Jar_add_jars,ridl,\ $(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 \ -- cgit From ff9a64e01d7d46a9869327fb89a4adcc674eb433 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 25 Dec 2011 10:32:01 +0100 Subject: add dependency on package --- ridljar/Jar_ridl.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'ridljar/Jar_ridl.mk') diff --git a/ridljar/Jar_ridl.mk b/ridljar/Jar_ridl.mk index 337c03f49056..b4c60e344291 100644 --- a/ridljar/Jar_ridl.mk +++ b/ridljar/Jar_ridl.mk @@ -27,6 +27,10 @@ $(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 \ )) @@ -66,9 +70,4 @@ $(eval $(call gb_Jar_add_sourcefiles,ridl,\ ridljar/com/sun/star/uno/UnoRuntime \ )) -# gb_Jar_add_jars adds dependency on all "jars", but the .../class dir -# is created by a custom target, so there is no visible rule for it, -# which is something make does not like. We add one to satisfy it. -$(WORKDIR)/CustomTarget/ridljar/javamaker/class :| $(call gb_Package_get_target,ridljar_javamaker) - # vim:set shiftwidth=4 softtabstop=4 expandtab: -- cgit