gbuildize jvmfwk

Repository.mk

@@ -94,6 +94,14 @@ endif
 
 endif
 
+ifneq ($(OS),MACOSX)
+
+$(eval $(call gb_Helper_register_executables,UREBIN,\
+	javaldx \
+))
+
+endif
+
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 	PptImporter \
 	adabas \
@@ -260,6 +268,7 @@ endif
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
     sal_textenc \
+    sunjavaplugin \
 	xmlreader \
 ))
 

RepositoryExternal.mk

@@ -901,6 +901,29 @@ endef
 endif # SYSTEM_CURL
 
 
+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)
 

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:

jvmfwk/JavaClassSet_jreproperties.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_JavaClassSet_JavaClassSet,jvmfwk_jreproperties))
+
+$(eval $(call gb_JavaClassSet_add_sourcefiles,jvmfwk_jreproperties,\
+    jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:

jvmfwk/Library_jvmfwk.mk

@@ -0,0 +1,58 @@
+# -*- 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_api,jvmfwk,\
+    udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,jvmfwk,\
+    cppuhelper \
+    sal \
+    $(if $(filter WNT,$(OS)),advapi32) \
+))
+
+$(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:

jvmfwk/Library_sunjavaplugin.mk

@@ -0,0 +1,75 @@
+# -*- 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))
+
+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_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:

jvmfwk/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:

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,\
+    JavaClassSet_jreproperties \
+    Library_jvmfwk \
+    Library_sunjavaplugin \
+    Package_inc \
+    Package_javavendors \
+    Package_rcfiles \
+))
+
+ifneq ($(OS),MACOSX)
+$(eval $(call gb_Module_add_targets,jvmfwk,\
+    Executable_javaldx \
+))
+endif
+
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:

jvmfwk/Package_inc.mk

@@ -0,0 +1,33 @@
+# -*- 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/vendorplugin.h,vendorplugin.h))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:

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:

jvmfwk/Package_rcfiles.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_rcfiles,$(SRCDIR)/jvmfwk))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,bin/sunjavaplugin.ini,plugins/sunmajor/pluginlib/sunjavapluginrc))
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,bin/jvmfwk3.ini,source/jvmfwk3rc))
+else
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,bin/sunjavapluginrc,plugins/sunmajor/pluginlib/sunjavapluginrc))
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,bin/jvmfwk3rc,source/jvmfwk3rc))
+endif
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,bin/javasettingsunopkginstall.xml,source/javasettingsunopkginstall.xml))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:

jvmfwk/prj/makefile.mk

@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk

jvmfwk/template.mk

@@ -0,0 +1,28 @@
+# -*- 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.
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab: