From 80c8e6fb03fb455fdebab4492ce04ff9cf695c38 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 24 Dec 2011 13:37:11 +0100 Subject: gbuildize javaunohelper --- javaunohelper/Jar_juh.mk | 69 +++++++++++++++++++++++++++++++++++ javaunohelper/Library_juh.mk | 52 ++++++++++++++++++++++++++ javaunohelper/Library_juhx.mk | 54 +++++++++++++++++++++++++++ javaunohelper/Makefile | 40 ++++++++++++++++++++ javaunohelper/Module_javaunohelper.mk | 40 ++++++++++++++++++++ javaunohelper/Package_cppumaker.mk | 37 +++++++++++++++++++ javaunohelper/Zip_juh.mk | 57 +++++++++++++++++++++++++++++ javaunohelper/cppumaker/Makefile | 60 ++++++++++++++++++++++++++++++ javaunohelper/inc/makefile.mk | 39 -------------------- javaunohelper/prj/build.lst | 9 +---- javaunohelper/prj/d.lst | 7 ---- javaunohelper/prj/makefile.mk | 1 + 12 files changed, 411 insertions(+), 54 deletions(-) create mode 100644 javaunohelper/Jar_juh.mk create mode 100644 javaunohelper/Library_juh.mk create mode 100644 javaunohelper/Library_juhx.mk create mode 100644 javaunohelper/Makefile create mode 100644 javaunohelper/Module_javaunohelper.mk create mode 100644 javaunohelper/Package_cppumaker.mk create mode 100644 javaunohelper/Zip_juh.mk create mode 100644 javaunohelper/cppumaker/Makefile delete mode 100644 javaunohelper/inc/makefile.mk create mode 100644 javaunohelper/prj/makefile.mk (limited to 'javaunohelper') diff --git a/javaunohelper/Jar_juh.mk b/javaunohelper/Jar_juh.mk new file mode 100644 index 000000000000..142805d4bb21 --- /dev/null +++ b/javaunohelper/Jar_juh.mk @@ -0,0 +1,69 @@ +# -*- 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,juh)) + +$(eval $(call gb_Jar_add_jars,juh,\ + $(OUTDIR)/bin/jurt.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/unoil.jar \ +)) + +$(eval $(call gb_Jar_set_packageroot,juh,com)) + +$(eval $(call gb_Jar_set_manifest,juh,$(SRCDIR)/javaunohelper/util/manifest)) + +$(eval $(call gb_Jar_set_componentfile,juh,javaunohelper/util/juh,URE)) + +$(eval $(call gb_Jar_add_sourcefiles,juh,\ + javaunohelper/com/sun/star/comp/JavaUNOHelperServices \ + javaunohelper/com/sun/star/comp/helper/Bootstrap \ + javaunohelper/com/sun/star/comp/helper/BootstrapException \ + javaunohelper/com/sun/star/comp/helper/ComponentContext \ + javaunohelper/com/sun/star/comp/helper/ComponentContextEntry \ + javaunohelper/com/sun/star/comp/helper/RegistryServiceFactory \ + javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader \ + javaunohelper/com/sun/star/comp/helper/UnoInfo \ + javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment \ + javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter \ + javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter \ + javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter \ + javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter \ + javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter \ + javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter \ + javaunohelper/com/sun/star/lib/uno/helper/ComponentBase \ + javaunohelper/com/sun/star/lib/uno/helper/Factory \ + javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer \ + javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer \ + javaunohelper/com/sun/star/lib/uno/helper/PropertySet \ + javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin \ + javaunohelper/com/sun/star/lib/uno/helper/UnoUrl \ + javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter \ + javaunohelper/com/sun/star/lib/uno/helper/WeakBase \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/javaunohelper/Library_juh.mk b/javaunohelper/Library_juh.mk new file mode 100644 index 000000000000..7c34479548da --- /dev/null +++ b/javaunohelper/Library_juh.mk @@ -0,0 +1,52 @@ +# -*- 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_Library_Library,juh)) + +$(eval $(call gb_Library_add_package_headers,juh,\ + javaunohelper_cppumaker \ +)) + +$(eval $(call gb_Library_set_include,juh,\ + $$(INCLUDE) \ + -I$(WORKDIR)/CustomTarget/javaunohelper/cppumaker \ +)) + +$(eval $(call gb_Library_add_api,juh,\ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,juh,\ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,juh,\ + javaunohelper/source/preload \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/javaunohelper/Library_juhx.mk b/javaunohelper/Library_juhx.mk new file mode 100644 index 000000000000..fe066b45065b --- /dev/null +++ b/javaunohelper/Library_juhx.mk @@ -0,0 +1,54 @@ +# -*- 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_Library_Library,juhx)) + +$(eval $(call gb_Library_add_package_headers,juhx,\ + javaunohelper_cppumaker \ +)) + +$(eval $(call gb_Library_set_include,juhx,\ + $$(INCLUDE) \ + -I$(WORKDIR)/CustomTarget/javaunohelper/cppumaker \ +)) + +$(eval $(call gb_Library_add_linked_libs,juhx,\ + cppu \ + cppuhelper \ + jvmaccess \ + sal \ + salhelper \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,juhx,\ + javaunohelper/source/bootstrap \ + javaunohelper/source/javaunohelper \ + javaunohelper/source/vm \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/javaunohelper/Makefile b/javaunohelper/Makefile new file mode 100644 index 000000000000..7bbbe6c703e6 --- /dev/null +++ b/javaunohelper/Makefile @@ -0,0 +1,40 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +gb_PARTIALBUILD := T +ifeq ($(strip $(SOLARENV)),) +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk +else + +gb_SourceEnvAndRecurse_STAGE=gbuild +include $(SOLARENV)/gbuild/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) + +endif +# vim: set noet sw=4 ts=4: diff --git a/javaunohelper/Module_javaunohelper.mk b/javaunohelper/Module_javaunohelper.mk new file mode 100644 index 000000000000..153f8b2a4e8e --- /dev/null +++ b/javaunohelper/Module_javaunohelper.mk @@ -0,0 +1,40 @@ +# -*- 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_Module_Module,javaunohelper)) + +ifneq ($(SOLAR_JAVA),) +$(eval $(call gb_Module_add_targets,javaunohelper,\ + Library_juh \ + Library_juhx \ + Jar_juh \ + Package_cppumaker \ + Zip_juh \ +)) +endif + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/javaunohelper/Package_cppumaker.mk b/javaunohelper/Package_cppumaker.mk new file mode 100644 index 000000000000..5ab6664bde75 --- /dev/null +++ b/javaunohelper/Package_cppumaker.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 +# (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,javaunohelper_cppumaker,$(WORKDIR)/CustomTarget/javaunohelper/cppumaker)) + +$(eval $(call gb_Package_add_customtarget,javaunohelper_cppumaker,javaunohelper/cppumaker)) + +$(eval $(call gb_CustomTarget_add_outdir_dependencies,javaunohelper/cppumaker,\ + $(OUTDIR_FOR_BUILD)/bin/cppumaker \ + $(OUTDIR)/bin/udkapi.rdb \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/javaunohelper/Zip_juh.mk b/javaunohelper/Zip_juh.mk new file mode 100644 index 000000000000..e59c4cec4d5c --- /dev/null +++ b/javaunohelper/Zip_juh.mk @@ -0,0 +1,57 @@ +# -*- 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_Zip_Zip,juh_src,$(SRCDIR)/javaunohelper)) + +$(eval $(call gb_Zip_add_files,juh_src,\ + com/sun/star/comp/JavaUNOHelperServices.java \ + com/sun/star/comp/helper/Bootstrap.java \ + com/sun/star/comp/helper/BootstrapException.java \ + com/sun/star/comp/helper/ComponentContext.java \ + com/sun/star/comp/helper/ComponentContextEntry.java \ + com/sun/star/comp/helper/RegistryServiceFactory.java \ + com/sun/star/comp/helper/SharedLibraryLoader.java \ + com/sun/star/comp/helper/UnoInfo.java \ + com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java \ + com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java \ + com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java \ + com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java \ + com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java \ + com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java \ + com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java \ + com/sun/star/lib/uno/helper/ComponentBase.java \ + com/sun/star/lib/uno/helper/Factory.java \ + com/sun/star/lib/uno/helper/InterfaceContainer.java \ + com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java \ + com/sun/star/lib/uno/helper/PropertySet.java \ + com/sun/star/lib/uno/helper/PropertySetMixin.java \ + com/sun/star/lib/uno/helper/UnoUrl.java \ + com/sun/star/lib/uno/helper/WeakAdapter.java \ + com/sun/star/lib/uno/helper/WeakBase.java \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/javaunohelper/cppumaker/Makefile b/javaunohelper/cppumaker/Makefile new file mode 100644 index 000000000000..230daa002338 --- /dev/null +++ b/javaunohelper/cppumaker/Makefile @@ -0,0 +1,60 @@ +# -*- 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. + +gb_PARTIALBUILD := T +include $(GBUILDDIR)/gbuild_simple.mk + +done : + $(call gb_Helper_execute,cppumaker -C -BUCR -O. \ + -Tcom.sun.star.beans.NamedValue \ + -Tcom.sun.star.beans.XPropertySet \ + -Tcom.sun.star.container.XHierarchicalNameAccess \ + -Tcom.sun.star.lang.DisposedException \ + -Tcom.sun.star.lang.IllegalArgumentException \ + -Tcom.sun.star.lang.XComponent \ + -Tcom.sun.star.lang.XInitialization \ + -Tcom.sun.star.lang.XMultiComponentFactory \ + -Tcom.sun.star.lang.XMultiServiceFactory \ + -Tcom.sun.star.lang.XServiceInfo \ + -Tcom.sun.star.lang.XSingleComponentFactory \ + -Tcom.sun.star.lang.XSingleServiceFactory \ + -Tcom.sun.star.lang.XTypeProvider \ + -Tcom.sun.star.loader.XImplementationLoader \ + -Tcom.sun.star.registry.XRegistryKey \ + -Tcom.sun.star.registry.XSimpleRegistry \ + -Tcom.sun.star.uno.TypeClass \ + -Tcom.sun.star.uno.XAggregation \ + -Tcom.sun.star.uno.XComponentContext \ + -Tcom.sun.star.uno.XWeak \ + $(OUTDIR)/bin/udkapi.rdb) && \ + touch $@ + +.DEFAULT_GOAL := all +.PHONY : all +all : done + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/javaunohelper/inc/makefile.mk b/javaunohelper/inc/makefile.mk deleted file mode 100644 index 072e7df13332..000000000000 --- a/javaunohelper/inc/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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME=javaunohelper -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/javaunohelper/prj/build.lst b/javaunohelper/prj/build.lst index d97a6450d06a..f2fe76df0099 100644 --- a/javaunohelper/prj/build.lst +++ b/javaunohelper/prj/build.lst @@ -1,10 +1,3 @@ jh javaunohelper : LIBXSLT:libxslt bridges cppuhelper jurt ridljar unoil NULL jh javaunohelper usr1 - all jh_mkout NULL -jh javaunohelper\inc nmake - all jh_inc NULL -jh javaunohelper\com\sun\star\comp\helper nmake - all jh_helper jh_inc NULL -jh javaunohelper\com\sun\star\comp\juhtest nmake - all jh_juhtest jh_helper jh_libhelp NULL -jh javaunohelper\com\sun\star\comp nmake - all jh_comp jh_juhtest NULL -jh javaunohelper\com\sun\star\lib\uno\adapter nmake - all jh_adapter jh_libhelp jh_inc NULL -jh javaunohelper\com\sun\star\lib\uno\helper nmake - all jh_libhelp jh_inc NULL -jh javaunohelper\source nmake - all jh_source jh_inc NULL -jh javaunohelper\util nmake - all jh_util jh_helper jh_source jh_adapter jh_libhelp jh_comp NULL +jh javaunohelper\prj nmake - all jh_prj NULL diff --git a/javaunohelper/prj/d.lst b/javaunohelper/prj/d.lst index 15e14f6c4601..e69de29bb2d1 100644 --- a/javaunohelper/prj/d.lst +++ b/javaunohelper/prj/d.lst @@ -1,7 +0,0 @@ -..\%__SRC%\class\juh.jar %_DEST%\bin\juh.jar -..\%__SRC%\bin\juh*.dll %_DEST%\bin\juh*.dll -..\%__SRC%\lib\libjuh*.so %_DEST%\lib\libjuh*.so -..\%__SRC%\lib\libjuh*.dylib %_DEST%\lib\libjuh*.dylib -..\%__SRC%\misc\juh.component %_DEST%\xml\juh.component - -..\%__SRC%\bin\juh_src.zip %COMMON_DEST%\bin\juh_src.zip diff --git a/javaunohelper/prj/makefile.mk b/javaunohelper/prj/makefile.mk new file mode 100644 index 000000000000..0997622e00f6 --- /dev/null +++ b/javaunohelper/prj/makefile.mk @@ -0,0 +1 @@ +.INCLUDE : gbuildbridge.mk -- cgit v1.2.3 From 2dc08095b5a9f768afaf9828a89cc5d7b2b17829 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 25 Dec 2011 13:42:46 +0100 Subject: fix deps on executables --- javaunohelper/Package_cppumaker.mk | 2 +- ridljar/Package_javamaker.mk | 2 +- unoil/Package_climaker.mk | 2 +- unoil/Package_javamaker.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'javaunohelper') diff --git a/javaunohelper/Package_cppumaker.mk b/javaunohelper/Package_cppumaker.mk index 5ab6664bde75..b53301a4ac0b 100644 --- a/javaunohelper/Package_cppumaker.mk +++ b/javaunohelper/Package_cppumaker.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Package_Package,javaunohelper_cppumaker,$(WORKDIR)/CustomTarget $(eval $(call gb_Package_add_customtarget,javaunohelper_cppumaker,javaunohelper/cppumaker)) $(eval $(call gb_CustomTarget_add_outdir_dependencies,javaunohelper/cppumaker,\ - $(OUTDIR_FOR_BUILD)/bin/cppumaker \ + $(OUTDIR_FOR_BUILD)/bin/cppumaker$(gb_Executable_EXT_for_build) \ $(OUTDIR)/bin/udkapi.rdb \ )) diff --git a/ridljar/Package_javamaker.mk b/ridljar/Package_javamaker.mk index 677f11da37db..2d73aeaf4d7b 100644 --- a/ridljar/Package_javamaker.mk +++ b/ridljar/Package_javamaker.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Package_Package,ridljar_javamaker,$(WORKDIR)/CustomTarget/ridlj $(eval $(call gb_Package_add_customtarget,ridljar_javamaker,ridljar/javamaker)) $(eval $(call gb_CustomTarget_add_outdir_dependencies,ridljar/javamaker,\ - $(OUTDIR_FOR_BUILD)/bin/javamaker \ + $(OUTDIR_FOR_BUILD)/bin/javamaker$(gb_Executable_EXT_for_build) \ $(OUTDIR)/bin/udkapi.rdb \ )) diff --git a/unoil/Package_climaker.mk b/unoil/Package_climaker.mk index e12ef545961b..0be46d0476cc 100644 --- a/unoil/Package_climaker.mk +++ b/unoil/Package_climaker.mk @@ -39,7 +39,7 @@ $(eval $(call gb_CustomTarget_add_dependencies,unoil/climaker,\ )) $(eval $(call gb_CustomTarget_add_outdir_dependencies,unoil/climaker,\ - $(OUTDIR_FOR_BUILD)/bin/climaker \ + $(OUTDIR_FOR_BUILD)/bin/climaker$(gb_Executable_EXT_for_build) \ $(OUTDIR)/bin/cli_uretypes.dll \ $(OUTDIR)/bin/cliuno.snk \ $(OUTDIR)/bin/offapi.rdb \ diff --git a/unoil/Package_javamaker.mk b/unoil/Package_javamaker.mk index add0a60fec68..7b7fcb7072d7 100644 --- a/unoil/Package_javamaker.mk +++ b/unoil/Package_javamaker.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Package_Package,unoil_javamaker,$(WORKDIR)/CustomTarget/unoil/j $(eval $(call gb_Package_add_customtarget,unoil_javamaker,unoil/javamaker)) $(eval $(call gb_CustomTarget_add_outdir_dependencies,unoil/javamaker,\ - $(OUTDIR_FOR_BUILD)/bin/javamaker \ + $(OUTDIR_FOR_BUILD)/bin/javamaker$(gb_Executable_EXT_for_build) \ $(OUTDIR)/bin/offapi.rdb \ $(OUTDIR)/bin/udkapi.rdb \ )) -- cgit v1.2.3 From e8d8719ccdfd8f0f1f8f9ffe0509ec18c5aa7d09 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 25 Dec 2011 14:02:14 +0100 Subject: remove stray delzip files --- javaunohelper/util/delzip | 0 jurt/util/delzip | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 javaunohelper/util/delzip delete mode 100644 jurt/util/delzip (limited to 'javaunohelper') diff --git a/javaunohelper/util/delzip b/javaunohelper/util/delzip deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/jurt/util/delzip b/jurt/util/delzip deleted file mode 100644 index e69de29bb2d1..000000000000 -- cgit v1.2.3 From 7d2fc4b1a6c31705120ef1f70ccc0bf9db39c667 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 25 Dec 2011 14:03:40 +0100 Subject: remove stray makefiles --- javaunohelper/com/sun/star/comp/helper/makefile.mk | 54 --------- .../com/sun/star/comp/juhtest/makefile.mk | 50 -------- javaunohelper/com/sun/star/comp/makefile.mk | 49 -------- .../com/sun/star/lib/uno/adapter/makefile.mk | 54 --------- .../com/sun/star/lib/uno/helper/makefile.mk | 49 -------- javaunohelper/source/makefile.mk | 134 --------------------- .../test/com/sun/star/comp/helper/makefile.mk | 52 -------- .../test/com/sun/star/lib/uno/helper/makefile.mk | 68 ----------- javaunohelper/util/makefile.mk | 58 --------- javaunohelper/util/settings.pmk | 28 ----- 10 files changed, 596 deletions(-) delete mode 100644 javaunohelper/com/sun/star/comp/helper/makefile.mk delete mode 100644 javaunohelper/com/sun/star/comp/juhtest/makefile.mk delete mode 100644 javaunohelper/com/sun/star/comp/makefile.mk delete mode 100644 javaunohelper/com/sun/star/lib/uno/adapter/makefile.mk delete mode 100644 javaunohelper/com/sun/star/lib/uno/helper/makefile.mk delete mode 100644 javaunohelper/source/makefile.mk delete mode 100644 javaunohelper/test/com/sun/star/comp/helper/makefile.mk delete mode 100644 javaunohelper/test/com/sun/star/lib/uno/helper/makefile.mk delete mode 100644 javaunohelper/util/makefile.mk delete mode 100644 javaunohelper/util/settings.pmk (limited to 'javaunohelper') diff --git a/javaunohelper/com/sun/star/comp/helper/makefile.mk b/javaunohelper/com/sun/star/comp/helper/makefile.mk deleted file mode 100644 index 3752abc7dbda..000000000000 --- a/javaunohelper/com/sun/star/comp/helper/makefile.mk +++ /dev/null @@ -1,54 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME = juhelper -PACKAGE = com$/sun$/star$/comp$/helper -TARGET = com_sun_star_comp_helper - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/settings.pmk - -# --- Files -------------------------------------------------------- - -JAVAFILES= \ - ComponentContextEntry.java \ - ComponentContext.java \ - Bootstrap.java \ - SharedLibraryLoader.java \ - RegistryServiceFactory.java \ - BootstrapException.java \ - UnoInfo.java - -JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/javaunohelper/com/sun/star/comp/juhtest/makefile.mk b/javaunohelper/com/sun/star/comp/juhtest/makefile.mk deleted file mode 100644 index 0d65b961a0c1..000000000000 --- a/javaunohelper/com/sun/star/comp/juhtest/makefile.mk +++ /dev/null @@ -1,50 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME = juhelper -PACKAGE = com$/sun$/star$/comp$/juhtest -TARGET = com_sun_star_comp_juhtest - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/settings.pmk - -# --- Files -------------------------------------------------------- -#todo: we do not want include juh.jar here but use the output tree. -JARFILES = unoil.jar ridl.jar jurt.jar - -JAVAFILES= \ - SmoketestCommandEnvironment.java - -JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/javaunohelper/com/sun/star/comp/makefile.mk b/javaunohelper/com/sun/star/comp/makefile.mk deleted file mode 100644 index bde016b47071..000000000000 --- a/javaunohelper/com/sun/star/comp/makefile.mk +++ /dev/null @@ -1,49 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME = juhelper -PACKAGE = com$/sun$/star$/comp -TARGET = com_sun_star_comp - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/settings.pmk - -# --- Files -------------------------------------------------------- -JARFILES = ridl.jar jurt.jar unoil.jar -JAVAFILES= \ - JavaUNOHelperServices.java - - -JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/makefile.mk b/javaunohelper/com/sun/star/lib/uno/adapter/makefile.mk deleted file mode 100644 index 793f5fb1dc64..000000000000 --- a/javaunohelper/com/sun/star/lib/uno/adapter/makefile.mk +++ /dev/null @@ -1,54 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/..$/.. - -PRJNAME = juhelper -PACKAGE = com$/sun$/star$/lib$/uno$/adapter -TARGET = com_sun_star_lib_uno_adapter - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/settings.pmk - -# --- Files -------------------------------------------------------- - -JAVAFILES= \ - XInputStreamToInputStreamAdapter.java \ - XOutputStreamToOutputStreamAdapter.java \ - InputStreamToXInputStreamAdapter.java \ - OutputStreamToXOutputStreamAdapter.java \ - ByteArrayToXInputStreamAdapter.java \ - XOutputStreamToByteArrayAdapter.java - - -JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/javaunohelper/com/sun/star/lib/uno/helper/makefile.mk b/javaunohelper/com/sun/star/lib/uno/helper/makefile.mk deleted file mode 100644 index 3cab6f07084b..000000000000 --- a/javaunohelper/com/sun/star/lib/uno/helper/makefile.mk +++ /dev/null @@ -1,49 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/..$/.. - -PRJNAME = juhelper -PACKAGE = com$/sun$/star$/lib$/uno$/helper -TARGET = com_sun_star_lib_uno_helper - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/settings.pmk - -JAVAFILES = \ - ComponentBase.java \ - Factory.java \ - InterfaceContainer.java \ - MultiTypeInterfaceContainer.java \ - PropertySet.java \ - PropertySetMixin.java \ - UnoUrl.java \ - WeakAdapter.java \ - WeakBase.java - -.INCLUDE : target.mk - diff --git a/javaunohelper/source/makefile.mk b/javaunohelper/source/makefile.mk deleted file mode 100644 index 606ddade304f..000000000000 --- a/javaunohelper/source/makefile.mk +++ /dev/null @@ -1,134 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=javaunohelper -TARGET=juh -USE_DEFFILE=TRUE -ENABLE_EXCEPTIONS=TRUE -LIBTARGET=NO - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(SOLAR_JAVA)"=="" -nojava: - @echo "Not building javaunohelper because Java is disabled" -.ENDIF - -# ------------------------------------------------------------------ - -UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb -UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb - -UNOUCROUT=$(OUT)$/inc$/comprehensive -INCPRE+=$(OUT)$/inc$/comprehensive -NO_OFFUH=TRUE -CPPUMAKERFLAGS+=-C - -UNOTYPES= \ - com.sun.star.beans.NamedValue \ - com.sun.star.container.XHierarchicalNameAccess \ - com.sun.star.loader.XImplementationLoader \ - com.sun.star.registry.XRegistryKey \ - com.sun.star.registry.XSimpleRegistry \ - com.sun.star.beans.XPropertySet \ - com.sun.star.lang.DisposedException \ - com.sun.star.lang.IllegalArgumentException \ - com.sun.star.lang.XTypeProvider \ - com.sun.star.lang.XServiceInfo \ - com.sun.star.lang.XMultiServiceFactory \ - com.sun.star.lang.XMultiComponentFactory \ - com.sun.star.lang.XSingleServiceFactory \ - com.sun.star.lang.XSingleComponentFactory \ - com.sun.star.uno.TypeClass \ - com.sun.star.uno.XWeak \ - com.sun.star.uno.XAggregation \ - com.sun.star.uno.XComponentContext \ - com.sun.star.lang.XInitialization \ - com.sun.star.lang.XComponent - -SLOFILES= \ - $(SLO)$/javaunohelper.obj \ - $(SLO)$/bootstrap.obj \ - $(SLO)$/preload.obj \ - $(SLO)$/vm.obj - -# ------------------------------------------------------------------ - -LIB1TARGET=$(SLB)$/$(SHL1TARGET).lib -LIB1OBJFILES=\ - $(SLO)$/javaunohelper.obj \ - $(SLO)$/bootstrap.obj \ - $(SLO)$/vm.obj - -SHL1TARGET=juhx - -SHL1STDLIBS= \ - $(JVMACCESSLIB) \ - $(SALHELPERLIB) \ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) - -SHL1VERSIONMAP = javaunohelper.map - -SHL1DEPN= -SHL1IMPLIB=i$(SHL1TARGET) -SHL1LIBS=$(LIB1TARGET) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -SHL1RPATH=URELIB - -DEF1NAME=$(SHL1TARGET) - -# ------------------------------------------------------------------ - -LIB2TARGET=$(SLB)$/$(SHL2TARGET).lib -LIB2OBJFILES=\ - $(SLO)$/preload.obj - -SHL2TARGET=juh - -SHL2STDLIBS= \ - $(SALLIB) - -SHL2VERSIONMAP = javaunohelper.map - -SHL2DEPN= -SHL2IMPLIB=i$(SHL2TARGET) -SHL2LIBS=$(LIB2TARGET) -SHL2DEF=$(MISC)$/$(SHL2TARGET).def -SHL2RPATH=URELIB - -DEF2NAME=$(SHL2TARGET) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/javaunohelper/test/com/sun/star/comp/helper/makefile.mk b/javaunohelper/test/com/sun/star/comp/helper/makefile.mk deleted file mode 100644 index 5f00fac9870f..000000000000 --- a/javaunohelper/test/com/sun/star/comp/helper/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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ =..$/..$/..$/..$/..$/.. -PRJNAME = juhelper -PACKAGE = com$/sun$/star$/comp$/helper -TARGET = com_sun_star_comp_helper_test - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -JARFILES = jurt.jar ridl.jar - -JAVACLASSFILES= \ - $(CLASSDIR)$/$(PACKAGE)$/ComponentContext_Test.class \ - $(CLASSDIR)$/$(PACKAGE)$/SharedLibraryLoader_Test.class \ - $(CLASSDIR)$/$(PACKAGE)$/RegistryServiceFactory_Test.class \ - $(CLASSDIR)$/$(PACKAGE)$/Bootstrap_Test.class - -JAVAFILES= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/makefile.mk b/javaunohelper/test/com/sun/star/lib/uno/helper/makefile.mk deleted file mode 100644 index d3de3df10e70..000000000000 --- a/javaunohelper/test/com/sun/star/lib/uno/helper/makefile.mk +++ /dev/null @@ -1,68 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/..$/..$/.. -PRJNAME = juhelper -PACKAGE = com$/sun$/star$/lib$/uno$/helper -TARGET = com_sun_star_lib_uno_helper_test - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -JARFILES = jurt.jar ridl.jar juh.jar - -JAVACLASSFILES= \ - $(CLASSDIR)$/$(PACKAGE)$/WeakBase_Test.class \ - $(CLASSDIR)$/$(PACKAGE)$/ComponentBase_Test.class \ - $(CLASSDIR)$/$(PACKAGE)$/InterfaceContainer_Test.class \ - $(CLASSDIR)$/$(PACKAGE)$/MultiTypeInterfaceContainer_Test.class \ - $(CLASSDIR)$/$(PACKAGE)$/ProxyProvider.class \ - $(CLASSDIR)$/$(PACKAGE)$/AWeakBase.class \ - $(CLASSDIR)$/$(PACKAGE)$/PropertySet_Test.class \ - $(CLASSDIR)$/$(PACKAGE)$/UnoUrlTest.class \ - $(CLASSDIR)$/$(PACKAGE)$/Factory_Test.class - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -CPATH_JARS = java_uno.jar $(JARFILES) -CPATH_TMP1 = $(foreach,j,$(CPATH_JARS) $(SOLARBINDIR)$/$j) -CPATH_TMP2 = $(strip $(subst,!,$(PATH_SEPERATOR) $(CPATH_TMP1:s/ /!/))) -CPATH = $(CPATH_TMP2)$(PATH_SEPERATOR)$(OUT)$/bin$/factory_test.jar$(PATH_SEPERATOR)$(XCLASSPATH) - -$(OUT)$/bin$/factory_test.jar : $(CLASSDIR)$/$(PACKAGE)$/Factory_Test.class - -rm -f $@ - @echo RegistrationClassName: com.sun.star.lib.uno.helper.Factory_Test > $(OUT)$/bin$/manifest.mf - -jar cvfm $@ $(OUT)$/bin$/manifest.mf -C $(CLASSDIR) $(PACKAGE)$/Factory_Test.class - -run_factory_test : $(OUT)$/bin$/factory_test.jar - -$(GNUCOPY) $(SOLARBINDIR)$/udkapi.rdb $(OUT)$/bin$/factory_test.rdb - -java -classpath $(CPATH) com.sun.star.lib.uno.helper.Factory_Test $(OUT)$/bin$/factory_test.jar $(OUT)$/bin$/factory_test.rdb diff --git a/javaunohelper/util/makefile.mk b/javaunohelper/util/makefile.mk deleted file mode 100644 index 796280eb3876..000000000000 --- a/javaunohelper/util/makefile.mk +++ /dev/null @@ -1,58 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ = .. -PRJNAME = juhelper -TARGET = juh - -.INCLUDE : settings.mk -.INCLUDE: settings.pmk - -JARCLASSDIRS = com -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE -JARCLASSPATH = $(JARFILES) ../../lib/ ../bin/ -CUSTOMMANIFESTFILE = manifest - -# 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 - -ALLTAR : $(MISC)/juh.component - -$(MISC)/juh.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - juh.component - $(XSLTPROC) --nonet --stringparam uri '$(COMPONENTPREFIX_URE_JAVA)juh.jar' \ - -o $@ $(SOLARENV)/bin/createcomponent.xslt juh.component diff --git a/javaunohelper/util/settings.pmk b/javaunohelper/util/settings.pmk deleted file mode 100644 index 28b2621830d2..000000000000 --- a/javaunohelper/util/settings.pmk +++ /dev/null @@ -1,28 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -JARFILES = ridl.jar jurt.jar -- cgit v1.2.3 From 980e69cd61b41a644de0736ee7b70c84f5b9e013 Mon Sep 17 00:00:00 2001 From: Matus Kukan Date: Wed, 15 Feb 2012 23:26:40 +0100 Subject: add gb_Helper_abbreviate_dirs_native --- javaunohelper/cppumaker/Makefile | 3 ++- jvmfwk/plugins/sunmajor/pluginlib/Makefile | 3 ++- ridljar/javamaker/Makefile | 3 ++- unoil/javamaker/Makefile | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) (limited to 'javaunohelper') diff --git a/javaunohelper/cppumaker/Makefile b/javaunohelper/cppumaker/Makefile index 230daa002338..017acf1b08bc 100644 --- a/javaunohelper/cppumaker/Makefile +++ b/javaunohelper/cppumaker/Makefile @@ -29,6 +29,7 @@ gb_PARTIALBUILD := T include $(GBUILDDIR)/gbuild_simple.mk done : + $(call gb_Helper_abbreviate_dirs_native, \ $(call gb_Helper_execute,cppumaker -C -BUCR -O. \ -Tcom.sun.star.beans.NamedValue \ -Tcom.sun.star.beans.XPropertySet \ @@ -51,7 +52,7 @@ done : -Tcom.sun.star.uno.XComponentContext \ -Tcom.sun.star.uno.XWeak \ $(OUTDIR)/bin/udkapi.rdb) && \ - touch $@ + touch $@) .DEFAULT_GOAL := all .PHONY : all diff --git a/jvmfwk/plugins/sunmajor/pluginlib/Makefile b/jvmfwk/plugins/sunmajor/pluginlib/Makefile index 2e91b1d95f81..b190038ef79c 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/Makefile +++ b/jvmfwk/plugins/sunmajor/pluginlib/Makefile @@ -28,7 +28,8 @@ include $(GBUILDDIR)/gbuild.mk JREProperties.class : $(SRCDIR)/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java - $(gb_JavaClassSet_JAVACCOMMAND) $(gb_JavaClassSet_JAVACDEBUG) -d $(dir $@) $^ + $(call gb_Helper_abbreviate_dirs_native, \ + $(gb_JavaClassSet_JAVACCOMMAND) $(gb_JavaClassSet_JAVACDEBUG) -d $(dir $@) $^) .DEFAULT_GOAL := all .PHONY : all diff --git a/ridljar/javamaker/Makefile b/ridljar/javamaker/Makefile index 65c106b82279..d2fe741f5f7e 100644 --- a/ridljar/javamaker/Makefile +++ b/ridljar/javamaker/Makefile @@ -29,7 +29,8 @@ gb_PARTIALBUILD := T include $(GBUILDDIR)/gbuild_simple.mk done : $(OUTDIR)/bin/udkapi.rdb - $(call gb_Helper_execute,javamaker -BUCR -O./class $<) && touch $@ + $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_execute,javamaker -BUCR -O./class $<) && touch $@) .DEFAULT_GOAL := all .PHONY : all diff --git a/unoil/javamaker/Makefile b/unoil/javamaker/Makefile index 7c21708b255f..d39e96b984c9 100644 --- a/unoil/javamaker/Makefile +++ b/unoil/javamaker/Makefile @@ -29,8 +29,9 @@ gb_PARTIALBUILD := T include $(GBUILDDIR)/gbuild_simple.mk done : + $(call gb_Helper_abbreviate_dirs_native, \ $(call gb_Helper_execute,javamaker -BUCR -O$(realpath .) $(OUTDIR)/bin/offapi.rdb -X$(OUTDIR)/bin/udkapi.rdb) && \ - touch $@ + touch $@) .DEFAULT_GOAL := all .PHONY : all -- cgit v1.2.3