diff options
author | David Tardon <dtardon@redhat.com> | 2011-12-21 15:00:45 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2011-12-23 16:43:00 +0100 |
commit | 7aadee6df631f9b100777e2cfec324292f46c3c8 (patch) | |
tree | 8ee87d2f3dc22cf6a189556ee8a06cb6fd8ca417 | |
parent | convert windows-specific bits, part 1: jars (diff) | |
download | core-7aadee6df631f9b100777e2cfec324292f46c3c8.tar.gz core-7aadee6df631f9b100777e2cfec324292f46c3c8.zip |
convert windows-specific bits, part 2: lib
-rw-r--r-- | Repository.mk | 1 | ||||
-rw-r--r-- | accessibility/Library_java_uno_accessbridge.mk | 58 | ||||
-rw-r--r-- | accessibility/Module_accessibility.mk | 2 | ||||
-rw-r--r-- | accessibility/Package_bridge_inc.mk | 36 | ||||
-rw-r--r-- | accessibility/bridge/source/java/Makefile | 43 | ||||
-rw-r--r-- | accessibility/bridge/source/java/makefile.mk | 70 |
6 files changed, 140 insertions, 70 deletions
diff --git a/Repository.mk b/Repository.mk index 1d147d27c2f7..56a252d73869 100644 --- a/Repository.mk +++ b/Repository.mk @@ -275,6 +275,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ dict_zh \ fileacc \ index_data \ + java_uno_accessbridge \ localedata_en \ localedata_es \ localedata_euro \ diff --git a/accessibility/Library_java_uno_accessbridge.mk b/accessibility/Library_java_uno_accessbridge.mk new file mode 100644 index 000000000000..d6e008fce51f --- /dev/null +++ b/accessibility/Library_java_uno_accessbridge.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,java_uno_accessbridge)) + +$(eval $(call gb_Library_add_package_headers,java_uno_accessbridge,\ + accessibility_bridge_inc \ +)) + +$(eval $(call gb_Library_set_include,java_uno_accessbridge,\ + $$(INCLUDE) \ + -I$(WORKDIR)/CustomTarget/accessibility/bridge/inc \ +)) + +$(eval $(call gb_Library_add_api,java_uno_accessbridge,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,java_uno_accessbridge,\ + cppu \ + jvmaccess \ + sal \ + salhelper \ + tl \ + vcl \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,java_uno_accessbridge,\ + accessibility/bridge/source/java/WindowsAccessBridgeAdapter \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/accessibility/Module_accessibility.mk b/accessibility/Module_accessibility.mk index 1b97bb9c0a0d..04ce3461d760 100644 --- a/accessibility/Module_accessibility.mk +++ b/accessibility/Module_accessibility.mk @@ -37,7 +37,9 @@ ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,accessibility,\ Jar_accessibility \ Jar_uno_accessbridge \ + Library_java_uno_accessbridge \ Package_bridge \ + Package_bridge_inc \ )) endif endif diff --git a/accessibility/Package_bridge_inc.mk b/accessibility/Package_bridge_inc.mk new file mode 100644 index 000000000000..78fe99f1988b --- /dev/null +++ b/accessibility/Package_bridge_inc.mk @@ -0,0 +1,36 @@ +# -*- 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,accessibility_bridge_inc,$(WORKDIR)/CustomTarget/accessibility/bridge/inc)) + +$(eval $(call gb_Package_add_customtarget,accessibility_bridge_inc,accessibility/bridge/source/java)) + +$(eval $(call gb_CustomTarget_add_outdir_dependencies,accessibility/bridge/source/java,\ + $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,java_uno_accessbridge)) \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/accessibility/bridge/source/java/Makefile b/accessibility/bridge/source/java/Makefile new file mode 100644 index 000000000000..e582dc3efd27 --- /dev/null +++ b/accessibility/bridge/source/java/Makefile @@ -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) 2011 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.mk + +TARGETDIR := $(WORKDIR)/CustomTarget/accessibility/bridge/inc + +$(TARGETDIR)/WindowsAccessBridgeAdapter.h : + mkdir -p $(dir $@) && \ + cd $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,java_uno_accessbridge)) && \ + javah -classpath . -o $@ org.openoffice.accessibility.WindowsAccessBridgeAdapter + +.DEFAULT_GOAL := all +.PHONY : all +all : \ + $(TARGETDIR)/WindowsAccessBridgeAdapter.h + +# vim: set ts=4 sw=4 et: diff --git a/accessibility/bridge/source/java/makefile.mk b/accessibility/bridge/source/java/makefile.mk deleted file mode 100644 index f010b953e1d5..000000000000 --- a/accessibility/bridge/source/java/makefile.mk +++ /dev/null @@ -1,70 +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=accessibility -TARGET=accessbridge -LIBTARGET=NO -USE_DEFFILE=TRUE -ENABLE_EXCEPTIONS=TRUE -VERSIONOBJ= - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(GUI)"=="WNT" && "$(SOLAR_JAVA)" != "" - -SLOFILES= $(SLO)$/WindowsAccessBridgeAdapter.obj - -SHL1TARGET=java_uno_accessbridge -SHL1IMPLIB=i$(SHL1TARGET) -SHL1STDLIBS=$(VCLLIB) $(TOOLSLIB) $(JVMACCESSLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) -SHL1OBJS=$(SLOFILES) -SHL1VERSIONOBJ= - -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - -SHL1HEADER=$(OUT)$/inc$/WindowsAccessBridgeAdapter.h - -.ENDIF # "$(GUI)"=="WNT" && "$(SOLAR_JAVA)" != "" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.IF "$(GUI)"=="WNT" && "$(SOLAR_JAVA)" != "" - -$(SLO)$/WindowsAccessBridgeAdapter.obj : $(SHL1HEADER) - -$(SHL1HEADER) : - javah -classpath $(OUT)$/class -o $(SHL1HEADER) org.openoffice.accessibility.WindowsAccessBridgeAdapter - -.ENDIF # "$(GUI)"=="WNT" && "$(SOLAR_JAVA)" != "" |