diff options
175 files changed, 2991 insertions, 3513 deletions
diff --git a/Repository.mk b/Repository.mk index 5adc79464a02..6462d3a2f567 100644 --- a/Repository.mk +++ b/Repository.mk @@ -114,6 +114,14 @@ $(eval $(call gb_Helper_register_executables,OOO,\ endif +ifneq ($(OS),MACOSX) + +$(eval $(call gb_Helper_register_executables,UREBIN,\ + javaldx \ +)) + +endif + ifeq ($(WITH_MOZILLA),YES) $(eval $(call gb_Helper_register_executables,OOO,\ pluginapp.bin \ @@ -315,10 +323,23 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ endif $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ + jpipe \ + juh \ + juhx \ + jvmfwk \ sal_textenc \ + sunjavaplugin \ xmlreader \ )) +ifeq ($(OS),WNT) + +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ + jpipx \ +)) + +endif + $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ affine_uno \ avmediagst \ @@ -394,12 +415,12 @@ $(eval $(call gb_Helper_register_libraries,RTLIBS, \ comphelper \ i18nisolang1 \ i18nutil \ - jvmaccess \ ucbhelper \ )) $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \ cppuhelper \ + jvmaccess \ purpenvhelper \ salhelper \ )) @@ -481,7 +502,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ cppu \ - jvmfwk \ sal \ )) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d762282bfb33..138a15b8005f 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1011,6 +1011,29 @@ endef endif #SYSTEM_MOZILLA_HEADERS +ifneq ($(VALGRIND_CFLAGS),) + +define gb_LinkTarget__use_valgrind +$(call gb_LinkTarget_add_defs,$(1),\ + -DHAVE_VALGRIND_H \ +) + +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(VALGRIND_CFLAGS) \ +) + +endef + +else # !VALGRIND_CFLAGS + +define gb_LinkTarget__use_valgrind + +endef + +endif # VALGRIND_CFLAGS + + # MacOSX-only frameworks ############################################ # (in alphabetical order) diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 8020878967fc..9cd684be0c2f 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -64,6 +64,10 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ i18npool \ i18nutil \ idl \ + javaunohelper \ + jvmaccess \ + jvmfwk \ + jurt \ lingucomponent \ linguistic \ lotuswordpro \ @@ -81,6 +85,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ psprint_config \ regexp \ reportdesign \ + ridljar \ rsc \ sal \ salhelper \ @@ -109,6 +114,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ udkapi \ unixODBC \ UnoControls \ + unoil \ unotest \ unotools \ unoxml \ 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 <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,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 <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_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 <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_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/inc/makefile.mk b/javaunohelper/Makefile index 072e7df13332..7bbbe6c703e6 100644 --- a/javaunohelper/inc/makefile.mk +++ b/javaunohelper/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. @@ -24,16 +25,16 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -PRJ=.. -PRJNAME=javaunohelper -TARGET=inc +gb_PARTIALBUILD := T +ifeq ($(strip $(SOLARENV)),) +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk +else -# --- Settings ----------------------------------------------------- +gb_SourceEnvAndRecurse_STAGE=gbuild +include $(SOLARENV)/gbuild/gbuild.mk -.INCLUDE : settings.mk +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.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 <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,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..b53301a4ac0b --- /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 <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,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$(gb_Executable_EXT_for_build) \ + $(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 <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,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/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 -# <http://www.openoffice.org/license.html> -# 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 -# <http://www.openoffice.org/license.html> -# 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 -# <http://www.openoffice.org/license.html> -# 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 -# <http://www.openoffice.org/license.html> -# 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 -# <http://www.openoffice.org/license.html> -# 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/cppumaker/Makefile b/javaunohelper/cppumaker/Makefile new file mode 100644 index 000000000000..017acf1b08bc --- /dev/null +++ b/javaunohelper/cppumaker/Makefile @@ -0,0 +1,61 @@ +# -*- 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 : + $(call gb_Helper_abbreviate_dirs_native, \ + $(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/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 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 -# <http://www.openoffice.org/license.html> -# 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 -# <http://www.openoffice.org/license.html> -# 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 -# <http://www.openoffice.org/license.html> -# 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/delzip b/javaunohelper/util/delzip deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/javaunohelper/util/delzip +++ /dev/null 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 -# <http://www.openoffice.org/license.html> -# 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 -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -JARFILES = ridl.jar jurt.jar diff --git a/jurt/Jar_jurt.mk b/jurt/Jar_jurt.mk new file mode 100644 index 000000000000..8a6a87d96cf3 --- /dev/null +++ b/jurt/Jar_jurt.mk @@ -0,0 +1,96 @@ +# -*- 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,jurt)) + +$(eval $(call gb_Jar_add_jars,jurt,\ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/unoloader.jar \ +)) + +$(eval $(call gb_Jar_set_packageroot,jurt,com)) + +$(eval $(call gb_Jar_set_manifest,jurt,$(SRCDIR)/jurt/util/manifest)) + +$(eval $(call gb_Jar_add_sourcefiles,jurt,\ + jurt/com/sun/star/comp/bridgefactory/BridgeFactory \ + jurt/com/sun/star/comp/connections/Acceptor \ + jurt/com/sun/star/comp/connections/Connector \ + jurt/com/sun/star/comp/connections/ConstantInstanceProvider \ + jurt/com/sun/star/comp/connections/Implementation \ + jurt/com/sun/star/comp/connections/PipedConnection \ + jurt/com/sun/star/comp/loader/FactoryHelper \ + jurt/com/sun/star/comp/loader/JavaLoader \ + jurt/com/sun/star/comp/loader/JavaLoaderFactory \ + jurt/com/sun/star/comp/loader/RegistrationClassFinder \ + jurt/com/sun/star/comp/servicemanager/ServiceManager \ + jurt/com/sun/star/comp/urlresolver/UrlResolver \ + jurt/com/sun/star/lib/connections/pipe/PipeConnection \ + jurt/com/sun/star/lib/connections/pipe/pipeAcceptor \ + jurt/com/sun/star/lib/connections/pipe/pipeConnector \ + jurt/com/sun/star/lib/connections/socket/ConnectionDescriptor \ + jurt/com/sun/star/lib/connections/socket/SocketConnection \ + jurt/com/sun/star/lib/connections/socket/socketAcceptor \ + jurt/com/sun/star/lib/connections/socket/socketConnector \ + jurt/com/sun/star/lib/uno/Proxy \ + jurt/com/sun/star/lib/uno/bridges/java_remote/BridgedObject \ + jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory \ + jurt/com/sun/star/lib/uno/bridges/java_remote/RequestHandler \ + jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter \ + jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter \ + jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge \ + jurt/com/sun/star/lib/uno/environments/java/java_environment \ + jurt/com/sun/star/lib/uno/environments/remote/IProtocol \ + jurt/com/sun/star/lib/uno/environments/remote/IReceiver \ + jurt/com/sun/star/lib/uno/environments/remote/IThreadPool \ + jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool \ + jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory \ + jurt/com/sun/star/lib/uno/environments/remote/Job \ + jurt/com/sun/star/lib/uno/environments/remote/JobQueue \ + jurt/com/sun/star/lib/uno/environments/remote/Message \ + jurt/com/sun/star/lib/uno/environments/remote/NativeThreadPool \ + jurt/com/sun/star/lib/uno/environments/remote/ThreadId \ + jurt/com/sun/star/lib/uno/environments/remote/ThreadPoolManager \ + jurt/com/sun/star/lib/uno/environments/remote/remote_environment \ + jurt/com/sun/star/lib/uno/protocols/urp/Cache \ + jurt/com/sun/star/lib/uno/protocols/urp/Marshal \ + jurt/com/sun/star/lib/uno/protocols/urp/PendingRequests \ + jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal \ + jurt/com/sun/star/lib/uno/protocols/urp/UrpMessage \ + jurt/com/sun/star/lib/uno/protocols/urp/urp \ + jurt/com/sun/star/lib/util/AsynchronousFinalizer \ + jurt/com/sun/star/lib/util/NativeLibraryLoader \ + jurt/com/sun/star/lib/util/StringHelper \ + jurt/com/sun/star/lib/util/UrlToFileMapper \ + jurt/com/sun/star/uno/AnyConverter \ + jurt/com/sun/star/uno/Ascii \ + jurt/com/sun/star/uno/AsciiString \ + jurt/com/sun/star/uno/MappingException \ + jurt/com/sun/star/uno/WeakReference \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jurt/JunitTest_bridgefactory.mk b/jurt/JunitTest_bridgefactory.mk new file mode 100644 index 000000000000..234ae7c36298 --- /dev/null +++ b/jurt/JunitTest_bridgefactory.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,jurt_bridgefactory)) + +$(eval $(call gb_JunitTest_add_jars,jurt_bridgefactory,\ + $(OUTDIR)/bin/OOoRunnerLight.jar \ + $(OUTDIR)/bin/ridl.jar \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,jurt_bridgefactory,\ + jurt/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jurt/JunitTest_connections.mk b/jurt/JunitTest_connections.mk new file mode 100644 index 000000000000..3a722da96a05 --- /dev/null +++ b/jurt/JunitTest_connections.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,jurt_connections)) + +$(eval $(call gb_JunitTest_add_jars,jurt_connections,\ + $(OUTDIR)/bin/OOoRunnerLight.jar \ + $(OUTDIR)/bin/ridl.jar \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,jurt_connections,\ + jurt/test/com/sun/star/comp/connections/PipedConnection_Test \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jurt/JunitTest_java.mk b/jurt/JunitTest_java.mk new file mode 100644 index 000000000000..151d874a4e19 --- /dev/null +++ b/jurt/JunitTest_java.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,jurt_java)) + +$(eval $(call gb_JunitTest_add_jars,jurt_java,\ + $(OUTDIR)/bin/OOoRunnerLight.jar \ + $(OUTDIR)/bin/ridl.jar \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,jurt_java,\ + jurt/test/com/sun/star/lib/uno/environments/java/java_environment_Test \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jurt/JunitTest_java_remote.mk b/jurt/JunitTest_java_remote.mk new file mode 100644 index 000000000000..a570d7aa517a --- /dev/null +++ b/jurt/JunitTest_java_remote.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,jurt_java_remote)) + +$(eval $(call gb_JunitTest_add_jars,jurt_java_remote,\ + $(OUTDIR)/bin/OOoRunnerLight.jar \ + $(OUTDIR)/bin/ridl.jar \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,jurt_java_remote,\ + jurt/test/com/sun/star/lib/uno/bridges/java_remote/BridgedObject_Test \ + jurt/test/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory_Test \ + jurt/test/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge_Test \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jurt/JunitTest_remote.mk b/jurt/JunitTest_remote.mk new file mode 100644 index 000000000000..f66ae78fc898 --- /dev/null +++ b/jurt/JunitTest_remote.mk @@ -0,0 +1,45 @@ +# -*- 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,jurt_remote)) + +$(eval $(call gb_JunitTest_add_jars,jurt_remote,\ + $(OUTDIR)/bin/OOoRunnerLight.jar \ + $(OUTDIR)/bin/ridl.jar \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,jurt_remote,\ + jurt/test/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory_Test \ + jurt/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test \ + jurt/test/com/sun/star/lib/uno/environments/remote/TestIWorkAt \ + jurt/test/com/sun/star/lib/uno/environments/remote/TestReceiver \ + jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt \ + jurt/test/com/sun/star/lib/uno/environments/remote/ThreadId_Test \ + jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jurt/JunitTest_uno.mk b/jurt/JunitTest_uno.mk new file mode 100644 index 000000000000..2479359a0538 --- /dev/null +++ b/jurt/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,jurt_uno)) + +$(eval $(call gb_JunitTest_add_jars,jurt_uno,\ + $(OUTDIR)/bin/OOoRunnerLight.jar \ + $(OUTDIR)/bin/ridl.jar \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,jurt_uno,\ + jurt/test/com/sun/star/uno/AnyConverter_Test \ + jurt/test/com/sun/star/uno/UnoRuntime_EnvironmentTest \ + jurt/test/com/sun/star/uno/WeakReference_Test \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jurt/JunitTest_urp.mk b/jurt/JunitTest_urp.mk new file mode 100644 index 000000000000..a0e708407be2 --- /dev/null +++ b/jurt/JunitTest_urp.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_JunitTest_JunitTest,jurt_urp)) + +$(eval $(call gb_JunitTest_add_package_dependencies,jurt_urp,\ + jurt_test_urp \ +)) + +$(eval $(call gb_JunitTest_add_jars,jurt_urp,\ + $(OUTDIR)/bin/OOoRunnerLight.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(WORKDIR)/CustomTarget/jurt/test/com/sun/star/lib/uno/protocols/urp \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,jurt_urp,\ + jurt/test/com/sun/star/lib/uno/protocols/urp/Cache_Test \ + jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test \ + jurt/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test \ + jurt/test/com/sun/star/lib/uno/protocols/urp/TestBridge \ + jurt/test/com/sun/star/lib/uno/protocols/urp/TestObject \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jurt/JunitTest_util.mk b/jurt/JunitTest_util.mk new file mode 100644 index 000000000000..0ad02b91aa02 --- /dev/null +++ b/jurt/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,jurt_util)) + +$(eval $(call gb_JunitTest_add_jars,jurt_util,\ + $(OUTDIR)/bin/OOoRunnerLight.jar \ + $(OUTDIR)/bin/ridl.jar \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,jurt_util,\ + jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk new file mode 100644 index 000000000000..4a8dfe5fdc0b --- /dev/null +++ b/jurt/Library_jpipe.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 <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_Library_Library,jpipe)) + +$(eval $(call gb_Library_add_linked_libs,jpipe,\ + $(gb_STDLIBS) \ +)) + +ifeq ($(OS),WNT) + +# The real library is called jpipx on Windows. We build only a wrapper +# for it here. +$(eval $(call gb_Library_add_cobjects,jpipe,\ + jurt/source/pipe/wrapper/wrapper \ +)) + +else + +$(eval $(call gb_Library_add_linked_libs,jpipe,\ + sal \ +)) + +$(eval $(call gb_Library_add_cobjects,jpipe,\ + jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection \ +)) + +endif + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jurt/Library_jpipx.mk b/jurt/Library_jpipx.mk new file mode 100644 index 000000000000..20579f83fb13 --- /dev/null +++ b/jurt/Library_jpipx.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_Library_Library,jpipx)) + +$(eval $(call gb_Library_add_linked_libs,jpipx,\ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_cobjects,jpipx,\ + jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jurt/com/sun/star/comp/servicemanager/makefile.mk b/jurt/Makefile index 46fae35b5902..7bbbe6c703e6 100644 --- a/jurt/com/sun/star/comp/servicemanager/makefile.mk +++ b/jurt/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,19 +26,15 @@ # #************************************************************************* -PRJ = ..$/..$/..$/..$/.. -PRJNAME = jurt -PACKAGE = com$/sun$/star$/comp$/servicemanager -TARGET = com_sun_star_comp_servicemanager +gb_PARTIALBUILD := T +ifeq ($(strip $(SOLARENV)),) +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk +else -# --- Settings ----------------------------------------------------- +gb_SourceEnvAndRecurse_STAGE=gbuild +include $(SOLARENV)/gbuild/gbuild.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) -# --- Files -------------------------------------------------------- - -JAVAFILES = ServiceManager.java - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk +endif +# vim: set noet sw=4 ts=4: diff --git a/jurt/Module_jurt.mk b/jurt/Module_jurt.mk new file mode 100644 index 000000000000..50339cd8d614 --- /dev/null +++ b/jurt/Module_jurt.mk @@ -0,0 +1,64 @@ +# -*- 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,jurt)) + +ifneq ($(SOLAR_JAVA),) + +$(eval $(call gb_Module_add_targets,jurt,\ + Jar_jurt \ + Library_jpipe \ + Zip_jurt \ +)) + +ifeq ($(OS),MACOSX) +$(eval $(call gb_Module_add_targets,jurt,\ + Package_jnilib \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Module_add_targets,jurt,\ + Library_jpipx \ +)) +endif + +$(eval $(call gb_Module_add_subsequentcheck_targets,jurt,\ + JunitTest_bridgefactory \ + JunitTest_connections \ + JunitTest_java \ + JunitTest_java_remote \ + JunitTest_remote \ + JunitTest_uno \ + JunitTest_urp \ + JunitTest_util \ + Package_test_urp \ +)) + +endif + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jurt/Package_jnilib.mk b/jurt/Package_jnilib.mk new file mode 100644 index 000000000000..4ff0c6650cf7 --- /dev/null +++ b/jurt/Package_jnilib.mk @@ -0,0 +1,38 @@ +# -*- 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,jurt_jnilib,$(WORKDIR)/CustomTarget/jurt/util)) + +$(eval $(call gb_Package_add_file,lib/$(patsubst %.dylib,%.jnilib,$(call gb_Library_get_filename,jpipe)),,$(patsubst %.dylib,%.jnilib,$(call gb_Library_get_filename,jpipe)))) + +$(eval $(call gb_Package_add_customtarget,jurt_jnilib,jurt/util)) + +$(eval $(call gb_CustomTarget_add_outdir_dependencies,jurt/util,\ + $(call gb_Library_get_target,jpipe) \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jurt/Package_test_urp.mk b/jurt/Package_test_urp.mk new file mode 100644 index 000000000000..80b4870c867b --- /dev/null +++ b/jurt/Package_test_urp.mk @@ -0,0 +1,43 @@ +# -*- 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,jurt_test_urp,$(WORKDIR)/CustomTarget/jurt/test/com/sun/star/lib/uno/protocols/urp)) + +$(eval $(call gb_Package_add_customtarget,jurt_test_urp,jurt/test/com/sun/star/lib/uno/protocols/urp)) + +$(eval $(call gb_CustomTarget_add_dependencies,jurt/test/com/sun/star/lib/uno/protocols/urp,\ + jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl \ +)) + +$(eval $(call gb_CustomTarget_add_outdir_dependencies,jurt/test/com/sun/star/lib/uno/protocols/urp,\ + $(OUTDIR_FOR_BUILD)/bin/idlc$(gb_Executable_EXT_for_build) \ + $(OUTDIR_FOR_BUILD)/bin/javamaker$(gb_Executable_EXT_for_build) \ + $(OUTDIR_FOR_BUILD)/bin/regmerge$(gb_Executable_EXT_for_build) \ + $(OUTDIR)/bin/types.rdb \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jurt/Zip_jurt.mk b/jurt/Zip_jurt.mk new file mode 100644 index 000000000000..4624f219cf9b --- /dev/null +++ b/jurt/Zip_jurt.mk @@ -0,0 +1,87 @@ +# -*- 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,jurt_src,$(SRCDIR)/jurt)) + +$(eval $(call gb_Zip_add_files,jurt_src,\ + com/sun/star/comp/bridgefactory/BridgeFactory.java \ + com/sun/star/comp/connections/Acceptor.java \ + com/sun/star/comp/connections/Connector.java \ + com/sun/star/comp/connections/ConstantInstanceProvider.java \ + com/sun/star/comp/connections/Implementation.java \ + com/sun/star/comp/connections/PipedConnection.java \ + com/sun/star/comp/loader/FactoryHelper.java \ + com/sun/star/comp/loader/JavaLoader.java \ + com/sun/star/comp/loader/JavaLoaderFactory.java \ + com/sun/star/comp/loader/RegistrationClassFinder.java \ + com/sun/star/comp/servicemanager/ServiceManager.java \ + com/sun/star/comp/urlresolver/UrlResolver.java \ + com/sun/star/lib/connections/pipe/PipeConnection.java \ + com/sun/star/lib/connections/pipe/pipeAcceptor.java \ + com/sun/star/lib/connections/pipe/pipeConnector.java \ + com/sun/star/lib/connections/socket/ConnectionDescriptor.java \ + com/sun/star/lib/connections/socket/SocketConnection.java \ + com/sun/star/lib/connections/socket/socketAcceptor.java \ + com/sun/star/lib/connections/socket/socketConnector.java \ + com/sun/star/lib/uno/Proxy.java \ + com/sun/star/lib/uno/bridges/java_remote/BridgedObject.java \ + com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java \ + com/sun/star/lib/uno/bridges/java_remote/RequestHandler.java \ + com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java \ + com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java \ + com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java \ + com/sun/star/lib/uno/environments/java/java_environment.java \ + com/sun/star/lib/uno/environments/remote/IProtocol.java \ + com/sun/star/lib/uno/environments/remote/IReceiver.java \ + com/sun/star/lib/uno/environments/remote/IThreadPool.java \ + com/sun/star/lib/uno/environments/remote/JavaThreadPool.java \ + com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory.java \ + com/sun/star/lib/uno/environments/remote/Job.java \ + com/sun/star/lib/uno/environments/remote/JobQueue.java \ + com/sun/star/lib/uno/environments/remote/Message.java \ + com/sun/star/lib/uno/environments/remote/NativeThreadPool.java \ + com/sun/star/lib/uno/environments/remote/ThreadId.java \ + com/sun/star/lib/uno/environments/remote/ThreadPoolManager.java \ + com/sun/star/lib/uno/environments/remote/remote_environment.java \ + com/sun/star/lib/uno/protocols/urp/Cache.java \ + com/sun/star/lib/uno/protocols/urp/Marshal.java \ + com/sun/star/lib/uno/protocols/urp/PendingRequests.java \ + com/sun/star/lib/uno/protocols/urp/Unmarshal.java \ + com/sun/star/lib/uno/protocols/urp/UrpMessage.java \ + com/sun/star/lib/uno/protocols/urp/urp.java \ + com/sun/star/lib/util/AsynchronousFinalizer.java \ + com/sun/star/lib/util/NativeLibraryLoader.java \ + com/sun/star/lib/util/StringHelper.java \ + com/sun/star/lib/util/UrlToFileMapper.java \ + com/sun/star/uno/AnyConverter.java \ + com/sun/star/uno/Ascii.java \ + com/sun/star/uno/AsciiString.java \ + com/sun/star/uno/MappingException.java \ + com/sun/star/uno/WeakReference.java \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jurt/com/sun/star/comp/loader/makefile.mk b/jurt/com/sun/star/comp/loader/makefile.mk deleted file mode 100644 index 849509995ab5..000000000000 --- a/jurt/com/sun/star/comp/loader/makefile.mk +++ /dev/null @@ -1,47 +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 = jurt -PACKAGE = com$/sun$/star$/comp$/loader -TARGET = com_sun_star_comp_loader - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -JAVAFILES = \ - FactoryHelper.java \ - JavaLoader.java \ - JavaLoaderFactory.java \ - RegistrationClassFinder.java - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/jurt/com/sun/star/comp/urlresolver/makefile.mk b/jurt/com/sun/star/comp/urlresolver/makefile.mk deleted file mode 100644 index 20f4dd78c33e..000000000000 --- a/jurt/com/sun/star/comp/urlresolver/makefile.mk +++ /dev/null @@ -1,43 +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 = jurt -PACKAGE = com$/sun$/star$/comp$/urlresolver -TARGET = com_sun_star_comp_urlresolver - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# Files -------------------------------------------------------- - -JAVAFILES = UrlResolver.java - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/jurt/com/sun/star/lib/connections/pipe/makefile.mk b/jurt/com/sun/star/lib/connections/pipe/makefile.mk deleted file mode 100644 index d90bc63bc891..000000000000 --- a/jurt/com/sun/star/lib/connections/pipe/makefile.mk +++ /dev/null @@ -1,41 +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 = jurt -TARGET = com_sun_star_connections_pipe - -PACKAGE = com$/sun$/star$/lib$/connections$/pipe - -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -JAVAFILES = \ - PipeConnection.java \ - pipeAcceptor.java \ - pipeConnector.java - -.INCLUDE: target.mk diff --git a/jurt/com/sun/star/lib/connections/socket/makefile.mk b/jurt/com/sun/star/lib/connections/socket/makefile.mk deleted file mode 100644 index a1e437abb605..000000000000 --- a/jurt/com/sun/star/lib/connections/socket/makefile.mk +++ /dev/null @@ -1,42 +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 = jurt -TARGET = com_sun_star_connections_socket - -PACKAGE = com$/sun$/star$/lib$/connections$/socket - -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -JAVAFILES = \ - ConnectionDescriptor.java \ - SocketConnection.java \ - socketAcceptor.java \ - socketConnector.java - -.INCLUDE: target.mk diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/makefile.mk b/jurt/com/sun/star/lib/uno/bridges/java_remote/makefile.mk deleted file mode 100644 index 513565ccdfc2..000000000000 --- a/jurt/com/sun/star/lib/uno/bridges/java_remote/makefile.mk +++ /dev/null @@ -1,44 +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 := jurt - -TARGET := com_sun_star_lib_uno_bridges_java_remote -PACKAGE = com$/sun$/star$/lib$/uno$/bridges$/java_remote - -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -JAVAFILES = \ - BridgedObject.java \ - ProxyFactory.java \ - RequestHandler.java \ - XConnectionInputStream_Adapter.java \ - XConnectionOutputStream_Adapter.java \ - java_remote_bridge.java - -.INCLUDE: target.mk diff --git a/jurt/com/sun/star/lib/uno/environments/java/makefile.mk b/jurt/com/sun/star/lib/uno/environments/java/makefile.mk deleted file mode 100644 index de9bb6178f4f..000000000000 --- a/jurt/com/sun/star/lib/uno/environments/java/makefile.mk +++ /dev/null @@ -1,44 +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 = jurt -PACKAGE = com$/sun$/star$/lib$/uno$/environments$/java -TARGET = com_sun_star_lib_uno_environments_java - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -JAVAFILES = java_environment.java - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/jurt/com/sun/star/lib/uno/environments/remote/makefile.mk b/jurt/com/sun/star/lib/uno/environments/remote/makefile.mk deleted file mode 100644 index cc4a7fe7ae83..000000000000 --- a/jurt/com/sun/star/lib/uno/environments/remote/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 -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ := ..$/..$/..$/..$/..$/..$/.. -PRJNAME := jurt - -TARGET := com_sun_star_lib_uno_environments_remote -PACKAGE := com$/sun$/star$/lib$/uno$/environments$/remote - -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -JAVAFILES = \ - IProtocol.java \ - IReceiver.java \ - IThreadPool.java \ - JavaThreadPool.java \ - JavaThreadPoolFactory.java \ - Job.java \ - JobQueue.java \ - Message.java \ - NativeThreadPool.java \ - ThreadId.java \ - ThreadPoolManager.java \ - remote_environment.java - -.INCLUDE: target.mk diff --git a/jurt/com/sun/star/lib/uno/makefile.mk b/jurt/com/sun/star/lib/uno/makefile.mk deleted file mode 100644 index 6270e78ce94b..000000000000 --- a/jurt/com/sun/star/lib/uno/makefile.mk +++ /dev/null @@ -1,37 +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 = jurt -TARGET = com_sun_star_lib_uno -PACKAGE = com$/sun$/star$/lib$/uno - -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -JAVAFILES = Proxy.java - -.INCLUDE: target.mk diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/makefile.mk b/jurt/com/sun/star/lib/uno/protocols/urp/makefile.mk deleted file mode 100644 index c1b7357f2a06..000000000000 --- a/jurt/com/sun/star/lib/uno/protocols/urp/makefile.mk +++ /dev/null @@ -1,44 +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 := jurt - -TARGET := com_sun_star_lib_uno_protocols_urp -PACKAGE := com$/sun$/star$/lib$/uno$/protocols$/urp - -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -JAVAFILES = \ - Cache.java \ - Marshal.java \ - PendingRequests.java \ - Unmarshal.java \ - UrpMessage.java \ - urp.java - -.INCLUDE: target.mk diff --git a/jurt/com/sun/star/lib/util/makefile.mk b/jurt/com/sun/star/lib/util/makefile.mk deleted file mode 100644 index 323e0dd6f376..000000000000 --- a/jurt/com/sun/star/lib/util/makefile.mk +++ /dev/null @@ -1,42 +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 := jurt - -TARGET := com_sun_star_lib_util -PACKAGE := com$/sun$/star$/lib$/util - -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -JAVAFILES = \ - AsynchronousFinalizer.java \ - NativeLibraryLoader.java \ - StringHelper.java \ - UrlToFileMapper.java - -.INCLUDE: target.mk diff --git a/jurt/com/sun/star/uno/makefile.mk b/jurt/com/sun/star/uno/makefile.mk deleted file mode 100644 index 7ab00265e065..000000000000 --- a/jurt/com/sun/star/uno/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 = jurt -PACKAGE = com$/sun$/star$/uno -TARGET = com_sun_star_uno - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -JAVAFILES = \ - AnyConverter.java \ - Ascii.java \ - AsciiString.java \ - MappingException.java \ - WeakReference.java - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -doc: - pwd - cd $(PRJ) && javadoc -sourcepath /usr/local/java/src:unxlngi3.pro/japi:.:../jlibs com.sun.star.lib.util com.sun.star.uno com.sun.star.lib.uno.typeinfo com.sun.star.lib.uno.environments.java com.sun.star.lib.uno.environments.remote com.sun.star.lib.uno.protocols.iiop com.sun.star.lib.uno.bridges.java_remote com.sun.star.comp.loader com.sun.star.comp.connections -d unxlngi3.pro/doc diff --git a/jurt/prj/build.lst b/jurt/prj/build.lst index 6ba92a9ec6b6..04c849ed4444 100644 --- a/jurt/prj/build.lst +++ b/jurt/prj/build.lst @@ -1,20 +1,3 @@ ju jurt : ridljar sal NULL ju jurt usr1 - all ju_mkout NULL -ju jurt\com\sun\star\lib\util nmake - all ju_libutil NULL -ju jurt\com\sun\star\uno nmake - all ju_uno NULL -ju jurt\com\sun\star\comp\loader nmake - all ju_co_loader ju_uno ju_libutil NULL -ju jurt\com\sun\star\comp\bridgefactory nmake - all ju_co_bfactr ju_co_loader NULL -ju jurt\com\sun\star\lib\uno nmake - all ju_cssl_uno NULL -ju jurt\com\sun\star\lib\uno\environments\java nmake - all ju_env_java ju_cssl_uno NULL -ju jurt\com\sun\star\lib\uno\environments\remote nmake - all ju_env_remote ju_env_java NULL -ju jurt\com\sun\star\lib\uno\protocols\urp nmake - all ju_prot_urp ju_env_remote NULL -ju jurt\com\sun\star\lib\uno\bridges\java_remote nmake - all ju_brid_jrm ju_co_loader ju_cssl_uno ju_env_remote NULL -ju jurt\com\sun\star\lib\connections\socket nmake - all ju_con_sock ju_co_loader NULL -ju jurt\com\sun\star\lib\connections\pipe nmake - all ju_con_pipe ju_co_loader ju_libutil NULL -ju jurt\com\sun\star\comp\connections nmake - all ju_con ju_co_loader NULL -ju jurt\com\sun\star\comp\servicemanager nmake - all ju_servman NULL -ju jurt\com\sun\star\comp\urlresolver nmake - all ju_urlres ju_co_loader NULL -ju jurt\source\pipe nmake - all ju_src_pipe NULL -ju jurt\source\pipe\wrapper nmake - w ju_src_pipe_wrapper NULL -ju jurt\util nmake - all ju_ut ju_brid_jrm ju_co_bfactr ju_con ju_con_sock ju_con_pipe ju_cssl_uno ju_env_java ju_prot_urp ju_servman ju_urlres ju_src_pipe ju_libutil ju_uno NULL -ju jurt\test\com\sun\star\lib\uno\protocols\urp nmake - all ju_test_css_lib_uno_protocols_urp NULL +ju jurt\prj nmake - all ju_prj NULL diff --git a/jurt/prj/d.lst b/jurt/prj/d.lst index 3459df62ba16..e69de29bb2d1 100644 --- a/jurt/prj/d.lst +++ b/jurt/prj/d.lst @@ -1,8 +0,0 @@ -..\%__SRC%\class\jurt.jar %_DEST%\bin\jurt.jar -..\%__SRC%\bin\jpipe.dll %_DEST%\bin\jpipe.dll -..\%__SRC%\bin\jpipx.dll %_DEST%\bin\jpipx.dll -..\%__SRC%\lib\libjpipe*.so %_DEST%\lib\libjpipe*.so -..\%__SRC%\lib\libjpipe.jnilib %_DEST%\lib\libjpipe.jnilib -..\%__SRC%\lib\libjpipe*.jnilib %_DEST%\lib\libjpipe*.jnilib - -..\%__SRC%\bin\jurt_src.zip %COMMON_DEST%\bin\jurt_src.zip diff --git a/jurt/prj/makefile.mk b/jurt/prj/makefile.mk new file mode 100644 index 000000000000..0997622e00f6 --- /dev/null +++ b/jurt/prj/makefile.mk @@ -0,0 +1 @@ +.INCLUDE : gbuildbridge.mk diff --git a/jurt/source/pipe/makefile.mk b/jurt/source/pipe/makefile.mk deleted file mode 100644 index 4a6dc59c89c2..000000000000 --- a/jurt/source/pipe/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 -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#***********************************************************************/ - -PRJ = ../.. -PRJNAME = jurt -TARGET = jpipe - -NO_DEFAULT_STL = TRUE -VISIBILITY_HIDDEN = TRUE - -.INCLUDE: settings.mk - -.IF "$(OS)" == "WNT" -SHL1TARGET = jpipx -.ELSE -SHL1TARGET = jpipe -.END - -SHL1CODETYPE = C -SHL1CREATEJNILIB=TRUE -SHL1IMPLIB = i$(SHL1TARGET) -SHL1OBJS = $(SLO)/com_sun_star_lib_connections_pipe_PipeConnection.obj -SHL1RPATH = URELIB -SHL1STDLIBS = $(SALLIB) -SHL1USE_EXPORTS = name -DEF1NAME = $(SHL1TARGET) - -SLOFILES = $(SHL1OBJS) - -.IF "$(SOLAR_JAVA)" == "" -nothing .PHONY : -.END - -.INCLUDE: target.mk diff --git a/jurt/source/pipe/wrapper/makefile.mk b/jurt/source/pipe/wrapper/makefile.mk deleted file mode 100644 index 88a3b160da2e..000000000000 --- a/jurt/source/pipe/wrapper/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 = jurt -TARGET = wrapper - -NO_DEFAULT_STL = TRUE -UWINAPILIB = -VISIBILITY_HIDDEN = TRUE - -.INCLUDE: settings.mk - -SHL1CODETYPE = C -SHL1IMPLIB = i$(SHL1TARGET) -SHL1OBJS = $(SLO)/wrapper.obj -SHL1RPATH = URELIB -SHL1TARGET = jpipe -SHL1USE_EXPORTS = name -DEF1NAME = $(SHL1TARGET) - -SLOFILES = $(SHL1OBJS) - -.IF "$(SOLAR_JAVA)" == "" -nothing .PHONY : -.END - -.INCLUDE: target.mk diff --git a/jurt/test/com/sun/star/comp/bridgefactory/makefile.mk b/jurt/test/com/sun/star/comp/bridgefactory/makefile.mk deleted file mode 100644 index 6de5c582ec83..000000000000 --- a/jurt/test/com/sun/star/comp/bridgefactory/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 := jurt -TARGET := test_com_sun_star_comp_bridgefactory - -PACKAGE := com$/sun$/star$/comp$/bridgefactory -JAVATESTFILES := BridgeFactory_Test.java -JARFILES := ridl.jar - -.INCLUDE: javaunittest.mk diff --git a/jurt/test/com/sun/star/comp/connections/makefile.mk b/jurt/test/com/sun/star/comp/connections/makefile.mk deleted file mode 100644 index d311cd0b9c07..000000000000 --- a/jurt/test/com/sun/star/comp/connections/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 := jurt -TARGET := test_com_sun_star_comp_connections - -PACKAGE := com$/sun$/star$/comp$/connections -JAVATESTFILES := PipedConnection_Test.java -JARFILES := ridl.jar - -.INCLUDE: javaunittest.mk diff --git a/jurt/test/com/sun/star/lib/uno/bridges/java_remote/makefile.mk b/jurt/test/com/sun/star/lib/uno/bridges/java_remote/makefile.mk deleted file mode 100644 index 49ae7f408837..000000000000 --- a/jurt/test/com/sun/star/lib/uno/bridges/java_remote/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 := jurt -TARGET := test_com_sun_star_lib_uno_bridges_java_remote - -PACKAGE := com$/sun$/star$/lib$/uno$/bridges$/java_remote -JAVATESTFILES := \ - BridgedObject_Test.java \ - ProxyFactory_Test.java \ - java_remote_bridge_Test.java -JARFILES := ridl.jar - -.INCLUDE: javaunittest.mk diff --git a/jurt/test/com/sun/star/lib/uno/environments/java/makefile.mk b/jurt/test/com/sun/star/lib/uno/environments/java/makefile.mk deleted file mode 100644 index ad49dccef88b..000000000000 --- a/jurt/test/com/sun/star/lib/uno/environments/java/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 := jurt -TARGET := test_com_sun_star_lib_uno_environments_java - -PACKAGE := com$/sun$/star$/lib$/uno$/environments$/java -JAVATESTFILES := java_environment_Test.java -JARFILES := ridl.jar - -.INCLUDE: javaunittest.mk diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/TestMessage.java b/jurt/test/com/sun/star/lib/uno/environments/remote/TestMessage.java deleted file mode 100644 index f47048e423ed..000000000000 --- a/jurt/test/com/sun/star/lib/uno/environments/remote/TestMessage.java +++ /dev/null @@ -1,89 +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. - * - ************************************************************************/ -package com.sun.star.lib.uno.environments.remote; - - -import com.sun.star.uno.Type; - -import com.sun.star.uno.ITypeDescription; - - -class TestMessage implements IMessage { - boolean _synchron; - ITypeDescription _iTypeDescription; - String _oid; - ThreadId _threadId; - Object _result; - String _operation; - Object _params[]; - - TestMessage(boolean synchron, ITypeDescription iTypeDescription, String oid, ThreadId threadId, Object result, String operation, Object params[]) { - _synchron = synchron; - _iTypeDescription = iTypeDescription; - _oid = oid; - _threadId = threadId; - _result = result; - _operation = operation; - _params = params; - } - - public String getOperation() { - return _operation; - } - - public ThreadId getThreadId() { - return _threadId; - } - - public ITypeDescription getInterface() { - return _iTypeDescription; - } - - public boolean isSynchron() { - return _synchron; - } - - public boolean mustReply() { - return _synchron; - } - - public boolean isException() { - return false; - } - - public String getOid() { - return _oid; - } - - public Object getData(Object params[][]) { - params[0] = _params; - return _result; -// return new Integer(_requestId); - } -} - - diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/makefile.mk b/jurt/test/com/sun/star/lib/uno/environments/remote/makefile.mk deleted file mode 100644 index e2323a54b497..000000000000 --- a/jurt/test/com/sun/star/lib/uno/environments/remote/makefile.mk +++ /dev/null @@ -1,44 +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 := jurt -TARGET := test_com_sun_star_lib_uno_environments_remote - -PACKAGE := com$/sun$/star$/lib$/uno$/environments$/remote -JAVATESTFILES := \ - JavaThreadPoolFactory_Test.java \ - JobQueue_Test.java \ - ThreadId_Test.java \ - ThreadPool_Test.java -JAVAFILES := \ - TestIWorkAt.java \ - TestReceiver.java \ - TestWorkAt.java -JARFILES := ridl.jar - -.INCLUDE: javaunittest.mk diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/Makefile b/jurt/test/com/sun/star/lib/uno/protocols/urp/Makefile new file mode 100644 index 000000000000..ffc0cd8c73dd --- /dev/null +++ b/jurt/test/com/sun/star/lib/uno/protocols/urp/Makefile @@ -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. + +gb_PARTIALBUILD := T +include $(GBUILDDIR)/gbuild_simple.mk + +done : registry.rdb + $(call gb_Helper_execute,javamaker -BUCR -O$(dir .) -nD $< -X$(OUTDIR)/bin/types.rdb) && \ + touch $@ + +# TODO: would it be possible to reuse UnoApiTarget for this? +registry.rdb : interfaces.urd + rm -f $@ && \ + $(call gb_Helper_execute,regmerge $@ /UCR $<) + +interfaces.urd : $(SRCDIR)/jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl + mkdir urd && \ + $(call gb_Helper_execute,idlc -O$(dir ./urd) -I$(OUTDIR)/idl -cid -we $<) + +.DEFAULT_GOAL := all +.PHONY : all +all : done + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/makefile.mk b/jurt/test/com/sun/star/lib/uno/protocols/urp/makefile.mk deleted file mode 100644 index 8403b2bd71ed..000000000000 --- a/jurt/test/com/sun/star/lib/uno/protocols/urp/makefile.mk +++ /dev/null @@ -1,51 +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. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ := ..$/..$/..$/..$/..$/..$/..$/.. -PRJNAME := jurt -TARGET := test_com_sun_star_lib_uno_protocols_urp - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE := com$/sun$/star$/lib$/uno$/protocols$/urp -JAVATESTFILES := \ - Cache_Test.java \ - Marshaling_Test.java \ - Protocol_Test.java -JAVAFILES := \ - TestBridge.java \ - TestObject.java -JARFILES := ridl.jar -IDLTESTFILES := interfaces.idl -.END - -.INCLUDE: javaunittest.mk - -.END diff --git a/jurt/test/com/sun/star/lib/util/makefile.mk b/jurt/test/com/sun/star/lib/util/makefile.mk deleted file mode 100644 index dd411062329f..000000000000 --- a/jurt/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 := jurt -TARGET := test_com_sun_star_lib_util - -PACKAGE := com$/sun$/star$/lib$/util -JAVATESTFILES := \ - NativeLibraryLoader_Test.java - -.INCLUDE: javaunittest.mk diff --git a/jurt/test/com/sun/star/uno/makefile.mk b/jurt/test/com/sun/star/uno/makefile.mk deleted file mode 100644 index ecf0115c3441..000000000000 --- a/jurt/test/com/sun/star/uno/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 := jurt -TARGET := test_com_sun_star_uno - -PACKAGE := com$/sun$/star$/uno -JAVATESTFILES := \ - AnyConverter_Test.java \ - UnoRuntime_EnvironmentTest.java \ - WeakReference_Test.java -JARFILES := ridl.jar - -.INCLUDE: javaunittest.mk diff --git a/jurt/test/makefile.mk b/jurt/test/makefile.mk deleted file mode 100644 index 146480c6db39..000000000000 --- a/jurt/test/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. -# -#************************************************************************* -# 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/comp/bridgefactory && dmake - cd com/sun/star/comp/connections && dmake - cd com/sun/star/lib/uno/bridges/java_remote && dmake - cd com/sun/star/lib/uno/environments/java && dmake - cd com/sun/star/lib/uno/environments/remote && dmake - cd com/sun/star/lib/uno/protocols/urp && dmake - cd com/sun/star/lib/util && dmake - cd com/sun/star/uno && dmake diff --git a/jurt/util/Makefile b/jurt/util/Makefile new file mode 100644 index 000000000000..3230b22ce7e8 --- /dev/null +++ b/jurt/util/Makefile @@ -0,0 +1,38 @@ +# -*- 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_PARTIALBUID := T +include $(GBUILDDIR)/gbuild.mk + +libjpipe.jnilib : + $(SOLARENV)/bin/macosx-create-bundle $(call gb_Library_get_target,jpipe) + +.DEFAULT_GOAL := all +.PHONY : all +all : libjpipe.jnilib + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/jurt/util/delzip b/jurt/util/delzip deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/jurt/util/delzip +++ /dev/null diff --git a/jurt/util/makefile.mk b/jurt/util/makefile.mk deleted file mode 100644 index fdc672ae6f09..000000000000 --- a/jurt/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 = jurt -TARGET = jurt - -# --- Settings ----------------------------------------------------- - -.INCLUDE: makefile.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 diff --git a/jurt/util/makefile.pmk b/jurt/util/makefile.pmk deleted file mode 100644 index 08df516ea3b0..000000000000 --- a/jurt/util/makefile.pmk +++ /dev/null @@ -1,32 +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. -# -#************************************************************************* - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -JARFILES = ridl.jar unoloader.jar diff --git a/jvmaccess/Library_jvmaccess.mk b/jvmaccess/Library_jvmaccess.mk new file mode 100644 index 000000000000..98bfb46a93c4 --- /dev/null +++ b/jvmaccess/Library_jvmaccess.mk @@ -0,0 +1,62 @@ +# -*- 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_Library_Library,jvmaccess)) + +$(eval $(call gb_Library_set_soversion_script,jvmaccess,3,$(SRCDIR)/jvmaccess/util/gcc3.map)) + +$(eval $(call gb_Library_add_package_headers,jvmaccess,\ + jvmaccess_inc \ +)) + +$(eval $(call gb_Library_add_defs,jvmaccess,\ + -DJVMACCESS_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_api,jvmaccess,\ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,jvmaccess,\ + cppu \ + sal \ + salhelper \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,jvmaccess,\ + advapi32 \ +)) +endif + +$(eval $(call gb_Library_add_exception_objects,jvmaccess,\ + jvmaccess/source/classpath \ + jvmaccess/source/unovirtualmachine \ + jvmaccess/source/virtualmachine \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jurt/com/sun/star/comp/bridgefactory/makefile.mk b/jvmaccess/Makefile index fa1c7345e9a1..7bbbe6c703e6 100644 --- a/jurt/com/sun/star/comp/bridgefactory/makefile.mk +++ b/jvmaccess/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,19 +26,15 @@ # #************************************************************************* -PRJ = ..$/..$/..$/..$/.. -PRJNAME = jurt -PACKAGE = com$/sun$/star$/comp$/bridgefactory -TARGET = com_sun_star_comp_bridgefactory +gb_PARTIALBUILD := T +ifeq ($(strip $(SOLARENV)),) +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk +else -# --- Settings ----------------------------------------------------- +gb_SourceEnvAndRecurse_STAGE=gbuild +include $(SOLARENV)/gbuild/gbuild.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) -# --- Files -------------------------------------------------------- - -JAVAFILES = BridgeFactory.java - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk +endif +# vim: set noet sw=4 ts=4: diff --git a/jvmaccess/Module_jvmaccess.mk b/jvmaccess/Module_jvmaccess.mk new file mode 100644 index 000000000000..a760e7659392 --- /dev/null +++ b/jvmaccess/Module_jvmaccess.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 <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,jvmaccess)) + +$(eval $(call gb_Module_add_targets,jvmaccess,\ + Package_inc \ +)) + +ifneq ($(OS),IOS) +$(eval $(call gb_Module_add_targets,jvmaccess,\ + Library_jvmaccess \ +)) +endif + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jvmaccess/Package_inc.mk b/jvmaccess/Package_inc.mk new file mode 100644 index 000000000000..ef2d5f05fb0d --- /dev/null +++ b/jvmaccess/Package_inc.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_Package_Package,jvmaccess_inc,$(SRCDIR)/jvmaccess/inc/jvmaccess)) + +$(eval $(call gb_Package_add_file,jvmaccess_inc,inc/jvmaccess/classpath.hxx,classpath.hxx)) +$(eval $(call gb_Package_add_file,jvmaccess_inc,inc/jvmaccess/jvmaccessdllapi.h,jvmaccessdllapi.h)) +$(eval $(call gb_Package_add_file,jvmaccess_inc,inc/jvmaccess/unovirtualmachine.hxx,unovirtualmachine.hxx)) +$(eval $(call gb_Package_add_file,jvmaccess_inc,inc/jvmaccess/virtualmachine.hxx,virtualmachine.hxx)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jvmaccess/inc/jvmaccess/classpath.hxx b/jvmaccess/inc/jvmaccess/classpath.hxx index 917bfbd9f00e..35b2698c5f5d 100644 --- a/jvmaccess/inc/jvmaccess/classpath.hxx +++ b/jvmaccess/inc/jvmaccess/classpath.hxx @@ -29,6 +29,7 @@ #ifndef INCLUDED_JVMACCESS_CLASSPATH_HXX #define INCLUDED_JVMACCESS_CLASSPATH_HXX +#include "jvmaccessdllapi.h" #include "sal/config.h" #include "com/sun/star/uno/Reference.hxx" @@ -50,7 +51,7 @@ namespace jvmaccess { /** Helper functions for class path handling. */ -class ClassPath { +class JVMACCESS_DLLPUBLIC ClassPath { public: /** translates a class path into a java.net.URL[] instance. diff --git a/jvmaccess/inc/jvmaccess/jvmaccessdllapi.h b/jvmaccess/inc/jvmaccess/jvmaccessdllapi.h new file mode 100644 index 000000000000..08f7a593a0d6 --- /dev/null +++ b/jvmaccess/inc/jvmaccess/jvmaccessdllapi.h @@ -0,0 +1,44 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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. + */ + +#ifndef INCLUDED_JVMACCESS_JVMACCESSDLLAPI_H +#define INCLUDED_JVMACCESS_JVMACCESSDLLAPI_H + +#include <sal/types.h> + +#if defined JVMACCESS_DLLIMPLEMENTATION +# define JVMACCESS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +# define JVMACCESS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif +#define JVMACCESS_DLLPRIVATE SAL_DLLPRIVATE + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx b/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx index b14aeda2978c..eeab866a7cb9 100644 --- a/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx +++ b/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx @@ -29,6 +29,7 @@ #ifndef INCLUDED_JVMACCESS_UNOVIRTUALMACHINE_HXX #define INCLUDED_JVMACCESS_UNOVIRTUALMACHINE_HXX +#include "jvmaccessdllapi.h" #include "sal/config.h" #include "salhelper/simplereferenceobject.hxx" #include "rtl/ref.hxx" @@ -40,11 +41,11 @@ class VirtualMachine; /** An encapsulating wrapper around a Java virtual machine and an appropriate UNO class loader. */ -class UnoVirtualMachine: public salhelper::SimpleReferenceObject { +class JVMACCESS_DLLPUBLIC UnoVirtualMachine: public salhelper::SimpleReferenceObject { public: /** An exception indicating failure to create a UnoVirtualMachine. */ - class CreationException + class JVMACCESS_DLLPUBLIC CreationException { public: CreationException(); diff --git a/jvmaccess/inc/jvmaccess/virtualmachine.hxx b/jvmaccess/inc/jvmaccess/virtualmachine.hxx index 3bffbc834f90..4043c932632e 100644 --- a/jvmaccess/inc/jvmaccess/virtualmachine.hxx +++ b/jvmaccess/inc/jvmaccess/virtualmachine.hxx @@ -29,6 +29,7 @@ #if !defined INCLUDED_JVMACCESS_VIRTUALMACHINE_HXX #define INCLUDED_JVMACCESS_VIRTUALMACHINE_HXX +#include "jvmaccessdllapi.h" #include "rtl/ref.hxx" #include "salhelper/simplereferenceobject.hxx" @@ -47,7 +48,7 @@ namespace jvmaccess { /** An encapsulating wrapper around a Java virtual machine. */ -class VirtualMachine: public salhelper::SimpleReferenceObject +class JVMACCESS_DLLPUBLIC VirtualMachine: public salhelper::SimpleReferenceObject { public: /** A helper to attach a thread to a Java virtual machine. @@ -60,12 +61,12 @@ public: detach the thread from the virtual machine upon destruction of the guard at the bottom of the stack). */ - class AttachGuard + class JVMACCESS_DLLPUBLIC AttachGuard { public: /** An exception indicating failure to create an AttachGuard. */ - class CreationException + class JVMACCESS_DLLPUBLIC CreationException { public: CreationException(); diff --git a/jvmaccess/prj/build.lst b/jvmaccess/prj/build.lst index 723c0a6ec6b8..bf0f20f26e76 100644 --- a/jvmaccess/prj/build.lst +++ b/jvmaccess/prj/build.lst @@ -1,4 +1,3 @@ jv jvmaccess : offapi ridljar cppu sal salhelper NULL jv jvmaccess usr1 - all jv_mkout NULL -jv jvmaccess\source nmake - all jv_source NULL -jv jvmaccess\util nmake - all jv_util jv_source NULL +jv jvmaccess\prj nmake - all jv_prj NULL diff --git a/jvmaccess/prj/d.lst b/jvmaccess/prj/d.lst index 56d9e83269e9..e69de29bb2d1 100644 --- a/jvmaccess/prj/d.lst +++ b/jvmaccess/prj/d.lst @@ -1,8 +0,0 @@ -mkdir: %_DEST%\inc\jvmaccess -..\inc\jvmaccess\classpath.hxx %_DEST%\inc\jvmaccess\classpath.hxx -..\inc\jvmaccess\unovirtualmachine.hxx %_DEST%\inc\jvmaccess\unovirtualmachine.hxx -..\inc\jvmaccess\virtualmachine.hxx %_DEST%\inc\jvmaccess\virtualmachine.hxx -..\%__SRC%\bin\jvmacces*.dll %_DEST%\bin\* -..\%__SRC%\lib\ijvmaccess.lib %_DEST%\lib\ijvmaccess.lib -..\%__SRC%\lib\libjvmaccess*.* %_DEST%\lib\* -linklib: libjvmaccess*.*.* diff --git a/jvmaccess/prj/makefile.mk b/jvmaccess/prj/makefile.mk new file mode 100644 index 000000000000..0997622e00f6 --- /dev/null +++ b/jvmaccess/prj/makefile.mk @@ -0,0 +1 @@ +.INCLUDE : gbuildbridge.mk diff --git a/jvmaccess/source/makefile.mk b/jvmaccess/source/makefile.mk deleted file mode 100644 index 39aad375fa4c..000000000000 --- a/jvmaccess/source/makefile.mk +++ /dev/null @@ -1,48 +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 = jvmaccess -TARGET = $(PRJNAME) - -ENABLE_EXCEPTIONS = TRUE - -.INCLUDE: settings.mk - -.IF "$(OS)" == "IOS" - -ALL: -# nothing - -.ENDIF - -SLOFILES = \ - $(SLO)$/classpath.obj \ - $(SLO)$/unovirtualmachine.obj \ - $(SLO)$/virtualmachine.obj - -.INCLUDE: target.mk diff --git a/jvmaccess/util/cc5_solaris_sparc.map b/jvmaccess/util/cc5_solaris_sparc.map deleted file mode 100644 index e2cb767dc65e..000000000000 --- a/jvmaccess/util/cc5_solaris_sparc.map +++ /dev/null @@ -1,81 +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. -# -#************************************************************************* - -UDK_3.1 { - global: - # jvmaccess/virtualmachine.hxx: - __1cJjvmaccessOVirtualMachineLAttachGuardRCreationException2t6M_v_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException() - __1cJjvmaccessOVirtualMachineLAttachGuardRCreationException2t6Mrk3_v_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const &) - __1cJjvmaccessOVirtualMachineLAttachGuardRCreationException2T6M_v_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException() - __1cJjvmaccessOVirtualMachineLAttachGuardRCreationException2G6Mrk3_r3_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::operator =(CreationException const &) - __1cJjvmaccesscO__RTTI__1nJjvmaccessOVirtualMachineLAttachGuardRCreationException__; # RTTI for jvmaccess::VirtualMachine::AttachGuard::CreationException - __1cJjvmaccessOVirtualMachineLAttachGuard2t6MrknDrtlJReference4n0B____v_; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &) - __1cJjvmaccessOVirtualMachineLAttachGuard2t5B6MrknDrtlJReference4n0B____v_; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &) #Nvariant 1 - __1cJjvmaccessOVirtualMachineLAttachGuard2T6M_v_; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard() - __1cJjvmaccessOVirtualMachineLAttachGuard2T5B6M_v_; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard() #Nvariant 1 - __1cJjvmaccessOVirtualMachine2t6MpnHJavaVM__ibpnHJNIEnv___v_; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *) - - local: - *; -}; - -UDK_3.2 { - global: - # initially forgotten jvmaccess/virtualmachine.hxx: - __1cJjvmaccessOVirtualMachineLAttachGuardRCreationException2t5B6M_v_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException() #Nvariant 1 - __1cJjvmaccessOVirtualMachineLAttachGuardRCreationException2t5B6Mrk3_v_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const &) #Nvariant 1 - __1cJjvmaccessOVirtualMachineLAttachGuardRCreationException2T5B6M_v_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException() #Nvariant 1 - __1cJjvmaccesscQ__RTTI__1CpnJjvmaccessOVirtualMachineLAttachGuardRCreationException__; # RTTI for jvmaccess::VirtualMachine::AttachGuard::CreationException * - __1cJjvmaccesscR__RTTI__1CpknJjvmaccessOVirtualMachineLAttachGuardRCreationException__; # RTTI for jvmaccess::VirtualMachine::AttachGuard::CreationException const * - __1cJjvmaccessOVirtualMachine2t5B6MpnHJavaVM__ibpnHJNIEnv___v_; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *) #Nvariant 1 -} UDK_3.1; - -UDK_3.3 { - global: - # jvmaccess/unovirtualmachine.hxx: - __1cJjvmaccessRUnoVirtualMachineRCreationException2t6M_v_; # jvmaccess::UnoVirtualMachine::CreationException::CreationException() - __1cJjvmaccessRUnoVirtualMachineRCreationException2t5B6M_v_; # jvmaccess::UnoVirtualMachine::CreationException::CreationException() #Nvariant 1 - __1cJjvmaccessRUnoVirtualMachineRCreationException2t6Mrk2_v_; # jvmaccess::UnoVirtualMachine::CreationException::CreationException(CreationException const &) - __1cJjvmaccessRUnoVirtualMachineRCreationException2t5B6Mrk2_v_; # jvmaccess::UnoVirtualMachine::CreationException::CreationException(CreationException const &) #Nvariant 1 - __1cJjvmaccessRUnoVirtualMachineRCreationException2T6M_v_; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException() - __1cJjvmaccessRUnoVirtualMachineRCreationException2T5B6M_v_; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException() #Nvariant 1 - __1cJjvmaccessRUnoVirtualMachineRCreationException2G6Mrk2_r2_; # jvmaccess::UnoVirtualMachine::CreationException::operator =(CreationException const &) - __1cJjvmaccesscF__RTTI__1nJjvmaccessRUnoVirtualMachineRCreationException__; # RTTI for jvmaccess::UnoVirtualMachine::CreationException - __1cJjvmaccesscH__RTTI__1CpnJjvmaccessRUnoVirtualMachineRCreationException__; # RTTI for jvmaccess::UnoVirtualMachine::CreationException * - __1cJjvmaccesscI__RTTI__1CpknJjvmaccessRUnoVirtualMachineRCreationException__; # RTTI for jvmaccess::UnoVirtualMachine::CreationException const * - __1cJjvmaccessRUnoVirtualMachine2t6MrknDrtlJReference4n0AOVirtualMachine___pv_v_; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *) - __1cJjvmaccessRUnoVirtualMachine2t5B6MrknDrtlJReference4n0AOVirtualMachine___pv_v_; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *) #Nvariant 1 - __1cJjvmaccessRUnoVirtualMachineRgetVirtualMachine6kM_nDrtlJReference4n0AOVirtualMachine____; # jvmaccess::UnoVirtualMachine::getVirtualMachine() const - __1cJjvmaccessRUnoVirtualMachineOgetClassLoader6kM_pv_; # jvmaccess::UnoVirtualMachine::getClassLoader() const -} UDK_3.2; - -UDK_3.4 { # OOo 2.3 - global: - # jvmaccess/classpath.hxx: - __1cJjvmaccessJClassPathLdoLoadClass6FrknDcomDsunEstarDunoJReference4n0FRXComponentContext___pvrknDrtlIOUString_9E_9A_; # jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &, rtl::OUString const &) - __1cJjvmaccessJClassPathRdoTranslateToUrls6FrknDcomDsunEstarDunoJReference4n0FRXComponentContext___pvrknDrtlIOUString__9A_; # jvmaccess::ClassPath::doTranslateToUrls(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &) -} UDK_3.3; diff --git a/jvmaccess/util/gcc3.map b/jvmaccess/util/gcc3.map index 330651a1cf6e..42cd8e1a048d 100644 --- a/jvmaccess/util/gcc3.map +++ b/jvmaccess/util/gcc3.map @@ -86,3 +86,15 @@ UDK_3.4 { # OOo 2.3 _ZN9jvmaccess9ClassPath11doLoadClassERKN3com3sun4star3uno9ReferenceINS4_17XComponentContextEEEPvRKN3rtl8OUStringESE_; # jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &, rtl::OUString const &) _ZN9jvmaccess9ClassPath17doTranslateToUrlsERKN3com3sun4star3uno9ReferenceINS4_17XComponentContextEEEPvRKN3rtl8OUStringE; # jvmaccess::ClassPath::doTranslateToUrls(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &) } UDK_3.3; + +UDK_3.5 { # LibO 3.6 + global: + # jvmaccess/unovirtualmachine.hxx: + _ZTIN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo for jvmaccess::UnoVirtualMachine::CreationException + _ZTSN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo name for jvmaccess::UnoVirtualMachine::CreationException + _ZTVN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # vtable for jvmaccess::UnoVirtualMachine::CreationException + # jvmaccess/virtualmachine.hxx: + _ZTIN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo for jvmaccess::VirtualMachine::AttachGuard::CreationException + _ZTSN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo name for jvmaccess::VirtualMachine::AttachGuard::CreationException + _ZTVN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # vtable for jvmaccess::VirtualMachine::AttachGuard::CreationException +} UDK_3.4; diff --git a/jvmaccess/util/makefile.mk b/jvmaccess/util/makefile.mk deleted file mode 100644 index 637efedeb347..000000000000 --- a/jvmaccess/util/makefile.mk +++ /dev/null @@ -1,79 +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 = jvmaccess -TARGET = $(PRJNAME) - -ENABLE_EXCEPTIONS = TRUE - -.IF "$(OS)" != "WNT" -UNIXVERSIONNAMES = UDK -.ENDIF # WNT - -.INCLUDE: settings.mk - -.IF "$(OS)" == "IOS" - -ALL: -# nothing - -.ENDIF - -.IF "$(UNIXVERSIONNAMES)" == "" -SHL1TARGET = $(TARGET)$(UDK_MAJOR)$(COMID) -.ELSE # UNIXVERSIONNAMES -SHL1TARGET = $(TARGET)$(COMID) -.ENDIF # UNIXVERSIONNAMES - -.IF "$(COM)" == "MSC" -SHL1IMPLIB = i$(TARGET) -.ELSE -SHL1IMPLIB = $(TARGET)$(COMID) -.ENDIF -SHL1LIBS = $(SLB)$/$(TARGET).lib -SHL1STDLIBS = $(CPPULIB) $(SALLIB) $(SALHELPERLIB) -.IF "$(OS)" == "WNT" -SHL1STDLIBS += $(ADVAPI32LIB) -.ENDIF # WNT -SHL1RPATH = URELIB - -.IF "$(COMNAME)" == "msci" -SHL1VERSIONMAP = msvc_win32_intel.map -.ELIF "$(COMNAME)" == "mscx" -SHL1VERSIONMAP = msvc_win32_x86-64.map -.ELIF "$(COMNAME)" == "sunpro5" -SHL1VERSIONMAP = cc5_solaris_sparc.map -.ELIF "$(GUI)$(COM)" == "WNTGCC" -SHL1VERSIONMAP = mingw.map -.ELIF "$(COMNAME)" == "gcc3" -SHL1VERSIONMAP = gcc3.map -.ENDIF - -DEF1NAME = $(SHL1TARGET) - -.INCLUDE: target.mk diff --git a/jvmaccess/util/mingw.map b/jvmaccess/util/mingw.map deleted file mode 100644 index ddc4da9a91ea..000000000000 --- a/jvmaccess/util/mingw.map +++ /dev/null @@ -1,71 +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. -# -#************************************************************************* - -UDK_3_0_0 { - global: - # jvmaccess/virtualmachine.hxx: - _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException() - _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1ERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const &) - _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionD0Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException() - _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionaSERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::operator =(CreationException const &) - # _ZTIN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo for jvmaccess::VirtualMachine::AttachGuard::CreationException - # _ZTSN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo name for jvmaccess::VirtualMachine::AttachGuard::CreationException - _ZN9jvmaccess14VirtualMachine11AttachGuardC1ERKN3rtl9ReferenceIS0_EE; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &) - _ZN9jvmaccess14VirtualMachine11AttachGuardC2ERKN3rtl9ReferenceIS0_EE; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &) - _ZN9jvmaccess14VirtualMachine11AttachGuardD1Ev; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard() - _ZN9jvmaccess14VirtualMachine11AttachGuardD2Ev; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard() - _ZN9jvmaccess14VirtualMachineC1EP7JavaVM_ibP7JNIEnv_; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *) - - # initially forgotten jvmaccess/virtualmachine.hxx: - _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC2Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException() - _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC2ERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const &) - _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionD1Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException() - _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionD2Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException() - _ZN9jvmaccess14VirtualMachineC2EP7JavaVM_ibP7JNIEnv_; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *) - - # jvmaccess/unovirtualmachine.hxx: - _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionC1Ev; # jvmaccess::UnoVirtualMachine::CreationException::CreationException() - _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionC2Ev; # jvmaccess::UnoVirtualMachine::CreationException::CreationException() - _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionC1ERKS1_; # jvmaccess::UnoVirtualMachine::CreationException::CreationException(CreationException const &) - _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionC2ERKS1_; # jvmaccess::UnoVirtualMachine::CreationException::CreationException(CreationException const &) - _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD0Ev; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException() - _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD1Ev; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException() - _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD2Ev; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException() - _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionaSERKS1_; # jvmaccess::UnoVirtualMachine::CreationException::operator =(CreationException const &) - # _ZTIN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo for jvmaccess::UnoVirtualMachine::CreationException - # _ZTSN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo name for jvmaccess::UnoVirtualMachine::CreationException - _ZN9jvmaccess17UnoVirtualMachineC1ERKN3rtl9ReferenceINS_14VirtualMachineEEEPv; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *) - _ZN9jvmaccess17UnoVirtualMachineC2ERKN3rtl9ReferenceINS_14VirtualMachineEEEPv; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *) - _ZNK9jvmaccess17UnoVirtualMachine17getVirtualMachineEv; # jvmaccess::UnoVirtualMachine::getVirtualMachine() const - _ZNK9jvmaccess17UnoVirtualMachine14getClassLoaderEv; # jvmaccess::UnoVirtualMachine::getClassLoader() const - # jvmaccess/classpath.hxx: - _ZN9jvmaccess9ClassPath11doLoadClassERKN3com3sun4star3uno9ReferenceINS4_17XComponentContextEEEPvRKN3rtl8OUStringESE_; # jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &, rtl::OUString const &) - _ZN9jvmaccess9ClassPath17doTranslateToUrlsERKN3com3sun4star3uno9ReferenceINS4_17XComponentContextEEEPvRKN3rtl8OUStringE; # jvmaccess::ClassPath::doTranslateToUrls(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &) - - local: - *; -}; diff --git a/jvmaccess/util/msvc_win32_intel.map b/jvmaccess/util/msvc_win32_intel.map deleted file mode 100644 index fd148b1892ba..000000000000 --- a/jvmaccess/util/msvc_win32_intel.map +++ /dev/null @@ -1,37 +0,0 @@ -UDK_3.1 { - global: - # jvmaccess/virtualmachine.hxx: - ??0CreationException@AttachGuard@VirtualMachine@jvmaccess@@QAE@XZ; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException() - ??0CreationException@AttachGuard@VirtualMachine@jvmaccess@@QAE@ABV0123@@Z; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const &) - ??1CreationException@AttachGuard@VirtualMachine@jvmaccess@@UAE@XZ; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException() - ??4CreationException@AttachGuard@VirtualMachine@jvmaccess@@QAEAAV0123@ABV0123@@Z; # jvmaccess::VirtualMachine::AttachGuard::CreationException::operator =(CreationException const &) - ??0AttachGuard@VirtualMachine@jvmaccess@@QAE@ABV?$Reference@VVirtualMachine@jvmaccess@@@rtl@@@Z; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &) - ??1AttachGuard@VirtualMachine@jvmaccess@@QAE@XZ; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard() - ??0VirtualMachine@jvmaccess@@QAE@PAUJavaVM_@@H_NPAUJNIEnv_@@@Z; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *) - - local: - *; -}; - -UDK_3.2 { - global: -} UDK_3.1; - -UDK_3.3 { - global: - # jvmaccess/unovirtualmachine.hxx: - ??0CreationException@UnoVirtualMachine@jvmaccess@@QAE@ABV012@@Z; # jvmaccess::UnoVirtualMachine::CreationException::CreationException(CreationException const &) - ??0CreationException@UnoVirtualMachine@jvmaccess@@QAE@XZ; # jvmaccess::UnoVirtualMachine::CreationException::CreationException() - ??1CreationException@UnoVirtualMachine@jvmaccess@@UAE@XZ; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException() - ??4CreationException@UnoVirtualMachine@jvmaccess@@QAEAAV012@ABV012@@Z; # jvmaccess::UnoVirtualMachine::CreationException::operator =(CreationException const &) - ??0UnoVirtualMachine@jvmaccess@@QAE@ABV?$Reference@VVirtualMachine@jvmaccess@@@rtl@@PAX@Z; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *) - ?getVirtualMachine@UnoVirtualMachine@jvmaccess@@QBE?AV?$Reference@VVirtualMachine@jvmaccess@@@rtl@@XZ; # jvmaccess::UnoVirtualMachine::getVirtualMachine() const - ?getClassLoader@UnoVirtualMachine@jvmaccess@@QBEPAXXZ; # jvmaccess::UnoVirtualMachine::getClassLoader() const -} UDK_3.2; - -UDK_3.4 { # OOo 2.3 - global: - # jvmaccess/classpath.hxx: - ?doLoadClass@ClassPath@jvmaccess@@CAPAXABV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@PAXABVOUString@rtl@@2@Z; # jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &, rtl::OUString const &) - ?doTranslateToUrls@ClassPath@jvmaccess@@CAPAXABV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@PAXABVOUString@rtl@@@Z; # jvmaccess::ClassPath::doTranslateToUrls(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &) -} UDK_3.3; diff --git a/jvmaccess/util/msvc_win32_x86-64.map b/jvmaccess/util/msvc_win32_x86-64.map deleted file mode 100644 index d75ab1c4a8e2..000000000000 --- a/jvmaccess/util/msvc_win32_x86-64.map +++ /dev/null @@ -1,37 +0,0 @@ -UDK_3.1 { - global: - # jvmaccess/virtualmachine.hxx: - ??0CreationException@AttachGuard@VirtualMachine@jvmaccess@@QEAA@XZ; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException() - ??0CreationException@AttachGuard@VirtualMachine@jvmaccess@@QEAA@AEBV0123@@Z; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const &) - ??1CreationException@AttachGuard@VirtualMachine@jvmaccess@@UEAA@XZ; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException() - ??4CreationException@AttachGuard@VirtualMachine@jvmaccess@@QEAAAEAV0123@AEBV0123@@Z; # jvmaccess::VirtualMachine::AttachGuard::CreationException::operator =(CreationException const &) - ??0AttachGuard@VirtualMachine@jvmaccess@@QEAA@AEBV?$Reference@VVirtualMachine@jvmaccess@@@rtl@@@Z; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &) - ??1AttachGuard@VirtualMachine@jvmaccess@@QEAA@XZ; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard() - ??0VirtualMachine@jvmaccess@@QEAA@PEAUJavaVM_@@H_NPEAUJNIEnv_@@@Z; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *) - - local: - *; -}; - -UDK_3.2 { - global: -} UDK_3.1; - -UDK_3.3 { - global: - # jvmaccess/unovirtualmachine.hxx: - ??0CreationException@UnoVirtualMachine@jvmaccess@@QEAA@AEBV012@@Z; # jvmaccess::UnoVirtualMachine::CreationException::CreationException(CreationException const &) - ??0CreationException@UnoVirtualMachine@jvmaccess@@QEAA@XZ; # jvmaccess::UnoVirtualMachine::CreationException::CreationException() - ??1CreationException@UnoVirtualMachine@jvmaccess@@UEAA@XZ; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException() - ??4CreationException@UnoVirtualMachine@jvmaccess@@QEAAAEAV012@AEBV012@@Z; # jvmaccess::UnoVirtualMachine::CreationException::operator =(CreationException const &) - ??0UnoVirtualMachine@jvmaccess@@QEAA@AEBV?$Reference@VVirtualMachine@jvmaccess@@@rtl@@PEAX@Z; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *) - ?getVirtualMachine@UnoVirtualMachine@jvmaccess@@QEBA?AV?$Reference@VVirtualMachine@jvmaccess@@@rtl@@XZ; # jvmaccess::UnoVirtualMachine::getVirtualMachine() const - ?getClassLoader@UnoVirtualMachine@jvmaccess@@QEBAPEAXXZ; # jvmaccess::UnoVirtualMachine::getClassLoader() const -} UDK_3.2; - -UDK_3.4 { # OOo 2.3 - global: - # jvmaccess/classpath.hxx: - ?doLoadClass@ClassPath@jvmaccess@@CAPEAXAEBV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@PEAXAEBVOUString@rtl@@2@Z; # jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &, rtl::OUString const &) - ?doTranslateToUrls@ClassPath@jvmaccess@@CAPEAXAEBV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@PEAXAEBVOUString@rtl@@@Z; # jvmaccess::ClassPath::doTranslateToUrls(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &) -} UDK_3.3; diff --git a/jvmfwk/Executable_javaldx.mk b/jvmfwk/Executable_javaldx.mk new file mode 100644 index 000000000000..49252f62f42e --- /dev/null +++ b/jvmfwk/Executable_javaldx.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 <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_Executable_Executable,javaldx)) + +$(eval $(call gb_Executable_add_linked_libs,javaldx,\ + jvmfwk \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Executable_add_exception_objects,javaldx,\ + jvmfwk/plugins/sunmajor/javaenvsetup/javaldx \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk new file mode 100644 index 000000000000..e58dade8b138 --- /dev/null +++ b/jvmfwk/Library_jvmfwk.mk @@ -0,0 +1,67 @@ +# -*- 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_Library_Library,jvmfwk)) + +$(eval $(call gb_Library_set_soversion_script,jvmfwk,3,$(SRCDIR)/jvmfwk/source/framework.map)) + +$(eval $(call gb_Library_add_package_headers,jvmfwk,\ + jvmfwk_inc \ +)) + +$(eval $(call gb_Library_add_defs,jvmfwk,\ + -DJVMFWK_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_api,jvmfwk,\ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,jvmfwk,\ + cppuhelper \ + sal \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,jvmfwk,\ + advapi32 \ +)) +endif + +$(eval $(call gb_Library_use_externals,jvmfwk,\ + libxml2 \ +)) + +$(eval $(call gb_Library_add_exception_objects,jvmfwk,\ + jvmfwk/source/elements \ + jvmfwk/source/framework \ + jvmfwk/source/fwkbase \ + jvmfwk/source/fwkutil \ + jvmfwk/source/libxmlutil \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk new file mode 100644 index 000000000000..734e5647655f --- /dev/null +++ b/jvmfwk/Library_sunjavaplugin.mk @@ -0,0 +1,79 @@ +# -*- 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_Library_Library,sunjavaplugin)) + +$(eval $(call gb_Library_add_defs,sunjavaplugin,\ + -DJVMFWK_PLUGIN_DLLIMPLEMENTATION \ +)) + +ifneq ($(JVM_ONE_PATH_CHECK),) +$(eval $(call gb_Library_add_defs,sunjavaplugin,\ + -DJVM_ONE_PATH_CHECK=\"$(JVM_ONE_PATH_CHECK)\" \ +)) +endif + +$(eval $(call gb_Library_add_api,sunjavaplugin,\ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\ + cppu \ + cppuhelper \ + sal \ + salhelper \ +)) + +ifeq ($(OS),ANDROID) +$(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\ + lo-bootstrap \ +)) +endif + +ifeq ($(GUI),WNT) +$(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\ + advapi32 \ + uwinapi \ +)) +endif + +$(eval $(call gb_Library_use_externals,sunjavaplugin,\ + valgrind \ +)) + +$(eval $(call gb_Library_add_exception_objects,sunjavaplugin,\ + jvmfwk/plugins/sunmajor/pluginlib/gnujre \ + jvmfwk/plugins/sunmajor/pluginlib/otherjre \ + jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin \ + jvmfwk/plugins/sunmajor/pluginlib/sunjre \ + jvmfwk/plugins/sunmajor/pluginlib/sunversion \ + jvmfwk/plugins/sunmajor/pluginlib/util \ + jvmfwk/plugins/sunmajor/pluginlib/vendorbase \ + jvmfwk/plugins/sunmajor/pluginlib/vendorlist \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jurt/com/sun/star/comp/connections/makefile.mk b/jvmfwk/Makefile index 99141108c7d9..7bbbe6c703e6 100644 --- a/jurt/com/sun/star/comp/connections/makefile.mk +++ b/jvmfwk/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,19 +26,15 @@ # #************************************************************************* -PRJ = ..$/..$/..$/..$/.. -PRJNAME = jurt -TARGET = com_sun_star_comp_connections +gb_PARTIALBUILD := T +ifeq ($(strip $(SOLARENV)),) +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk +else -PACKAGE = com$/sun$/star$/comp$/connections +gb_SourceEnvAndRecurse_STAGE=gbuild +include $(SOLARENV)/gbuild/gbuild.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) -JAVAFILES = \ - Acceptor.java \ - Connector.java \ - ConstantInstanceProvider.java \ - Implementation.java \ - PipedConnection.java - -.INCLUDE: target.mk +endif +# vim: set noet sw=4 ts=4: diff --git a/jvmfwk/Module_jvmfwk.mk b/jvmfwk/Module_jvmfwk.mk new file mode 100644 index 000000000000..a6131da1f1ca --- /dev/null +++ b/jvmfwk/Module_jvmfwk.mk @@ -0,0 +1,49 @@ +# -*- 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,jvmfwk)) + +ifneq ($(SOLAR_JAVA),) + +$(eval $(call gb_Module_add_targets,jvmfwk,\ + Library_jvmfwk \ + Library_sunjavaplugin \ + Package_inc \ + Package_javavendors \ + Package_jreproperties \ + Package_rcfiles \ +)) + +ifneq ($(OS),MACOSX) +$(eval $(call gb_Module_add_targets,jvmfwk,\ + Executable_javaldx \ +)) +endif + +endif + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jvmfwk/Package_inc.mk b/jvmfwk/Package_inc.mk new file mode 100644 index 000000000000..fd8a616bdf8e --- /dev/null +++ b/jvmfwk/Package_inc.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_Package_Package,jvmfwk_inc,$(SRCDIR)/jvmfwk/inc/jvmfwk)) + +$(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/framework.h,framework.h)) +$(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/jvmfwkdllapi.h,jvmfwkdllapi.h)) +$(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/jvmfwkplugindllapi.h,jvmfwkplugindllapi.h)) +$(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/vendorplugin.h,vendorplugin.h)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jvmfwk/Package_javavendors.mk b/jvmfwk/Package_javavendors.mk new file mode 100644 index 000000000000..63457765511c --- /dev/null +++ b/jvmfwk/Package_javavendors.mk @@ -0,0 +1,56 @@ +# -*- 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,jvmfwk_javavendors,$(SRCDIR)/jvmfwk/distributions/OpenOfficeorg)) + +# TODO: why are we delivering this stuff to two places? +ifeq ($(GUI),UNX) +ifeq ($(OS),FREEBSD) +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,bin/javavendors.xml,javavendors_freebsd.xml)) +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,lib/javavendors.xml,javavendors_freebsd.xml)) +else ifeq ($(OS),MACOSX) +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,bin/javavendors.xml,javavendors_macosx.xml)) +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,lib/javavendors.xml,javavendors_macosx.xml)) +else ifeq ($(OS),LINUX) +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,bin/javavendors.xml,javavendors_linux.xml)) +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,lib/javavendors.xml,javavendors_linux.xml)) +else ifeq ($(OS),AIX) +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,bin/javavendors.xml,javavendors_linux.xml)) +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,lib/javavendors.xml,javavendors_linux.xml)) +else +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,bin/javavendors.xml,javavendors_unx.xml)) +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,lib/javavendors.xml,javavendors_unx.xml)) +endif +else ifeq ($(GUI),WNT) +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,bin/javavendors.xml,javavendors_wnt.xml)) +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,lib/javavendors.xml,javavendors_wnt.xml)) +else +$(call gb_Output_error,Unsupported platform) +endif + + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jvmfwk/Package_jreproperties.mk b/jvmfwk/Package_jreproperties.mk new file mode 100644 index 000000000000..4e35e7ea6c92 --- /dev/null +++ b/jvmfwk/Package_jreproperties.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_Package_Package,jvmfwk_jreproperties,$(WORKDIR)/CustomTarget/jvmfwk/plugins/sunmajor/pluginlib)) + +$(eval $(call gb_Package_add_customtarget,jvmfwk_jreproperties,jvmfwk/plugins/sunmajor/pluginlib)) + +$(eval $(call gb_CustomTarget_add_dependencies,jvmfwk/plugins/sunmajor/pluginlib,\ + jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java \ +)) + +$(eval $(call gb_Package_add_file,jvmfwk_jreproperties,bin/JREProperties.class,JREProperties.class)) +$(eval $(call gb_Package_add_file,jvmfwk_jreproperties,lib/JREProperties.class,JREProperties.class)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jvmfwk/Package_rcfiles.mk b/jvmfwk/Package_rcfiles.mk new file mode 100644 index 000000000000..68dad6fe5e5d --- /dev/null +++ b/jvmfwk/Package_rcfiles.mk @@ -0,0 +1,34 @@ +# -*- 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,jvmfwk_rcfiles,$(SRCDIR)/jvmfwk)) + +$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,bin/sunjavaplugin),plugins/sunmajor/pluginlib/sunjavapluginrc)) +$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,bin/jvmfwk3),source/jvmfwk3rc)) +$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,bin/javasettingsunopkginstall.xml,source/javasettingsunopkginstall.xml)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml index 2dd5fe35f555..4cb6c8b7e991 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml @@ -18,8 +18,8 @@ </vendorInfos> <plugins> - <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> - <library vendor="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> - <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> + <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> + <library vendor="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> + <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> </plugins> </javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml index 489511f5aff6..e5d99145a0d9 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml @@ -27,11 +27,11 @@ </vendorInfos> <plugins> - <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> - <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> - <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> - <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> - <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> - <library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> + <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> + <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> + <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> + <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> + <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> + <library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> </plugins> </javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml index 215d26c0ea2a..48b6246f72c5 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml @@ -14,7 +14,7 @@ </vendor> </vendorInfos> <plugins> - <library vendor="Apple Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library> - <library vendor="Apple Computer, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library> + <library vendor="Apple Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dylib</library> + <library vendor="Apple Computer, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dylib</library> </plugins> </javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml deleted file mode 100644 index 2de585472b86..000000000000 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <updated>2004-01-30</updated> - - <vendorInfos> - <vendor name="Sun Microsystems Inc."> - <minVersion>1.4.2</minVersion> - </vendor> - <vendor name="IBM Corporation"> - <minVersion>1.4.2</minVersion> - </vendor> - </vendorInfos> - - <plugins> - <library vendor="Sun Microsystems Inc.">sunjavap.dll</library> - <library vendor="IBM Corporation">sunjavap.dll</library> - </plugins> -</javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml index d18dc66585a5..508c93ec0cf1 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml @@ -29,7 +29,7 @@ look like. </vendorInfos> <plugins> - <library vendor="Sun Microsystems Inc.">sunjavaplugin.dll</library> + <library vendor="Sun Microsystems Inc.">libsunjavaplugin.dll</library> <library vendor="VendorX">./pluginDir/vendorx.dll</library> </plugins> -</javaSelection>
\ No newline at end of file +</javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml index 3b1f53fc4fce..261c77d102a8 100755 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml @@ -12,6 +12,6 @@ </vendorInfos> <plugins> - <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> + <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> </plugins> </javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml index 5c92b7ae61b4..a7d4d8958124 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml @@ -18,8 +18,8 @@ </vendorInfos> <plugins> - <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library> - <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library> - <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library> + <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dll</library> + <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dll</library> + <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dll</library> </plugins> </javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/makefile.mk b/jvmfwk/distributions/OpenOfficeorg/makefile.mk deleted file mode 100755 index 88afdb33f81c..000000000000 --- a/jvmfwk/distributions/OpenOfficeorg/makefile.mk +++ /dev/null @@ -1,63 +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 = jvmfwk -TARGET = vendors_ooo - -.INCLUDE: settings.mk - -.IF "$(SOLAR_JAVA)"=="" -nojava: - @echo "Not building jvmfwk because Java is disabled" -.ENDIF - -.IF "$(SOLAR_JAVA)"!="" -$(BIN)$/javavendors.xml: javavendors_unx.xml javavendors_wnt.xml javavendors_macosx.xml javavendors_linux.xml -.IF "$(GUI)"=="UNX" -.IF "$(OS)"=="FREEBSD" - -$(COPY) javavendors_freebsd.xml $(BIN)$/javavendors.xml -.ELIF "$(OS)"=="MACOSX" - -$(COPY) javavendors_macosx.xml $(BIN)$/javavendors.xml -.ELIF "$(OS)"=="LINUX" || "$(OS)"=="AIX" - -$(COPY) javavendors_linux.xml $(BIN)$/javavendors.xml -.ELSE - -$(COPY) javavendors_unx.xml $(BIN)$/javavendors.xml -.ENDIF -.ELIF "$(GUI)"=="WNT" - -$(COPY) javavendors_wnt.xml $(BIN)$/javavendors.xml -.ELSE - @echo Unsupported platform. -.ENDIF - -.ENDIF # "$(SOLAR_JAVA)"!="" - - - - -.INCLUDE: target.mk - diff --git a/jvmfwk/inc/jvmfwk/framework.h b/jvmfwk/inc/jvmfwk/framework.h index 11cca539cb05..032630961911 100644 --- a/jvmfwk/inc/jvmfwk/framework.h +++ b/jvmfwk/inc/jvmfwk/framework.h @@ -31,6 +31,7 @@ #if !defined INCLUDED_JVMFWK_FRAMEWORK_H #define INCLUDED_JVMFWK_FRAMEWORK_H +#include "jvmfwkdllapi.h" #include "rtl/ustring.h" #include "osl/mutex.h" #ifdef SOLAR_JAVA @@ -142,7 +143,7 @@ extern "C" { <p> regcomp -env:UNO_JAVA_JFW_JREHOME=file:///d:/j2re1.4.2 -env:"UNO_JAVA_JFW_CLASSPATH=d:\\solver\\bin\\classes.jar;d:\\solver\\bin\\jurt.jar" - -env:UNO_JAVA_JFW_PLUGIN=file:\\solver\\bin\\sunjavaplugin.dll -register .... + -env:UNO_JAVA_JFW_PLUGIN=file:\\solver\\bin\\libsunjavaplugin.dll -register .... </p> <p>Additionall parameters for the Java VM can be provided. For every parameter a seperate bootstrap parameter must be specified. The names are @@ -305,7 +306,7 @@ typedef struct _JavaInfo JavaInfo; @param pInfo The object which is to be freed. It can be NULL; */ -void SAL_CALL jfw_freeJavaInfo(JavaInfo *pInfo); +JVMFWK_DLLPUBLIC void SAL_CALL jfw_freeJavaInfo(JavaInfo *pInfo); /** compares two <code>JavaInfo</code> objects for equality. @@ -329,7 +330,7 @@ void SAL_CALL jfw_freeJavaInfo(JavaInfo *pInfo); sal_True - both object represent the same JRE.</br> sal_False - the objects represend different JREs */ -sal_Bool SAL_CALL jfw_areEqualJavaInfo( +JVMFWK_DLLPUBLIC sal_Bool SAL_CALL jfw_areEqualJavaInfo( JavaInfo const * pInfoA,JavaInfo const * pInfoB); /** determines if a Java Virtual Machine is already running. @@ -352,7 +353,7 @@ sal_Bool SAL_CALL jfw_areEqualJavaInfo( JFW_E_NONE function ran successfully.<br/> JFW_E_INVALID_ARG the parameter <code>bRunning</code> was NULL. */ -javaFrameworkError SAL_CALL jfw_isVMRunning(sal_Bool *bRunning); +JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_isVMRunning(sal_Bool *bRunning); /** detects a suitable JRE and configures the framework to use it. @@ -418,7 +419,7 @@ javaFrameworkError SAL_CALL jfw_isVMRunning(sal_Bool *bRunning); JFW_E_CONFIGURATION mode was not properly set or their prerequisites were not met. */ -javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo); +JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo); /** provides information about all availabe JRE installations. @@ -447,7 +448,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo); JFW_E_CONFIGURATION mode was not properly set or their prerequisites were not met. */ -javaFrameworkError SAL_CALL jfw_findAllJREs( +JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_findAllJREs( JavaInfo ***parInfo, sal_Int32 *pSize); /** determines if a path points to a Java installation. @@ -480,7 +481,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs( JFW_E_FAILED_VERSION a JRE was detected but if failed the version requirements as determined by the javavendors.xml */ -javaFrameworkError SAL_CALL jfw_getJavaInfoByPath( +JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getJavaInfoByPath( rtl_uString *pPath, JavaInfo **ppInfo); @@ -548,7 +549,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath( JFW_E_FAILED_VERSION the "Default Mode" is active. The JRE determined by <code>JAVA_HOME</code>does not meet the version requirements. */ -javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, +JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 nSize, JavaVM **ppVM, JNIEnv **ppEnv); @@ -578,7 +579,7 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, were not met.<br/> JFW_E_DIRECT_MODE the function cannot be used in this mode. */ -javaFrameworkError SAL_CALL jfw_setSelectedJRE(JavaInfo const *pInfo); +JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_setSelectedJRE(JavaInfo const *pInfo); /** provides information about the JRE that is to be used. @@ -608,7 +609,7 @@ javaFrameworkError SAL_CALL jfw_setSelectedJRE(JavaInfo const *pInfo); JFW_E_INVALID_SETTINGS the javavendors.xml has been changed and no JRE has been selected afterwards. <br/> */ -javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo **ppInfo); +JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo **ppInfo); /** determines if Java can be used. @@ -627,7 +628,7 @@ javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo **ppInfo); were not met.<br/> JFW_E_DIRECT_MODE the function cannot be used in this mode. */ -javaFrameworkError SAL_CALL jfw_setEnabled(sal_Bool bEnabled); +JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_setEnabled(sal_Bool bEnabled); /** provides the information if Java can be used. @@ -642,7 +643,7 @@ javaFrameworkError SAL_CALL jfw_setEnabled(sal_Bool bEnabled); were not met.<br/> JFW_E_DIRECT_MODE the function cannot be used in this mode. */ -javaFrameworkError SAL_CALL jfw_getEnabled(sal_Bool *pbEnabled); +JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getEnabled(sal_Bool *pbEnabled); /** determines parameters which are passed to VM during its creation. @@ -666,7 +667,7 @@ javaFrameworkError SAL_CALL jfw_getEnabled(sal_Bool *pbEnabled); were not met.<br/> JFW_E_DIRECT_MODE the function cannot be used in this mode. */ -javaFrameworkError SAL_CALL jfw_setVMParameters( +JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_setVMParameters( rtl_uString ** arArgs, sal_Int32 nSize); /** obtains the currently used start parameters. @@ -691,7 +692,7 @@ javaFrameworkError SAL_CALL jfw_setVMParameters( were not met.<br/> JFW_E_DIRECT_MODE the function cannot be used in this mode. */ -javaFrameworkError SAL_CALL jfw_getVMParameters( +JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getVMParameters( rtl_uString *** parParameters, sal_Int32 * pSize); @@ -713,7 +714,7 @@ javaFrameworkError SAL_CALL jfw_getVMParameters( were not met.<br/> JFW_E_DIRECT_MODE the function cannot be used in this mode. */ -javaFrameworkError SAL_CALL jfw_setUserClassPath(rtl_uString * pCP); +JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_setUserClassPath(rtl_uString * pCP); /** provides the value of the current user class path. <p>The function returns an empty string if no user class path is set. @@ -732,7 +733,7 @@ javaFrameworkError SAL_CALL jfw_setUserClassPath(rtl_uString * pCP); were not met.<br/> JFW_E_DIRECT_MODE the function cannot be used in this mode. */ -javaFrameworkError SAL_CALL jfw_getUserClassPath(rtl_uString ** ppCP); +JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getUserClassPath(rtl_uString ** ppCP); /** saves the location of a JRE. @@ -761,7 +762,7 @@ javaFrameworkError SAL_CALL jfw_getUserClassPath(rtl_uString ** ppCP); JFW_E_DIRECT_MODE the function cannot be used in this mode. @see jfw_setJRELocations */ -javaFrameworkError SAL_CALL jfw_addJRELocation(rtl_uString * sLocation); +JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_addJRELocation(rtl_uString * sLocation); /** saves the locations of a number of JREs. @@ -789,7 +790,7 @@ javaFrameworkError SAL_CALL jfw_addJRELocation(rtl_uString * sLocation); JFW_E_DIRECT_MODE the function cannot be used in this mode. @see jfw_addJRELocations */ -javaFrameworkError SAL_CALL jfw_setJRELocations( +JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_setJRELocations( rtl_uString ** arLocations, sal_Int32 nSize); /** obtains an array containing paths to JRE installations. @@ -811,7 +812,7 @@ javaFrameworkError SAL_CALL jfw_setJRELocations( were not met.<br/> JFW_E_DIRECT_MODE the function cannot be used in this mode. */ -javaFrameworkError SAL_CALL jfw_getJRELocations( +JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getJRELocations( rtl_uString *** parLocations, sal_Int32 * pSize); @@ -833,7 +834,7 @@ javaFrameworkError SAL_CALL jfw_getJRELocations( JFW_E_INVALID_ARG pInfo contains invalid data</br> JFW_E_NO_PLUGIN a plug-in library could not be found.<br/> */ -javaFrameworkError SAL_CALL jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist); +JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist); /** locks this API so that it cannot be used by other threads. @@ -851,14 +852,14 @@ javaFrameworkError SAL_CALL jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist) The only functions which are not effected by <code>jfw_lock</code> are <code>jfw_freeJavaInfo</code> and <code>jfw_areEqualJavaInfo</code>. */ -void SAL_CALL jfw_lock(); +JVMFWK_DLLPUBLIC void SAL_CALL jfw_lock(); /** unlocks this API. <p>This function is called after <code>jfw_lock</code>. It allows other threads to use this API concurrently.</p> */ -void SAL_CALL jfw_unlock(); +JVMFWK_DLLPUBLIC void SAL_CALL jfw_unlock(); #ifdef __cplusplus diff --git a/jvmfwk/inc/jvmfwk/jvmfwkdllapi.h b/jvmfwk/inc/jvmfwk/jvmfwkdllapi.h new file mode 100644 index 000000000000..6a34397d2a91 --- /dev/null +++ b/jvmfwk/inc/jvmfwk/jvmfwkdllapi.h @@ -0,0 +1,44 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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. + */ + +#ifndef INCLUDED_JVMFWK_JVMFWKDLLAPI_H +#define INCLUDED_JVMFWK_JVMFWKDLLAPI_H + +#include <sal/types.h> + +#if defined JVMFWK_DLLIMPLEMENTATION +# define JVMFWK_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +# define JVMFWK_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif +#define JVMFWK_DLLPRIVATE SAL_DLLPRIVATE + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h b/jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h new file mode 100644 index 000000000000..c7a29903be52 --- /dev/null +++ b/jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h @@ -0,0 +1,44 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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. + */ + +#ifndef INCLUDED_JVMFWK_JVMFWKPLUGINDLLAPI_H +#define INCLUDED_JVMFWK_JVMFWKPLUGINDLLAPI_H + +#include <sal/types.h> + +#if defined JVMFWK_PLUGIN_DLLIMPLEMENTATION +# define JVMFWK_PLUGIN_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +# define JVMFWK_PLUGIN_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif +#define JVMFWK_PLUGIN_DLLPRIVATE SAL_DLLPRIVATE + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/jvmfwk/inc/jvmfwk/vendorplugin.h b/jvmfwk/inc/jvmfwk/vendorplugin.h index 3ccbb0e487f4..302037cecbfc 100644 --- a/jvmfwk/inc/jvmfwk/vendorplugin.h +++ b/jvmfwk/inc/jvmfwk/vendorplugin.h @@ -30,6 +30,7 @@ #if !defined INCLUDED_JVMFWK_VENDORPLUGIN_H #define INCLUDED_JVMFWK_VENDORPLUGIN_H +#include "jvmfwkplugindllapi.h" #include "jvmfwk/framework.h" #include "rtl/ustring.h" #ifdef SOLAR_JAVA @@ -126,7 +127,7 @@ typedef enum <code>sMinVersion,sMaxVersion,arExcludeList</code> are not recognized as valid version strings. */ -javaPluginError jfw_plugin_getAllJavaInfos( +JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_getAllJavaInfos( rtl_uString *sVendor, rtl_uString *sMinVersion, rtl_uString *sMaxVersion, @@ -177,7 +178,7 @@ javaPluginError jfw_plugin_getAllJavaInfos( does not mean necessarily that there is no JRE. There could be a JRE but it has a vendor which is not supported by this API implementation. */ -javaPluginError jfw_plugin_getJavaInfoByPath( +JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_getJavaInfoByPath( rtl_uString *sLocation, rtl_uString *sVendor, rtl_uString *sMinVersion, @@ -230,7 +231,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath( JFW_PLUGIN_E_VM_CREATION_FAILED a VM could not be created. The error was caused by the JRE. */ -javaPluginError jfw_plugin_startJavaVirtualMachine( +JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_startJavaVirtualMachine( const JavaInfo *pInfo, const JavaVMOption *arOptions, sal_Int32 nSizeOptions, @@ -256,7 +257,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( JFW_PLUGIN_E_ERROR an error occurred during execution.</br> JFW_PLUGIN_E_INVALID_ARG pInfo contains invalid data</br> */ -javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist); +JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist); #ifdef __cplusplus } diff --git a/jvmfwk/inc/makefile.mk b/jvmfwk/inc/makefile.mk deleted file mode 100644 index 3aec902c90e9..000000000000 --- a/jvmfwk/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 -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME=jvmfwk -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk b/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk deleted file mode 100755 index 8e4a79581327..000000000000 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk +++ /dev/null @@ -1,56 +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=javaldx -TARGET=javaldx -TARGETTYPE=CUI -NO_DEFAULT_STL=TRUE -LIBTARGET=NO -ENABLE_EXCEPTIONS=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(OS)" != "MACOSX" && "$(SOLAR_JAVA)" != "" - -OBJFILES=$(OBJ)$/javaldx.obj - -APP1TARGET=javaldx -APP1OBJS=$(OBJFILES) -APP1STDLIBS=$(SALLIB) $(JVMFWKLIB) -APP1RPATH=UREBIN - -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/jvmfwk/plugins/sunmajor/pluginlib/Makefile b/jvmfwk/plugins/sunmajor/pluginlib/Makefile new file mode 100644 index 000000000000..b190038ef79c --- /dev/null +++ b/jvmfwk/plugins/sunmajor/pluginlib/Makefile @@ -0,0 +1,38 @@ +# -*- 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. + +include $(GBUILDDIR)/gbuild.mk + +JREProperties.class : $(SRCDIR)/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java + $(call gb_Helper_abbreviate_dirs_native, \ + $(gb_JavaClassSet_JAVACCOMMAND) $(gb_JavaClassSet_JAVACDEBUG) -d $(dir $@) $^) + +.DEFAULT_GOAL := all +.PHONY : all +all : JREProperties.class + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk deleted file mode 100644 index 03c4f58e37d8..000000000000 --- a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk +++ /dev/null @@ -1,120 +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= jvmfwk -TARGET = plugin -ENABLE_EXCEPTIONS=TRUE -LIBTARGET=NO -UNOCOMPONENT1=sunjavaplugin - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -DLLPRE = - -.IF "$(VALGRIND_CFLAGS)" != "" -CDEFS += -DHAVE_VALGRIND_H -CFLAGS += $(VALGRIND_CFLAGS) -.END - -# ------------------------------------------------------------------ - -.IF "$(SOLAR_JAVA)"!="" - -SLOFILES= \ - $(SLO)$/sunversion.obj \ - $(SLO)$/sunjavaplugin.obj \ - $(SLO)$/vendorbase.obj \ - $(SLO)$/util.obj \ - $(SLO)$/sunjre.obj \ - $(SLO)$/gnujre.obj \ - $(SLO)$/vendorlist.obj \ - $(SLO)$/otherjre.obj - -LIB1OBJFILES= $(SLOFILES) - -LIB1TARGET=$(SLB)$/$(UNOCOMPONENT1).lib - -SHL1TARGET=$(ENFORCEDSHLPREFIX)$(UNOCOMPONENT1) - - -SHL1STDLIBS= \ - $(CPPUHELPER) \ - $(CPPULIB) \ - $(SALHELPERLIB) \ - $(SALLIB) - -.IF "$(OS)" == "ANDROID" -SHL1STDLIBS+=-llo-bootstrap -.ENDIF - -.IF "$(GUI)" == "WNT" -.IF "$(COM)"!="GCC" -SHL1STDLIBS += uwinapi.lib advapi32.lib -.ELSE -SHL1STDLIBS += -luwinapi -ladvapi32 -.ENDIF # GCC -.ENDIF #WNT - -.IF "$(JVM_ONE_PATH_CHECK)" != "" -CFLAGS += -DJVM_ONE_PATH_CHECK=\"$(JVM_ONE_PATH_CHECK)\" -.ENDIF - -SHL1VERSIONMAP = sunjavaplugin.map -SHL1DEPN= -SHL1IMPLIB= i$(UNOCOMPONENT1) -SHL1LIBS= $(LIB1TARGET) -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME= $(SHL1TARGET) -SHL1RPATH= URELIB - -JAVACLASSFILES= \ - $(CLASSDIR)$/JREProperties.class - -JAVAFILES = $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES))) - -.ENDIF # SOLAR_JAVA - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.IF "$(GUI)"=="WNT" -BOOTSTRAPFILE=$(BIN)$/sunjavaplugin.ini -.ELSE -BOOTSTRAPFILE=$(BIN)$/sunjavapluginrc -.ENDIF - - -$(BOOTSTRAPFILE): sunjavapluginrc - -$(COPY) $< $@ - - -ALLTAR: \ - $(BOOTSTRAPFILE) - diff --git a/jvmfwk/prj/build.lst b/jvmfwk/prj/build.lst index 1a8d67401648..5352c4fa2002 100644 --- a/jvmfwk/prj/build.lst +++ b/jvmfwk/prj/build.lst @@ -1,6 +1,2 @@ jvmf jvmfwk : cppu cppuhelper sal comphelper LIBXML2:libxml2 NULL -jvmf jvmfwk\inc nmake - all jvmf_inc NULL -jvmf jvmfwk\source nmake - all jvmf_framework jvmf_inc NULL -jvmf jvmfwk\plugins\sunmajor\pluginlib nmake - all jvmf_sunmajorlib jvmf_inc NULL -jvmf jvmfwk\plugins\sunmajor\javaenvsetup nmake - u jvmf_sunjavaldx jvmf_framework jvmf_inc NULL -jvmf jvmfwk\distributions\OpenOfficeorg nmake - all jvmf_openoffice jvmf_framework jvmf_inc NULL +jvmf jvmfwk\prj nmake - all jvmf_prj NULL diff --git a/jvmfwk/prj/d.lst b/jvmfwk/prj/d.lst index e8753d14d95c..e69de29bb2d1 100644 --- a/jvmfwk/prj/d.lst +++ b/jvmfwk/prj/d.lst @@ -1,23 +0,0 @@ -mkdir: %_DEST%\inc\jvmfwk -..\inc\jvmfwk\framework.h %_DEST%\inc\jvmfwk\framework.h -..\inc\jvmfwk\vendorplugin.h %_DEST%\inc\jvmfwk\vendorplugin.h -..\%__SRC%\lib\ijvmfwk.lib %_DEST%\lib\ijvmfwk.lib -..\%__SRC%\lib\libjvmfwk.* %_DEST%\lib\* -..\%__SRC%\bin\jvmfwk*.dll %_DEST%\bin\* -..\%__SRC%\bin\sunjavap*.dll %_DEST%\bin\* -..\%__SRC%\lib\sunjavaplugin*.so %_DEST%\lib\* -..\%__SRC%\lib\libsunjavaplugin*.so %_DEST%\lib\* -..\%__SRC%\lib\sunjavaplugin*.dylib %_DEST%\lib\* -..\%__SRC%\class\JREProperties.class %_DEST%\bin\JREProperties.class -..\%__SRC%\class\JREProperties.class %_DEST%\lib\JREProperties.class -..\%__SRC%\bin\javaldx %_DEST%\bin\javaldx -..\source\javasettingsunopkginstall.xml %_DEST%\bin\javasettingsunopkginstall.xml -..\%__SRC%\bin\javavendors.xml %_DEST%\bin\javavendors.xml -..\%__SRC%\bin\javavendors.xml %_DEST%\lib\javavendors.xml -..\%__SRC%\bin\jvmfwk3rc %_DEST%\lib\jvmfwk3rc -..\%__SRC%\bin\jvmfwk3.ini %_DEST%\bin\jvmfwk3.ini -..\%__SRC%\bin\sunjavapluginrc %_DEST%\lib\sunjavapluginrc -..\%__SRC%\bin\sunjavaplugin.ini %_DEST%\bin\sunjavaplugin.ini - -linklib: libjvmfwk.*.* -linklib: libjvmfwk*.dylib.*.*.* diff --git a/jvmfwk/prj/makefile.mk b/jvmfwk/prj/makefile.mk new file mode 100644 index 000000000000..0997622e00f6 --- /dev/null +++ b/jvmfwk/prj/makefile.mk @@ -0,0 +1 @@ +.INCLUDE : gbuildbridge.mk diff --git a/jvmfwk/source/makefile.mk b/jvmfwk/source/makefile.mk deleted file mode 100644 index 76ae22de6a44..000000000000 --- a/jvmfwk/source/makefile.mk +++ /dev/null @@ -1,91 +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 = jvmfwk -FRAMEWORKLIB=jvmfwk -TARGET = $(FRAMEWORKLIB) -ENABLE_EXCEPTIONS = TRUE - -.IF "$(OS)" != "WNT" -UNIXVERSIONNAMES = UDK -.ENDIF # WNT - -.INCLUDE: settings.mk - -.IF "$(SYSTEM_LIBXML)" == "YES" -CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) -.ENDIF - -UNOUCROUT = $(OUT)$/inc - -SLOFILES = \ - $(SLO)$/framework.obj \ - $(SLO)$/libxmlutil.obj \ - $(SLO)$/fwkutil.obj \ - $(SLO)$/elements.obj \ - $(SLO)$/fwkbase.obj - - -.IF "$(UNIXVERSIONNAMES)" == "" -SHL1TARGET = $(FRAMEWORKLIB)$(UDK_MAJOR) -.ELSE # UNIXVERSIONNAMES -SHL1TARGET = $(FRAMEWORKLIB) -.ENDIF # UNIXVERSIONNAMES - -SHL1DEPN= -.IF "$(COM)" == "MSC" -SHL1IMPLIB = i$(FRAMEWORKLIB) -.ELSE -SHL1IMPLIB = $(FRAMEWORKLIB) -.ENDIF -SHL1LIBS = $(SLB)$/$(TARGET).lib -SHL1STDLIBS = $(CPPUHELPERLIB) $(SALLIB) $(LIBXML2LIB) -SHL1RPATH = URELIB - -.IF "$(OS)" == "WNT" -SHL1STDLIBS += $(ADVAPI32LIB) -.ENDIF # WNT - -SHL1VERSIONMAP = framework.map -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME = $(SHL1TARGET) - -.IF "$(GUI)"=="UNX" -RCFILE=$(BIN)$/jvmfwk3rc -.ELIF "$(GUI)"=="WNT" -RCFILE=$(BIN)$/jvmfwk3.ini -.END - - -.INCLUDE: target.mk -$(RCFILE): jvmfwk3rc - -$(COPY) $< $@ - -ALLTAR: \ - $(RCFILE) - diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk index 93bd1aeb6509..e4d8f869d693 100644 --- a/odk/pack/gendocu/makefile.mk +++ b/odk/pack/gendocu/makefile.mk @@ -53,8 +53,8 @@ JAVA_PACKAGES=\ # com.sun.star.beans \ JAVA_SRC_FILES=\ - $(JAVA_SRC_DIR)$/jurt_src.zip \ $(JAVA_SRC_DIR)$/juh_src.zip \ + $(JAVA_SRC_DIR)$/jurt_src.zip \ $(JAVA_SRC_DIR)$/ridl_src.zip \ $(JAVA_SRC_DIR)$/unoloader_src.zip @@ -103,7 +103,7 @@ $(CPP_DOCU_INDEX_FILE) .ERRREMOVE : $(CPP_DOCU_CLEANUP_FLAG) Doxyfile > $(MISC)/Doxyfile $(DOXYGEN) $(MISC)/Doxyfile -$(JAVA_SRC_FILES) : $(SOLARCOMMONBINDIR)$/$$(@:f) +$(JAVA_SRC_FILES) : $(SOLARCOMMONPCKDIR)$/$$(@:f) -$(MKDIRHIER) $(@:d) $(MY_COPY) $< $@ cd $(JAVA_SRC_DIR) && unzip -quo $(@:f) diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt index 24ed49852123..76e2ef304208 100644 --- a/postprocess/rebase/coffbase.txt +++ b/postprocess/rebase/coffbase.txt @@ -271,7 +271,7 @@ store3.dll 0x000000005e2e0000 0x00020000 streams.uno.dll 0x000000005e2b0000 0x00020000 stringresourcemi.uno.dll 0x000000005e280000 0x00020000 stsmi.dll 0x000000005e1f0000 0x00080000 -sunjavaplugin.dll 0x000000005e1c0000 0x00020000 +libsunjavaplugin.dll 0x000000005e1c0000 0x00020000 svgfiltermi.dll 0x000000005e190000 0x00020000 svgmi.dll 0x000000005e160000 0x00020000 svlmi.dll 0x000000005e090000 0x000c0000 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/Makefile b/ridljar/Makefile new file mode 100644 index 000000000000..7bbbe6c703e6 --- /dev/null +++ b/ridljar/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 +# <http://www.openoffice.org/license.html> +# 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/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/javamaker/makefile.mk b/ridljar/javamaker/makefile.mk deleted file mode 100644 index cf4e70d38c87..000000000000 --- a/ridljar/javamaker/makefile.mk +++ /dev/null @@ -1,46 +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 := javamaker - -.INCLUDE: settings.mk - -RDB = $(SOLARBINDIR)$/udkapi.rdb - -.INCLUDE: target.mk - -.IF "$(SOLAR_JAVA)" != "" - -ALLTAR: $(MISC)$/javamaker.done - -$(MISC)$/javamaker.done .ERRREMOVE: $(RDB) - $(JAVAMAKER) -BUCR -O$(CLASSDIR) $< - $(TOUCH) $@ - -.ENDIF 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 diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index be2418f84c3a..3667ed4c09e7 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -365,7 +365,7 @@ End File gid_File_Dl_Sunjavaplugin LIB_FILE_BODY; Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_BARE("sunjavaplugin"); + Name = SCP2_URE_DL_NORMAL("sunjavaplugin"); Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "0AC6C688-876C-40C5-B24E-9257003FDC3E"; End diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo index 06a103d3ff8d..5c15611a3b68 100755 --- a/solenv/bin/linkoo +++ b/solenv/bin/linkoo @@ -113,7 +113,7 @@ my $brand_program_dir = 'program'; my $ure_lib_dir = 'ure-link/lib'; my $win_ure_lib_dir = 'URE/bin'; -my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' ); +my @exceptions = ( 'cppuhelper', 'libsunjavaplugin', 'libjvmfwk' ); my $bin; $bin = "|\\.bin" if ($TARGET eq 'wntgcci.pro'); diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index f1fe1444c8f4..70c14c5e90e2 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -65,7 +65,7 @@ define gb_Jar__command mkdir -p $(dir $(2)) && cd $(call gb_Jar_get_workdir,$(1)) && \ $(gb_Jar_JARCOMMAND) cfm $(2) $(call gb_Jar_get_manifest_target,$(1)) \ META-INF $(PACKAGEROOTS) $(PACKAGEFILES) \ - $(foreach root,$(PACKAGEDIRS),&& $(gb_Jar_JARCOMMAND) uf $(2) -C $(dir $(root)) $(notdir $(root))) \ + $(foreach root,$(PACKAGEDIRS),&& cd $(dir $(root)) && $(gb_Jar_JARCOMMAND) uf $(2) $(notdir $(root))) \ || (rm $(2); false) ) endef @@ -201,6 +201,16 @@ $(call gb_JavaClassSet_use_externals,$(call gb_Jar_get_classsetname,$(1)),$(2)) endef +define gb_Jar_add_package_dependency +$(call gb_JavaClassSet_add_package_dependency,$(call gb_Jar_get_classsetname,$(1)),$(2)) + +endef + +define gb_Jar_add_package_dependencies +$(call gb_JavaClassSet_add_package_dependencies,$(call gb_Jar_get_classsetname,$(1)),$(2)) + +endef + # possible directories for jar files containing UNO services gb_Jar_COMPONENTPREFIXES := \ OOO:vnd.sun.star.expand:\dLO_JAVA_DIR/ \ @@ -222,5 +232,4 @@ $(call gb_Jar_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_targe endef - # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 6fd19fe7194c..838b957620ae 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -29,6 +29,10 @@ gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) $(JAVAFLAGS) gb_JavaClassSet_JAVACDEBUG := +# Enforces correct dependency order for possibly generated stuff: +# generated sources, jars/classdirs etc. +gb_JavaClassSet_get_preparation_target = $(WORKDIR)/JavaClassSet/$(1)/prepared + ifneq ($(gb_DEBUGLEVEL),0) gb_JavaClassSet_JAVACDEBUG := -g endif @@ -36,17 +40,18 @@ endif define gb_JavaClassSet__command $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) && \ - RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\ - $(call gb_Helper_convert_native,\ - $(if $(filter-out $(JARDEPS),$(3)),\ - $(filter-out $(JARDEPS),$(3)),\ - $(filter-out $(JARDEPS),$(4))))) && \ - $(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \ - $(gb_JavaClassSet_JAVACDEBUG) \ - -cp "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \ - -d $(call gb_JavaClassSet_get_classdir,$(2)) \ - @$$RESPONSEFILE &&) \ - rm -f $$RESPONSEFILE && \ + $(if $(filter-out $(JARDEPS),$(4)), \ + RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\ + $(call gb_Helper_convert_native,\ + $(if $(filter-out $(JARDEPS),$(3)),\ + $(filter-out $(JARDEPS),$(3)),\ + $(filter-out $(JARDEPS),$(4))))) && \ + $(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \ + $(gb_JavaClassSet_JAVACDEBUG) \ + -cp "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \ + -d $(call gb_JavaClassSet_get_classdir,$(2)) \ + @$$RESPONSEFILE &&) \ + rm -f $$RESPONSEFILE &&) \ touch $(1)) endef @@ -60,8 +65,12 @@ $(call gb_JavaClassSet_get_clean_target,%) : $(call gb_Helper_abbreviate_dirs,\ rm -rf $(dir $(call gb_JavaClassSet_get_target,$*))) +$(call gb_JavaClassSet_get_preparation_target,%) : + mkdir -p $(dir $@) && touch $@ + define gb_JavaClassSet_JavaClassSet -$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS := +$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS := $(call gb_JavaClassSet_get_preparation_target,$(1)) +$(call gb_JavaClassSet_get_target,$(1)) : $(call gb_JavaClassSet_get_preparation_target,$(1)) endef @@ -85,7 +94,7 @@ endef define gb_JavaClassSet_add_generated_sourcefile $(call gb_JavaClassSet_get_target,$(1)) : $(call gb_JavaClassSet__get_generated_sourcefile,$(2)) -$(call gb_JavaClassSet__get_generated_sourcefile,$(2)) : $(gb_Helper_PHONY) +$(call gb_JavaClassSet__get_generated_sourcefile,$(2)) :| $(call gb_JavaClassSet_get_preparation_target,$(1)) endef @@ -105,6 +114,7 @@ define gb_JavaClassSet_add_jar $(call gb_JavaClassSet_get_target,$(1)) : $(2) $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2)) $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2) +$(2) :| $(gb_Helper_PHONY) endef @@ -139,4 +149,14 @@ $(foreach external,$(2),$(call gb_JavaClassSet_use_external,$(1),$(external))) endef +define gb_JavaClassSet_add_package_dependency +$(call gb_JavaClassSet_get_preparation_target,$(1)) :| $(call gb_Package_get_target,$(2)) + +endef + +define gb_JavaClassSet_add_package_dependencies +$(foreach dependency,$(2),$(call gb_JavaClassSet_add_package_dependency,$(1),$(dependency))) + +endef + # vim: set noet sw=4: diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 177cad6f7e2b..8d3656a28ea6 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -112,6 +112,7 @@ endef define gb_JunitTest_add_jar $(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(2) $(call gb_JunitTest_get_target,$(1)) : $(2) +$(2) :| $(gb_Helper_PHONY) endef @@ -120,6 +121,16 @@ $(foreach jar,$(2),$(call gb_JunitTest_add_jar,$(1),$(jar))) endef +define gb_JunitTest_add_package_dependency +$(call gb_JavaClassSet_add_package_dependency,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) + +endef + +define gb_JunitTest_add_package_dependencies +$(call gb_JavaClassSet_add_package_dependencies,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) + +endef + else # OOO_JUNIT_JAR .PHONY : $(call gb_JunitTest_get_target,$(1)) @@ -139,6 +150,8 @@ gb_JunitTest_add_sourcefiles := gb_JunitTest_set_classpath := gb_JunitTest_add_jar := gb_JunitTest_add_jars := +gb_JunitTest_add_package_dependency := +gb_JunitTest_add_package_dependencies := endif # OOO_JUNIT_JAR # vim: set noet sw=4: diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 80ed26c8ebdf..fb032add0a71 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -165,3 +165,7 @@ $(1) endef gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib + +gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs) + +gb_Helper_get_rcfile = $(1)rc diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index 5207cb506729..59c23be6ea29 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -29,6 +29,8 @@ GUI := WNT gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin +gb_Helper_get_rcfile = $(1).ini + gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX gb_OSDEFS := \ diff --git a/unoil/Jar_unoil.mk b/unoil/Jar_unoil.mk new file mode 100644 index 000000000000..edc0471ee6b3 --- /dev/null +++ b/unoil/Jar_unoil.mk @@ -0,0 +1,38 @@ +# -*- 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,unoil)) + +$(eval $(call gb_Jar_add_package_dependencies,unoil,\ + unoil_javamaker \ +)) + +$(eval $(call gb_Jar_add_packagedirs,unoil,\ + $(WORKDIR)/CustomTarget/unoil/javamaker/com \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/unoil/Makefile b/unoil/Makefile new file mode 100644 index 000000000000..7bbbe6c703e6 --- /dev/null +++ b/unoil/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 +# <http://www.openoffice.org/license.html> +# 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/unoil/Module_unoil.mk b/unoil/Module_unoil.mk new file mode 100644 index 000000000000..826e5a712c38 --- /dev/null +++ b/unoil/Module_unoil.mk @@ -0,0 +1,47 @@ +# -*- 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,unoil)) + +$(eval $(call gb_Module_add_targets,unoil,\ + Package_clioootypesversion \ +)) + +ifneq ($(SOLAR_JAVA),) +$(eval $(call gb_Module_add_targets,unoil,\ + Jar_unoil \ + Package_javamaker \ +)) +endif + +ifeq ($(COM),MSC) +$(eval $(call gb_Module_add_targets,unoil,\ + Package_climaker \ +)) +endif + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/unoil/Package_climaker.mk b/unoil/Package_climaker.mk new file mode 100644 index 000000000000..0be46d0476cc --- /dev/null +++ b/unoil/Package_climaker.mk @@ -0,0 +1,49 @@ +# -*- 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,unoil_climaker,$(WORKDIR)/CustomTarget/unoil/climaker)) + +$(eval $(call gb_Package_add_customtarget,unoil_climaker,unoil/climaker)) + +$(eval $(call gb_Package_add_file,unoil_climaker,bin/cli_oootypes.config,cli_oootypes.config)) +$(eval $(call gb_Package_add_file,unoil_climaker,bin/cli_oootypes.dll,cli_oootypes.dll)) +$(eval $(call gb_Package_add_file,unoil_climaker,bin/policy.1.0.cli_oootypes.dll,policy.1.0.cli_oootypes.dll)) + +$(eval $(call gb_CustomTarget_add_dependencies,unoil/climaker,\ + unoil/climaker/cli_oootypes_config \ + unoil/climaker/version.txt \ +)) + +$(eval $(call gb_CustomTarget_add_outdir_dependencies,unoil/climaker,\ + $(OUTDIR_FOR_BUILD)/bin/climaker$(gb_Executable_EXT_for_build) \ + $(OUTDIR)/bin/cli_uretypes.dll \ + $(OUTDIR)/bin/cliuno.snk \ + $(OUTDIR)/bin/offapi.rdb \ + $(OUTDIR)/bin/udkapi.rdb \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/unoil/Package_clioootypesversion.mk b/unoil/Package_clioootypesversion.mk new file mode 100644 index 000000000000..5da7493e851d --- /dev/null +++ b/unoil/Package_clioootypesversion.mk @@ -0,0 +1,32 @@ +# -*- 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,unoil_clioootypesversion,$(SRCDIR)/unoil/climaker)) + +$(eval $(call gb_Package_add_file,unoil_clioootypesversion,bin/clioootypesversion.mk,version.txt)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/unoil/Package_javamaker.mk b/unoil/Package_javamaker.mk new file mode 100644 index 000000000000..7b7fcb7072d7 --- /dev/null +++ b/unoil/Package_javamaker.mk @@ -0,0 +1,38 @@ +# -*- 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,unoil_javamaker,$(WORKDIR)/CustomTarget/unoil/javamaker)) + +$(eval $(call gb_Package_add_customtarget,unoil_javamaker,unoil/javamaker)) + +$(eval $(call gb_CustomTarget_add_outdir_dependencies,unoil/javamaker,\ + $(OUTDIR_FOR_BUILD)/bin/javamaker$(gb_Executable_EXT_for_build) \ + $(OUTDIR)/bin/offapi.rdb \ + $(OUTDIR)/bin/udkapi.rdb \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/unoil/climaker/Makefile b/unoil/climaker/Makefile new file mode 100644 index 000000000000..0d029f7a8ae5 --- /dev/null +++ b/unoil/climaker/Makefile @@ -0,0 +1,64 @@ +# -*- 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 + +include $(SRCDIR)/unoil/climaker/version.txt + +cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt + $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_execute,climaker \ + $(if $(filter -s,$(MAKEFLAGS)),,--verbose) \ + --out $@ \ + --assembly-version $(CLI_OOOTYPES_NEW_VERSION) \ + --assembly-company "LibreOffice" \ + --assembly-description "This assembly contains metadata for the LibreOffice API." \ + -X $(OUTDIR)/bin/udkapi.rdb \ + -r $(OUTDIR)/bin/cli_uretypes.dll \ + --keyfile $(OUTDIR)/bin/cliuno.snk \ + $(OUTDIR)/bin/offapi.rdb) > /dev/null) + +cli_oootypes.config : $(SRCDIR)/unoil/climaker/cli_oootypes_config $(SRCDIR)/unoil/climaker/version.txt + $(call gb_Helper_abbreviate_dirs_native, \ + perl $(SRCDIR)/solenv/bin/clipatchconfig.pl $^ $@) + +$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll : cli_oootypes.dll cli_oootypes.config + $(call gb_Helper_abbreviate_dirs_native, \ + al -out:$@ \ + -version:$(CLI_OOOTYPES_POLICY_VERSION) \ + -keyfile:$(OUTDIR)/bin/cliuno.snk \ + -link:cli_oootypes.config) + +.DEFAULT_GOAL := all +.PHONY : all +all : \ + cli_oootypes.dll \ + cli_oootypes.config \ + $(CLI_OOOTYPES_POLICY_ASSEMBLY).dll + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/unoil/climaker/makefile.mk b/unoil/climaker/makefile.mk deleted file mode 100644 index d820e72d082e..000000000000 --- a/unoil/climaker/makefile.mk +++ /dev/null @@ -1,93 +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 = unoil - -# for dummy -TARGET = unotypes - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -.INCLUDE : target.mk - -.INCLUDE : version.txt - -POLICY_ASSEMBLY_FILE=$(BIN)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll - -.IF "$(BUILD_FOR_CLI)" != "" - -ALLTAR : \ - $(BIN)$/clioootypesversion.mk \ - $(BIN)$/cli_oootypes.dll \ - $(POLICY_ASSEMBLY_FILE) - -.ELSE - -ALLTAR : \ - $(BIN)$/clioootypesversion.mk - -.ENDIF - - -CLIMAKERFLAGS = -.IF "$(debug)" != "" -CLIMAKERFLAGS += --verbose -.ENDIF - -RDB = $(SOLARBINDIR)$/offapi.rdb -EXTRA_RDB = $(SOLARBINDIR)$/udkapi.rdb - -$(BIN)/cli_oootypes.dll : $(RDB) $(EXTRA_RDB) version.txt - $(CLIMAKER) $(CLIMAKERFLAGS) \ - --out $@ \ - --assembly-version $(CLI_OOOTYPES_NEW_VERSION) \ - --assembly-company "OpenOffice.org" \ - --assembly-description "This assembly contains metadata for the StarOffice/OpenOffice.org API." \ - -X $(EXTRA_RDB) \ - -r $(SOLARBINDIR)$/cli_uretypes.dll \ - --keyfile $(SOLARBINDIR)$/cliuno.snk \ - $(RDB) - - -#Create the config file that is used with the policy assembly -$(BIN)$/cli_oootypes.config: cli_oootypes_config version.txt - $(PERL) $(SOLARENV)$/bin$/clipatchconfig.pl \ - $< $@ - -$(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_oootypes.config $(BIN)$/cli_oootypes.dll - $(WRAPCMD) AL.exe -out:$@ \ - -version:$(CLI_OOOTYPES_POLICY_VERSION) \ - -keyfile:$(SOLARBINDIR)$/cliuno.snk \ - -link:$(BIN)$/cli_oootypes.config - -#always deliver a clioootypesversion.mk. It is needed for the packing process even for all other -#platforms. Therefore BUILD_FOR_CLI is not used here -$(BIN)$/clioootypesversion.mk: version.txt - $(GNUCOPY) $< $@ - diff --git a/unoil/com/sun/star/deployment/ui/makefile.mk b/unoil/com/sun/star/deployment/ui/makefile.mk deleted file mode 100644 index e8c4cb1aaff4..000000000000 --- a/unoil/com/sun/star/deployment/ui/makefile.mk +++ /dev/null @@ -1,33 +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. -# -#************************************************************************* - -PRJNAME = unoil -PRJ = ..$/..$/..$/..$/.. -TARGET = unoil_deployment_ui -PACKAGE = com$/sun$/star$/deployment$/ui - -.INCLUDE : $(PRJ)$/makefile.pmk diff --git a/unoil/com/sun/star/frame/status/makefile.mk b/unoil/com/sun/star/frame/status/makefile.mk deleted file mode 100644 index 2739547fbe0b..000000000000 --- a/unoil/com/sun/star/frame/status/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. -# -#************************************************************************* - -PRJNAME = unoil -PRJ = ..$/..$/..$/..$/.. -TARGET = unoil_framestatus -PACKAGE = com$/sun$/star$/frame$/status - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/makefile.pmk diff --git a/unoil/com/sun/star/graphic/makefile.mk b/unoil/com/sun/star/graphic/makefile.mk deleted file mode 100755 index 1863ad61879d..000000000000 --- a/unoil/com/sun/star/graphic/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. -# -#************************************************************************* - -PRJNAME = unoil -PRJ = ..$/..$/..$/.. -TARGET = unoil_graphic -PACKAGE = com$/sun$/star$/graphic - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/makefile.pmk diff --git a/unoil/com/sun/star/mail/makefile.mk b/unoil/com/sun/star/mail/makefile.mk deleted file mode 100644 index 0db33e5b4a25..000000000000 --- a/unoil/com/sun/star/mail/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. -# -#************************************************************************* - -PRJNAME = unoil -PRJ = ..$/..$/..$/.. -TARGET = unoil_mail -PACKAGE = com$/sun$/star$/mail - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/makefile.pmk diff --git a/unoil/com/sun/star/media/makefile.mk b/unoil/com/sun/star/media/makefile.mk deleted file mode 100644 index 74c5f52990cc..000000000000 --- a/unoil/com/sun/star/media/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. -# -#************************************************************************* - -PRJNAME = unoil -PRJ = ..$/..$/..$/.. -TARGET = unoil_media -PACKAGE = com$/sun$/star$/media - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/makefile.pmk diff --git a/unoil/drafts/com/sun/star/frame/status/makefile.mk b/unoil/drafts/com/sun/star/frame/status/makefile.mk deleted file mode 100644 index f5c93aaf61ac..000000000000 --- a/unoil/drafts/com/sun/star/frame/status/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. -# -#************************************************************************* - -PRJNAME = unoil -PRJ = ..$/..$/..$/..$/..$/.. -TARGET = unoil_framestatus_drafts -PACKAGE = drafts$/com$/sun$/star$/frame$/status - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/makefile.pmk diff --git a/unoil/javamaker/Makefile b/unoil/javamaker/Makefile new file mode 100644 index 000000000000..d39e96b984c9 --- /dev/null +++ b/unoil/javamaker/Makefile @@ -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 <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 : + $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_execute,javamaker -BUCR -O$(realpath .) $(OUTDIR)/bin/offapi.rdb -X$(OUTDIR)/bin/udkapi.rdb) && \ + touch $@) + +.DEFAULT_GOAL := all +.PHONY : all +all : done + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/unoil/javamaker/makefile.mk b/unoil/javamaker/makefile.mk deleted file mode 100644 index 47f910339151..000000000000 --- a/unoil/javamaker/makefile.mk +++ /dev/null @@ -1,47 +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 := unoil -TARGET := javamaker - -.INCLUDE: settings.mk - -RDB = $(SOLARBINDIR)$/offapi.rdb -EXTRA_RDB = $(SOLARBINDIR)$/udkapi.rdb - -.INCLUDE: target.mk - -.IF "$(SOLAR_JAVA)" != "" - -ALLTAR: $(MISC)$/javamaker.done - -$(MISC)$/javamaker.done .ERRREMOVE: $(RDB) $(EXTRA_RDB) - $(JAVAMAKER) -BUCR -O$(CLASSDIR) $(RDB) -X$(EXTRA_RDB) - $(TOUCH) $@ - -.ENDIF diff --git a/unoil/prj/build.lst b/unoil/prj/build.lst index 15104e8ff6e8..5667774ac49d 100644 --- a/unoil/prj/build.lst +++ b/unoil/prj/build.lst @@ -1,4 +1,2 @@ ul unoil :: DESKTOP:codemaker offapi ridljar solenv cli_ure NULL -ul unoil\javamaker nmake - all ul_javamaker NULL -ul unoil\util nmake - all ul_util ul_javamaker NULL -ul unoil\climaker nmake - all ul_climaker NULL
\ No newline at end of file +ul unoil\prj nmake - all ul_prj NULL diff --git a/unoil/prj/d.lst b/unoil/prj/d.lst index b4ee5815d778..e69de29bb2d1 100644 --- a/unoil/prj/d.lst +++ b/unoil/prj/d.lst @@ -1,5 +0,0 @@ -..\%__SRC%\class\unoil.jar %_DEST%\bin\unoil.jar -..\%__SRC%\bin\cli_oootypes.dll %_DEST%\bin\cli_oootypes.dll -..\%__SRC%\bin\cli_oootypes.config %_DEST%\bin\cli_oootypes.config -..\%__SRC%\bin\policy*.dll %_DEST%\bin\policy*.dll -..\%__SRC%\bin\clioootypesversion.mk %_DEST%\bin\clioootypesversion.mk diff --git a/unoil/prj/makefile.mk b/unoil/prj/makefile.mk new file mode 100644 index 000000000000..0997622e00f6 --- /dev/null +++ b/unoil/prj/makefile.mk @@ -0,0 +1 @@ +.INCLUDE : gbuildbridge.mk diff --git a/unoil/util/makefile.mk b/unoil/util/makefile.mk deleted file mode 100644 index c2bd22ef2733..000000000000 --- a/unoil/util/makefile.mk +++ /dev/null @@ -1,44 +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 = unoil -TARGET = unoil - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -MAXLINELENGTH = 100000 - -JARCLASSDIRS = com -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/unoil/util/makefile.pmk b/unoil/util/makefile.pmk deleted file mode 100644 index 6a3ea0d706e4..000000000000 --- a/unoil/util/makefile.pmk +++ /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. -# -#************************************************************************* - -# no translation here anyway -.IF "$(L10N_framework)"=="" -.IF "$(COM)" == "MSC" -BUILD_FOR_CLI = "true" -CFLAGSENABLESYMBOLS:=-Z7 -.ENDIF -.ENDIF # "L10N_framework"=="" - diff --git a/ure/source/README b/ure/source/README index 1463e04fdbbb..efb88d9e4511 100644 --- a/ure/source/README +++ b/ure/source/README @@ -68,7 +68,7 @@ Linux x86, Solaris x86, and Solaris SPARC: /opt/openoffice.org/ure/lib/libjvmaccessgcc3.so.3 [private; Linux x86 only] /opt/openoffice.org/ure/lib/libjvmaccessC52.so.3 [private; Solaris only] /opt/openoffice.org/ure/lib/libjvmfwk.so.3 [private] -/opt/openoffice.org/ure/lib/sunjavaplugin.so [private] +/opt/openoffice.org/ure/lib/libsunjavaplugin.so [private] /opt/openoffice.org/ure/lib/JREProperties.class [private] /opt/openoffice.org/ure/lib/jvmfwk3rc [private] /opt/openoffice.org/ure/lib/libgcc3_uno.so [private; Linux x86 only] @@ -129,7 +129,7 @@ Program Files\URE\bin\store3.dll [private] Program Files\URE\bin\xmlreader.dll [private] Program Files\URE\bin\jvmaccess3MSC.dll [private] Program Files\URE\bin\jvmfwk3.dll [private] -Program Files\URE\bin\sunjavaplugin.dll [private] +Program Files\URE\bin\libsunjavaplugin.dll [private] Program Files\URE\bin\JREProperties.class [private] Program Files\URE\bin\jvmfwk3.ini [private] Program Files\URE\bin\msci_uno.dll [private] |