[Libreoffice-commits] .: 11 commits - accessibility/AllLangResTarget_acc.mk accessibility/bridge accessibility/inc accessibility/Jar_accessibility.mk accessibility/Jar_uno_accessbridge.mk accessibility/Library_acc.mk accessibility/Library_java_uno_accessbridge.mk accessibility/Makefile accessibility/Module_accessibility.mk accessibility/Package_bridge_inc.mk accessibility/Package_bridge.mk accessibility/prj accessibility/source accessibility/util filter/Jar_XSLTFilter.mk Module_tail_build.mk postprocess/packcomponents postprocess/prj Repository.mk RepositoryModule_ooo.mk solenv/gbuild
David Tardon
dtardon at kemper.freedesktop.org
Fri Dec 23 07:44:46 PST 2011
Module_tail_build.mk | 1
Repository.mk | 2
RepositoryModule_ooo.mk | 1
accessibility/AllLangResTarget_acc.mk | 47 +++
accessibility/Jar_accessibility.mk | 95 +++++++
accessibility/Jar_uno_accessbridge.mk | 54 ++++
accessibility/Library_acc.mk | 126 ++++++++++
accessibility/Library_java_uno_accessbridge.mk | 58 ++++
accessibility/Makefile | 40 +++
accessibility/Module_accessibility.mk | 47 +++
accessibility/Package_bridge.mk | 32 ++
accessibility/Package_bridge_inc.mk | 36 ++
accessibility/bridge/Makefile | 52 ++++
accessibility/bridge/org/openoffice/accessibility/makefile.mk | 62 ----
accessibility/bridge/org/openoffice/java/accessibility/AccessibleRelationAdapter.java | 64 -----
accessibility/bridge/org/openoffice/java/accessibility/makefile.mk | 115 ---------
accessibility/bridge/source/java/Makefile | 43 +++
accessibility/bridge/source/java/makefile.mk | 70 -----
accessibility/inc/makefile.mk | 39 ---
accessibility/prj/build.lst | 10
accessibility/prj/d.lst | 8
accessibility/prj/makefile.mk | 1
accessibility/source/extended/makefile.mk | 78 ------
accessibility/source/helper/makefile.mk | 53 ----
accessibility/source/standard/makefile.mk | 78 ------
accessibility/util/acc.map | 7
accessibility/util/makefile.mk | 82 ------
filter/Jar_XSLTFilter.mk | 2
postprocess/packcomponents/makefile.mk | 2
postprocess/prj/build.lst | 2
solenv/gbuild/CustomTarget.mk | 9
solenv/gbuild/Jar.mk | 52 +++-
solenv/gbuild/JavaClassSet.mk | 44 ++-
33 files changed, 724 insertions(+), 688 deletions(-)
New commits:
commit 636a8f2943ce5d11acc05ebed0c5f50edaef6b03
Author: David Tardon <dtardon at redhat.com>
Date: Fri Dec 23 16:11:57 2011 +0100
use generated java source
diff --git a/accessibility/Jar_accessibility.mk b/accessibility/Jar_accessibility.mk
index ffb86ee..2eb0f72 100644
--- a/accessibility/Jar_accessibility.mk
+++ b/accessibility/Jar_accessibility.mk
@@ -31,15 +31,10 @@ $(eval $(call gb_Jar_add_jars,java_accessibility,\
$(OUTDIR)/bin/jurt.jar \
$(OUTDIR)/bin/ridl.jar \
$(OUTDIR)/bin/unoil.jar \
- $(WORKDIR)/CustomTarget/accessibility/bridge/classes \
))
$(eval $(call gb_Jar_set_packageroot,java_accessibility,org))
-$(eval $(call gb_Jar_add_packagedirs,java_accessibility,\
- $(WORKDIR)/CustomTarget/accessibility/bridge/classes/org \
-))
-
$(eval $(call gb_Jar_add_sourcefiles,java_accessibility,\
accessibility/bridge/org/openoffice/java/accessibility/AbstractButton \
accessibility/bridge/org/openoffice/java/accessibility/AccessibleActionImpl \
@@ -88,9 +83,13 @@ $(eval $(call gb_Jar_add_sourcefiles,java_accessibility,\
accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleTextLog \
))
+$(eval $(call gb_Jar_add_generated_sourcefiles,java_accessibility,\
+ CustomTarget/accessibility/bridge/org/openoffice/java/accessibility/Build \
+))
+
# Dummy dep. to satisfy make's depsolver: .../classes is created by a
# custom target, so there is no dependency information for it here.
# It also makes sure that the package is built before this jar .-)
-$(WORKDIR)/CustomTarget/accessibility/bridge/classes :| $(call gb_Package_get_target,accessibility_bridge)
+$(call gb_Jar_get_target,java_accessibility) :| $(call gb_Package_get_target,accessibility_bridge)
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/accessibility/bridge/Makefile b/accessibility/bridge/Makefile
index 67792cd..9ed435a 100644
--- a/accessibility/bridge/Makefile
+++ b/accessibility/bridge/Makefile
@@ -26,10 +26,6 @@
# instead of those above.
gb_PARTIALBUILD := T
-include $(GBUILDDIR)/gbuild.mk
-
-TARGETDIR := $(WORKDIR)/CustomTarget/accessibility/bridge
-PACKAGE := org/openoffice/java/accessibility
ifeq ($(PRODUCT),)
DEBUGSWITCH := true
@@ -39,14 +35,7 @@ DEBUGSWITCH := false
PRODUCTSWITCH := true
endif
-$(TARGETDIR)/done : $(TARGETDIR)/classes/$(PACKAGE)/Build.class
- mkdir -p $(dir $@) && touch $@
-
-$(TARGETDIR)/classes/$(PACKAGE)/Build.class : $(TARGETDIR)/src/$(PACKAGE)/Build.java | $(gb_JavaClassSet_JAVACCOMMAND)
- mkdir -p $(dir $@) && \
- $(gb_JavaClassSet_JAVACCOMMAND) $(gb_JavaClassSet_JAVACDEBUG) -d $(TARGETDIR)/classes $^
-
-$(TARGETDIR)/src/$(PACKAGE)/Build.java :
+org/openoffice/java/accessibility/Build.java :
mkdir -p $(dir $@) && (\
echo package org.openoffice.java.accessibility\; && \
echo public class Build \{ && \
@@ -58,6 +47,6 @@ $(TARGETDIR)/src/$(PACKAGE)/Build.java :
.DEFAULT_GOAL := all
.PHONY : all
all : \
- $(TARGETDIR)/done
+ org/openoffice/java/accessibility/Build.java
# vim: set ts=4 sw=4 et:
commit 7fe7126248ff043e2f9a36f07c544602f1d774af
Author: David Tardon <dtardon at redhat.com>
Date: Fri Dec 23 16:08:18 2011 +0100
allow use of generated files in gb_Jar
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 295aa69..b5ba394 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -140,6 +140,16 @@ $(foreach sourcefile,$(2),$(call gb_Jar_add_sourcefile,$(1),$(sourcefile)))
endef
+define gb_Jar_add_generated_sourcefile
+$(call gb_JavaClassSet_add_generated_sourcefile,$(call gb_Jar_get_classsetname,$(1)),$(2))
+
+endef
+
+define gb_Jar_add_generated_sourcefiles
+$(foreach sourcefile,$(2),$(call gb_Jar_add_generated_sourcefile,$(1),$(sourcefile)))
+
+endef
+
define gb_JarTest_set_classpath
$(call gb_JavaClassSet_set_classpath,$(call gb_Jar_get_classsetname,$(1)),$(2))
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 61cb4e8..6befda1 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -69,6 +69,10 @@ define gb_JavaClassSet__get_sourcefile
$(SRCDIR)/$(1).java
endef
+define gb_JavaClassSet__get_generated_sourcefile
+$(WORKDIR)/$(1).java
+endef
+
define gb_JavaClassSet_add_sourcefile
$(call gb_JavaClassSet_get_target,$(1)) : $(call gb_JavaClassSet__get_sourcefile,$(2))
@@ -79,6 +83,17 @@ $(foreach sourcefile,$(2),$(call gb_JavaClassSet_add_sourcefile,$(1),$(sourcefil
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)
+
+endef
+
+define gb_JavaClassSet_add_generated_sourcefiles
+$(foreach sourcefile,$(2),$(call gb_JavaClassSet_add_generated_sourcefile,$(1),$(sourcefile)))
+
+endef
+
define gb_JavaClassSet_set_classpath
$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $(2)
commit f75d68b30dd4bac201a302094ee028208ddc3469
Author: David Tardon <dtardon at redhat.com>
Date: Fri Dec 23 15:35:55 2011 +0100
avoid copying hack
diff --git a/accessibility/Jar_accessibility.mk b/accessibility/Jar_accessibility.mk
index 5f5737a..ffb86ee 100644
--- a/accessibility/Jar_accessibility.mk
+++ b/accessibility/Jar_accessibility.mk
@@ -36,6 +36,10 @@ $(eval $(call gb_Jar_add_jars,java_accessibility,\
$(eval $(call gb_Jar_set_packageroot,java_accessibility,org))
+$(eval $(call gb_Jar_add_packagedirs,java_accessibility,\
+ $(WORKDIR)/CustomTarget/accessibility/bridge/classes/org \
+))
+
$(eval $(call gb_Jar_add_sourcefiles,java_accessibility,\
accessibility/bridge/org/openoffice/java/accessibility/AbstractButton \
accessibility/bridge/org/openoffice/java/accessibility/AccessibleActionImpl \
@@ -84,11 +88,9 @@ $(eval $(call gb_Jar_add_sourcefiles,java_accessibility,\
accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleTextLog \
))
-# XXX yes, I know this is a nasty hack. But it is the easiest way (and,
-# from what I have tried so far, the only working one) to get the damned
-# class file packed into the jar.
-$(WORKDIR)/CustomTarget/accessibility/bridge/classes : $(call gb_Package_get_target,accessibility_bridge)
- mkdir -p $(call gb_Jar_get_workdir,java_accessibility)/org/openoffice/java/accessibility && \
- $(call gb_Deliver_deliver,$(WORKDIR)/CustomTarget/accessibility/bridge/classes/org/openoffice/java/accessibility/Build.class,$(call gb_Jar_get_workdir,java_accessibility)/org/openoffice/java/accessibility)
+# Dummy dep. to satisfy make's depsolver: .../classes is created by a
+# custom target, so there is no dependency information for it here.
+# It also makes sure that the package is built before this jar .-)
+$(WORKDIR)/CustomTarget/accessibility/bridge/classes :| $(call gb_Package_get_target,accessibility_bridge)
# vim:set shiftwidth=4 softtabstop=4 expandtab:
commit 713e536fe987f4dbd901656fda19ec4908a0a2f1
Author: David Tardon <dtardon at redhat.com>
Date: Fri Dec 23 15:31:26 2011 +0100
work around deficiency in jar
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 36e5112..295aa69 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -48,6 +48,12 @@ endef
# creates the target folder of the jar file if it doesn't exist
# creates the jar file
# jar program does not remove the target in case of error, so rm it manually
+# XXX: PACKAGEDIRS need special treatment, because sometimes we need to
+# add into the jar another class hierarchy created outside of our class
+# set (e.g., by javamaker). Because jar does not allow two same root dirs
+# when creating the archive, we work around this deficiency by creating
+# the archive with the main class hierarchy and then updating it from
+# the other one(s), which seems to work .-)
define gb_Jar__command
$(call gb_Output_announce,$*,$(true),JAR,3)
$(call gb_Helper_abbreviate_dirs_native,\
@@ -59,6 +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))) \
|| (rm $(2); false) )
endef
@@ -84,6 +91,7 @@ define gb_Jar_Jar
$(call gb_Jar_get_target,$(1)) : MANIFEST :=
$(call gb_Jar_get_target,$(1)) : JARCLASSPATH :=
$(call gb_Jar_get_target,$(1)) : PACKAGEROOTS :=
+$(call gb_Jar_get_target,$(1)) : PACKAGEDIRS :=
$(call gb_Jar_get_target,$(1)) : PACKAGEFILES :=
$(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1)))
$(call gb_JavaClassSet_set_classpath,$(call gb_Jar_get_classsetname,$(1)),$(value XCLASSPATH))
@@ -99,19 +107,31 @@ $(call gb_JavaClassSet_add_sourcefile,$(call gb_Jar_get_classsetname,$(1)),$(2))
endef
-# PACKAGEROOTS is the list of all root folders to pack into the jar (without META-INF as this is added automatically)
+# PACKAGEROOTS is the list of all root folders created by the JavaClassSet to pack into the jar (without META-INF as this is added automatically)
define gb_Jar_set_packageroot
$(call gb_Jar_get_target,$(1)) : PACKAGEROOTS := $(2)
endef
+#
+# PACKAGEDIRS is the list of additional root directories to pack into the jar
+define gb_Jar_add_packagedir
+$(call gb_Jar_get_target,$(1)) : PACKAGEDIRS += $(2)
+
+endef
+
+define gb_Jar_add_packagedirs
+$(foreach packagedir,$(2),$(call gb_Jar_add_packagedir,$(1),$(packagedir)))
+
+endef
# PACKAGEFILES is the list of all root files to pack into the jar
define gb_Jar_add_packagefile
$(call gb_Jar_get_target,$(1)) : PACKAGEFILES += $(2)
-$(call gb_Jar_get_target,$(1)) : $(call gb_Jar_get_workdir,$(1))/$(strip $(2))
-$(call gb_Jar_get_workdir,$(1))/$(strip $(2)) : $(3) $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,$(1)))
- mkdir -p $$(dir $$@)
- cp -rf $(3) $$@
+
+endef
+
+define gb_Jar_add_packagefiles
+$(foreach packagefile,$(2),$(call gb_Jar_add_packagefile,$(1),$(packagefile)))
endef
commit d3fec0e98b0dc5aca59ee43814f8a31bea96327b
Author: David Tardon <dtardon at redhat.com>
Date: Fri Dec 23 07:20:05 2011 +0100
remove unused file
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleRelationAdapter.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleRelationAdapter.java
deleted file mode 100644
index 2f1709a..0000000
--- a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleRelationAdapter.java
+++ /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.
- *
- ************************************************************************/
-
-package org.openoffice.java.accessibility;
-
-import javax.accessibility.Accessible;
-import com.sun.star.accessibility.AccessibleRelation;
-import com.sun.star.accessibility.XAccessible;
-
-/**
- */
-public abstract class AccessibleRelationTypeMap {
-
- final static String[] data = {
- null,
- javax.accessibility.AccessibleRelation.CONTROLLED_BY,
- javax.accessibility.AccessibleRelation.CONTROLLED_BY,
- javax.accessibility.AccessibleRelation.CONTROLLER_FOR,
- javax.accessibility.AccessibleRelation.CONTROLLER_FOR,
- javax.accessibility.AccessibleRelation.LABEL_FOR,
- javax.accessibility.AccessibleRelation.LABEL_FOR,
- javax.accessibility.AccessibleRelation.LABELED_BY,
- javax.accessibility.AccessibleRelation.LABELED_BY,
- javax.accessibility.AccessibleRelation.MEMBER_OF,
- javax.accessibility.AccessibleRelation.MEMBER_OF
- };
-
- public static void fillAccessibleRelationSet(javax.accessibility.AccessibleRelationSet s, AccessibleRelation[] relations) {
- AccessibleObjectFactory factory = AccessibleObjectFactory.getDefault();
- for(int i=0; i<relations.length; i++) {
- if( relations[i].RelationType < data.length && data[relations[i].RelationType] != null ) {
- javax.accessibility.AccessibleRelation r =
- new javax.accessibility.AccessibleRelation(data[relations[i].RelationType]);
-
- r.setTarget(factory.getAccessibleObjectSet(relations[i].TargetSet));
- s.add(r);
- }
- }
- }
-}
commit 77a09f857a4507a34cb7b5dde0e818ec3338c422
Author: David Tardon <dtardon at redhat.com>
Date: Wed Dec 21 15:32:54 2011 +0100
move accessibility to tail_build
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 9b0dc4c..9cc2d90 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -25,6 +25,7 @@
$(eval $(call gb_Module_Module,tail_end))
$(eval $(call gb_Module_add_moduledirs,tail_end,\
+ accessibility \
animations \
basctl \
bean \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 50f4f60..8088ea0 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg ODK:odk officecfg psprint_config remotebridges scaddins scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt smoketest tail_build NULL
+po postprocess :: BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg ODK:odk officecfg psprint_config remotebridges scaddins scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt smoketest tail_build NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL
commit 7aadee6df631f9b100777e2cfec324292f46c3c8
Author: David Tardon <dtardon at redhat.com>
Date: Wed Dec 21 15:00:45 2011 +0100
convert windows-specific bits, part 2: lib
diff --git a/Repository.mk b/Repository.mk
index 1d147d2..56a252d 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 0000000..d6e008f
--- /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 at 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 1b97bb9..04ce346 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 0000000..78fe99f
--- /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 at 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 0000000..e582dc3
--- /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 at 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 f010b95..0000000
--- 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)" != ""
commit 24585e1bf151eb66ddae998b087f832c62e5a2f3
Author: David Tardon <dtardon at redhat.com>
Date: Tue Dec 20 12:08:08 2011 +0100
convert windows-specific bits, part 1: jars
diff --git a/accessibility/Jar_accessibility.mk b/accessibility/Jar_accessibility.mk
new file mode 100644
index 0000000..5f5737a
--- /dev/null
+++ b/accessibility/Jar_accessibility.mk
@@ -0,0 +1,94 @@
+# -*- 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 at 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,java_accessibility))
+
+$(eval $(call gb_Jar_add_jars,java_accessibility,\
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(WORKDIR)/CustomTarget/accessibility/bridge/classes \
+))
+
+$(eval $(call gb_Jar_set_packageroot,java_accessibility,org))
+
+$(eval $(call gb_Jar_add_sourcefiles,java_accessibility,\
+ accessibility/bridge/org/openoffice/java/accessibility/AbstractButton \
+ accessibility/bridge/org/openoffice/java/accessibility/AccessibleActionImpl \
+ accessibility/bridge/org/openoffice/java/accessibility/AccessibleComponentImpl \
+ accessibility/bridge/org/openoffice/java/accessibility/AccessibleEditableTextImpl \
+ accessibility/bridge/org/openoffice/java/accessibility/AccessibleExtendedState \
+ accessibility/bridge/org/openoffice/java/accessibility/AccessibleHypertextImpl \
+ accessibility/bridge/org/openoffice/java/accessibility/AccessibleIconImpl \
+ accessibility/bridge/org/openoffice/java/accessibility/AccessibleKeyBinding \
+ accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory \
+ accessibility/bridge/org/openoffice/java/accessibility/AccessibleRoleAdapter \
+ accessibility/bridge/org/openoffice/java/accessibility/AccessibleSelectionImpl \
+ accessibility/bridge/org/openoffice/java/accessibility/AccessibleStateAdapter \
+ accessibility/bridge/org/openoffice/java/accessibility/AccessibleTextImpl \
+ accessibility/bridge/org/openoffice/java/accessibility/AccessibleValueImpl \
+ accessibility/bridge/org/openoffice/java/accessibility/Alert \
+ accessibility/bridge/org/openoffice/java/accessibility/Application \
+ accessibility/bridge/org/openoffice/java/accessibility/Button \
+ accessibility/bridge/org/openoffice/java/accessibility/CheckBox \
+ accessibility/bridge/org/openoffice/java/accessibility/ComboBox \
+ accessibility/bridge/org/openoffice/java/accessibility/Component \
+ accessibility/bridge/org/openoffice/java/accessibility/Container \
+ accessibility/bridge/org/openoffice/java/accessibility/DescendantManager \
+ accessibility/bridge/org/openoffice/java/accessibility/Dialog \
+ accessibility/bridge/org/openoffice/java/accessibility/FocusTraversalPolicy \
+ accessibility/bridge/org/openoffice/java/accessibility/Frame \
+ accessibility/bridge/org/openoffice/java/accessibility/Icon \
+ accessibility/bridge/org/openoffice/java/accessibility/Label \
+ accessibility/bridge/org/openoffice/java/accessibility/List \
+ accessibility/bridge/org/openoffice/java/accessibility/Menu \
+ accessibility/bridge/org/openoffice/java/accessibility/MenuContainer \
+ accessibility/bridge/org/openoffice/java/accessibility/MenuItem \
+ accessibility/bridge/org/openoffice/java/accessibility/NativeFrame \
+ accessibility/bridge/org/openoffice/java/accessibility/Paragraph \
+ accessibility/bridge/org/openoffice/java/accessibility/RadioButton \
+ accessibility/bridge/org/openoffice/java/accessibility/ScrollBar \
+ accessibility/bridge/org/openoffice/java/accessibility/Separator \
+ accessibility/bridge/org/openoffice/java/accessibility/Table \
+ accessibility/bridge/org/openoffice/java/accessibility/TextComponent \
+ accessibility/bridge/org/openoffice/java/accessibility/ToggleButton \
+ accessibility/bridge/org/openoffice/java/accessibility/ToolTip \
+ accessibility/bridge/org/openoffice/java/accessibility/Tree \
+ accessibility/bridge/org/openoffice/java/accessibility/Window \
+ accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleEventLog \
+ accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleHypertextLog \
+ accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleTextLog \
+))
+
+# XXX yes, I know this is a nasty hack. But it is the easiest way (and,
+# from what I have tried so far, the only working one) to get the damned
+# class file packed into the jar.
+$(WORKDIR)/CustomTarget/accessibility/bridge/classes : $(call gb_Package_get_target,accessibility_bridge)
+ mkdir -p $(call gb_Jar_get_workdir,java_accessibility)/org/openoffice/java/accessibility && \
+ $(call gb_Deliver_deliver,$(WORKDIR)/CustomTarget/accessibility/bridge/classes/org/openoffice/java/accessibility/Build.class,$(call gb_Jar_get_workdir,java_accessibility)/org/openoffice/java/accessibility)
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/accessibility/Jar_uno_accessbridge.mk b/accessibility/Jar_uno_accessbridge.mk
new file mode 100644
index 0000000..919e428
--- /dev/null
+++ b/accessibility/Jar_uno_accessbridge.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 at 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,java_uno_accessbridge))
+
+$(eval $(call gb_Jar_add_jars,java_uno_accessbridge,\
+ $(OUTDIR)/bin/java_accessibility.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,java_uno_accessbridge,org))
+
+$(eval $(call gb_Jar_set_manifest,java_uno_accessbridge,$(SRCDIR)/accessibility/bridge/org/openoffice/accessibility/manifest))
+
+$(eval $(call gb_Jar_set_jarclasspath,java_uno_accessbridge,\
+ $$(JARCLASSPATH) \
+))
+
+$(eval $(call gb_Jar_set_componentfile,java_uno_accessbridge,accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge,OOO))
+
+$(eval $(call gb_Jar_add_sourcefiles,java_uno_accessbridge,\
+ accessibility/bridge/org/openoffice/accessibility/AccessBridge \
+ accessibility/bridge/org/openoffice/accessibility/KeyHandler \
+ accessibility/bridge/org/openoffice/accessibility/PopupWindow \
+ accessibility/bridge/org/openoffice/accessibility/WindowsAccessBridgeAdapter \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/accessibility/Module_accessibility.mk b/accessibility/Module_accessibility.mk
index 1e4b133..1b97bb9 100644
--- a/accessibility/Module_accessibility.mk
+++ b/accessibility/Module_accessibility.mk
@@ -32,4 +32,14 @@ $(eval $(call gb_Module_add_targets,accessibility,\
Library_acc \
))
+ifneq ($(SOLAR_JAVA),)
+ifeq ($(OS),WNT)
+$(eval $(call gb_Module_add_targets,accessibility,\
+ Jar_accessibility \
+ Jar_uno_accessbridge \
+ Package_bridge \
+))
+endif
+endif
+
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/accessibility/Package_bridge.mk b/accessibility/Package_bridge.mk
new file mode 100644
index 0000000..44aa98f
--- /dev/null
+++ b/accessibility/Package_bridge.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 at 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,$(WORKDIR)/CustomTarget/accessibility/bridge))
+
+$(eval $(call gb_Package_add_customtarget,accessibility_bridge,accessibility/bridge))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/accessibility/bridge/Makefile b/accessibility/bridge/Makefile
new file mode 100644
index 0000000..67792cd
--- /dev/null
+++ b/accessibility/bridge/Makefile
@@ -0,0 +1,63 @@
+# -*- 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 at 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
+PACKAGE := org/openoffice/java/accessibility
+
+ifeq ($(PRODUCT),)
+DEBUGSWITCH := true
+PRODUCTSWITCH := false
+else
+DEBUGSWITCH := false
+PRODUCTSWITCH := true
+endif
+
+$(TARGETDIR)/done : $(TARGETDIR)/classes/$(PACKAGE)/Build.class
+ mkdir -p $(dir $@) && touch $@
+
+$(TARGETDIR)/classes/$(PACKAGE)/Build.class : $(TARGETDIR)/src/$(PACKAGE)/Build.java | $(gb_JavaClassSet_JAVACCOMMAND)
+ mkdir -p $(dir $@) && \
+ $(gb_JavaClassSet_JAVACCOMMAND) $(gb_JavaClassSet_JAVACDEBUG) -d $(TARGETDIR)/classes $^
+
+$(TARGETDIR)/src/$(PACKAGE)/Build.java :
+ mkdir -p $(dir $@) && (\
+ echo package org.openoffice.java.accessibility\; && \
+ echo public class Build \{ && \
+ echo public static final boolean DEBUG = $(DEBUGSWITCH)\; && \
+ echo public static final boolean PRODUCT = $(PRODUCTSWITCH)\; && \
+ echo \} \
+ ) > $@
+
+.DEFAULT_GOAL := all
+.PHONY : all
+all : \
+ $(TARGETDIR)/done
+
+# vim: set ts=4 sw=4 et:
diff --git a/accessibility/bridge/org/openoffice/accessibility/makefile.mk b/accessibility/bridge/org/openoffice/accessibility/makefile.mk
deleted file mode 100755
index 1fa29f5..0000000
--- a/accessibility/bridge/org/openoffice/accessibility/makefile.mk
+++ /dev/null
@@ -1,62 +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 = accessibility
-PRJ = ..$/..$/..$/..
-TARGET = java_uno_accessbridge
-PACKAGE = org$/openoffice$/accessibility
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-JARFILES = jurt.jar unoil.jar ridl.jar
-JAVAFILES = \
- AccessBridge.java \
- KeyHandler.java \
- PopupWindow.java \
- WindowsAccessBridgeAdapter.java
-
-JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-JARTARGET = $(TARGET).jar
-JARCOMPRESS = TRUE
-JARCLASSDIRS = $(PACKAGE) org/openoffice/java/accessibility
-CUSTOMMANIFESTFILE = manifest
-
-# --- Targets ------------------------------------------------------
-
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/java_uno_accessbridge.component
-
-$(MISC)/java_uno_accessbridge.component .ERRREMOVE : \
- $(SOLARENV)/bin/createcomponent.xslt java_uno_accessbridge.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt java_uno_accessbridge.component
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
deleted file mode 100755
index 0d98760..0000000
--- a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
+++ /dev/null
@@ -1,115 +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 = accessibility
-PRJ = ..$/..$/..$/..$/..
-TARGET = java_accessibility
-PACKAGE = org$/openoffice$/java$/accessibility
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-JAVADIR = $(OUT)$/misc$/java
-JARFILES = jurt.jar unoil.jar ridl.jar
-JAVAFILES = \
- logging$/XAccessibleEventLog.java \
- logging$/XAccessibleHypertextLog.java \
- logging$/XAccessibleTextLog.java \
- AbstractButton.java \
- AccessibleActionImpl.java \
- AccessibleComponentImpl.java \
- AccessibleEditableTextImpl.java \
- AccessibleExtendedState.java \
- AccessibleHypertextImpl.java \
- AccessibleIconImpl.java \
- AccessibleKeyBinding.java \
- AccessibleObjectFactory.java \
- AccessibleRoleAdapter.java \
- AccessibleSelectionImpl.java \
- AccessibleStateAdapter.java \
- AccessibleTextImpl.java \
- AccessibleValueImpl.java \
- Alert.java \
- Application.java \
- Button.java \
- CheckBox.java \
- ComboBox.java \
- Component.java \
- Container.java \
- DescendantManager.java \
- Dialog.java \
- FocusTraversalPolicy.java \
- Frame.java \
- Icon.java \
- Label.java \
- List.java \
- Menu.java \
- MenuItem.java \
- MenuContainer.java \
- NativeFrame.java \
- Paragraph.java \
- RadioButton.java \
- ScrollBar.java \
- Separator.java \
- Table.java \
- TextComponent.java \
- ToggleButton.java \
- ToolTip.java \
- Tree.java \
- Window.java
-
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:s/.java//).class) $(CLASSDIR)$/$(PACKAGE)$/Build.class
-
-JARTARGET = $(TARGET).jar
-JARCOMPRESS = TRUE
-JARCLASSDIRS = $(PACKAGE)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-# Enable logging in non-product only
-.IF "$(PRODUCT)"!=""
-DEBUGSWITCH = false
-PRODUCTSWITCH = true
-.ELSE
-PRODUCTSWITCH = false
-DEBUGSWITCH = true
-.ENDIF
-
-$(JAVADIR)$/$(PACKAGE)$/%.java: makefile.mk
- @@-$(MKDIRHIER) $(JAVADIR)$/$(PACKAGE)
- @-echo package org.openoffice.java.accessibility\; > $@
- @-echo public class Build { >> $@
- @-echo public static final boolean DEBUG = $(DEBUGSWITCH)\; >> $@
- @-echo public static final boolean PRODUCT = $(PRODUCTSWITCH)\; >> $@
- @-echo } >> $@
-
-$(CLASSDIR)$/$(PACKAGE)$/Build.class : $(JAVADIR)$/$(PACKAGE)$/Build.java
- -$(JAVAC) -d $(CLASSDIR) $(JAVADIR)$/$(PACKAGE)$/Build.java
-
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index fe829fa..78a7b0c 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -302,9 +302,9 @@ my_components += \
ado \
fop \
fps \
- java_uno_accessbridge \
smplmail \
wininetbe1 \
+ component/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge \
component/dtrans/source/generic/dtrans \
component/dtrans/util/dnd \
component/dtrans/util/ftransl \
commit 7f31e252e4c28cfac9a21fe3309fd39956274d7f
Author: David Tardon <dtardon at redhat.com>
Date: Mon Dec 19 17:19:25 2011 +0100
gbuildize accessibility
diff --git a/Repository.mk b/Repository.mk
index c297edd..1d147d2 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -98,6 +98,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
PptImporter \
adabas \
adabasui \
+ acc \
agg \
analysis \
animcore \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 3126078..9972488 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -29,6 +29,7 @@
$(eval $(call gb_Module_Module,ooo))
$(eval $(call gb_Module_add_moduledirs,ooo,\
+ accessibility \
animations \
basctl \
basebmp \
diff --git a/accessibility/AllLangResTarget_acc.mk b/accessibility/AllLangResTarget_acc.mk
new file mode 100644
index 0000000..9430b75
--- /dev/null
+++ b/accessibility/AllLangResTarget_acc.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 at 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_AllLangResTarget_AllLangResTarget,acc))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,acc,accessibility))
+
+$(eval $(call gb_AllLangResTarget_add_srs,acc,\
+ acc/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,acc/res))
+
+$(eval $(call gb_SrsTarget_set_include,acc/res,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/accessibility/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,acc/res,\
+ accessibility/source/helper/accessiblestrings.src \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk
new file mode 100644
index 0000000..16ff5d8
--- /dev/null
+++ b/accessibility/Library_acc.mk
@@ -0,0 +1,126 @@
+# -*- 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 at 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,acc))
+
+$(eval $(call gb_Library_set_include,acc,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/accessibility/inc \
+ -I$(SRCDIR)/accessibility/source/inc \
+))
+
+$(eval $(call gb_Library_add_api,acc,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,acc,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ sot \
+ svl \
+ svt \
+ tk \
+ tl \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,acc,\
+ accessibility/source/extended/AccessibleBrowseBox \
+ accessibility/source/extended/AccessibleBrowseBoxBase \
+ accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell \
+ accessibility/source/extended/AccessibleBrowseBoxHeaderBar \
+ accessibility/source/extended/AccessibleBrowseBoxHeaderCell \
+ accessibility/source/extended/AccessibleBrowseBoxTable \
+ accessibility/source/extended/AccessibleBrowseBoxTableBase \
+ accessibility/source/extended/AccessibleBrowseBoxTableCell \
+ accessibility/source/extended/AccessibleGridControl \
+ accessibility/source/extended/AccessibleGridControlBase \
+ accessibility/source/extended/AccessibleGridControlHeader \
+ accessibility/source/extended/AccessibleGridControlHeaderCell \
+ accessibility/source/extended/AccessibleGridControlTable \
+ accessibility/source/extended/AccessibleGridControlTableBase \
+ accessibility/source/extended/AccessibleGridControlTableCell \
+ accessibility/source/extended/AccessibleToolPanelDeck \
+ accessibility/source/extended/AccessibleToolPanelDeckTabBar \
+ accessibility/source/extended/AccessibleToolPanelDeckTabBarItem \
+ accessibility/source/extended/accessiblebrowseboxcell \
+ accessibility/source/extended/accessibleeditbrowseboxcell \
+ accessibility/source/extended/accessibleiconchoicectrl \
+ accessibility/source/extended/accessibleiconchoicectrlentry \
+ accessibility/source/extended/accessiblelistbox \
+ accessibility/source/extended/accessiblelistboxentry \
+ accessibility/source/extended/accessibletabbar \
+ accessibility/source/extended/accessibletabbarbase \
+ accessibility/source/extended/accessibletabbarpage \
+ accessibility/source/extended/accessibletabbarpagelist \
+ accessibility/source/extended/accessibletablistbox \
+ accessibility/source/extended/accessibletablistboxtable \
+ accessibility/source/extended/listboxaccessible \
+ accessibility/source/extended/textwindowaccessibility \
+ accessibility/source/helper/acc_factory \
+ accessibility/source/helper/accresmgr \
+ accessibility/source/helper/characterattributeshelper \
+ accessibility/source/standard/accessiblemenubasecomponent \
+ accessibility/source/standard/accessiblemenucomponent \
+ accessibility/source/standard/accessiblemenuitemcomponent \
+ accessibility/source/standard/floatingwindowaccessible \
+ accessibility/source/standard/vclxaccessiblebox \
+ accessibility/source/standard/vclxaccessiblebutton \
+ accessibility/source/standard/vclxaccessiblecheckbox \
+ accessibility/source/standard/vclxaccessiblecombobox \
+ accessibility/source/standard/vclxaccessibledropdowncombobox \
+ accessibility/source/standard/vclxaccessibledropdownlistbox \
+ accessibility/source/standard/vclxaccessibleedit \
+ accessibility/source/standard/vclxaccessiblefixedhyperlink \
+ accessibility/source/standard/vclxaccessiblefixedtext \
+ accessibility/source/standard/vclxaccessiblelist \
+ accessibility/source/standard/vclxaccessiblelistbox \
+ accessibility/source/standard/vclxaccessiblelistitem \
+ accessibility/source/standard/vclxaccessiblemenu \
+ accessibility/source/standard/vclxaccessiblemenubar \
+ accessibility/source/standard/vclxaccessiblemenuitem \
+ accessibility/source/standard/vclxaccessiblemenuseparator \
+ accessibility/source/standard/vclxaccessiblepopupmenu \
+ accessibility/source/standard/vclxaccessibleradiobutton \
+ accessibility/source/standard/vclxaccessiblescrollbar \
+ accessibility/source/standard/vclxaccessiblestatusbar \
+ accessibility/source/standard/vclxaccessiblestatusbaritem \
+ accessibility/source/standard/vclxaccessibletabcontrol \
+ accessibility/source/standard/vclxaccessibletabpage \
+ accessibility/source/standard/vclxaccessibletabpagewindow \
+ accessibility/source/standard/vclxaccessibletextcomponent \
+ accessibility/source/standard/vclxaccessibletextfield \
+ accessibility/source/standard/vclxaccessibletoolbox \
+ accessibility/source/standard/vclxaccessibletoolboxitem \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/accessibility/Makefile b/accessibility/Makefile
new file mode 100644
index 0000000..7bbbe6c
--- /dev/null
+++ b/accessibility/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/accessibility/Module_accessibility.mk b/accessibility/Module_accessibility.mk
new file mode 100644
index 0000000..1e4b133
--- /dev/null
+++ b/accessibility/Module_accessibility.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 at 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,accessibility))
+
+$(eval $(call gb_Module_add_targets,accessibility,\
+ AllLangResTarget_acc \
+ Library_acc \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/accessibility/inc/makefile.mk b/accessibility/inc/makefile.mk
deleted file mode 100644
index 4d0eb53..0000000
--- a/accessibility/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=accessibility
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/accessibility/prj/build.lst b/accessibility/prj/build.lst
index d573077..681c3d1 100644
--- a/accessibility/prj/build.lst
+++ b/accessibility/prj/build.lst
@@ -1,11 +1,3 @@
ac accessibility : TRANSLATIONS:translations tools jurt offapi unoil vcl javaunohelper jvmaccess cppu sal toolkit svtools LIBXSLT:libxslt NULL
ac accessibility usr1 - all ac_mkout NULL
-ac accessibility\inc nmake - all ac_inc NULL
-ac accessibility\bridge\org\openoffice\java\accessibility nmake - w ac_ooja ac_inc NULL
-ac accessibility\bridge\org\openoffice\accessibility nmake - w ac_ooa ac_ooja.w ac_inc NULL
-ac accessibility\bridge\source\java nmake - w ac_ooan ac_ooa.w ac_inc NULL
-ac accessibility\inc get - all ac_inc NULL
-ac accessibility\source\helper nmake - all ac_helper ac_inc NULL
-ac accessibility\source\standard nmake - all ac_standard ac_helper ac_inc NULL
-ac accessibility\source\extended nmake - all ac_extended ac_inc NULL
-ac accessibility\util nmake - all ac_util ac_helper ac_standard ac_extended NULL
+ac accessibility\prj nmake - all ac_prj NULL
diff --git a/accessibility/prj/d.lst b/accessibility/prj/d.lst
index 1e47390..e69de29 100644
--- a/accessibility/prj/d.lst
+++ b/accessibility/prj/d.lst
@@ -1,8 +0,0 @@
-..\%__SRC%\class\java_uno_accessbridge.jar %_DEST%\bin\java_uno_accessbridge.jar
-..\%__SRC%\class\java_accessibility.jar %_DEST%\bin\java_accessibility.jar
-
-..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
-..\%__SRC%\bin\*.res %_DEST%\bin\*.res
-..\%__SRC%\lib\lib*.so %_DEST%\lib
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-..\%__SRC%\misc\java_uno_accessbridge.component %_DEST%\xml\java_uno_accessbridge.component
diff --git a/accessibility/prj/makefile.mk b/accessibility/prj/makefile.mk
new file mode 100644
index 0000000..0997622
--- /dev/null
+++ b/accessibility/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/accessibility/source/extended/makefile.mk b/accessibility/source/extended/makefile.mk
deleted file mode 100755
index 06e5298..0000000
--- a/accessibility/source/extended/makefile.mk
+++ /dev/null
@@ -1,78 +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=extended
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
- $(SLO)$/AccessibleBrowseBoxCheckBoxCell.obj \
- $(SLO)$/AccessibleBrowseBoxBase.obj \
- $(SLO)$/AccessibleBrowseBox.obj \
- $(SLO)$/AccessibleBrowseBoxTableCell.obj \
- $(SLO)$/AccessibleBrowseBoxHeaderCell.obj \
- $(SLO)$/AccessibleBrowseBoxTableBase.obj \
- $(SLO)$/AccessibleBrowseBoxTable.obj \
- $(SLO)$/AccessibleBrowseBoxHeaderBar.obj \
- $(SLO)$/accessibleiconchoicectrl.obj \
- $(SLO)$/accessibleiconchoicectrlentry.obj \
- $(SLO)$/accessiblelistbox.obj \
- $(SLO)$/accessiblelistboxentry.obj \
- $(SLO)$/accessibletabbarbase.obj \
- $(SLO)$/accessibletabbar.obj \
- $(SLO)$/accessibletabbarpage.obj \
- $(SLO)$/accessibletabbarpagelist.obj \
- $(SLO)$/accessibletablistbox.obj \
- $(SLO)$/accessibletablistboxtable.obj \
- $(SLO)$/listboxaccessible.obj \
- $(SLO)$/accessiblebrowseboxcell.obj \
- $(SLO)$/accessibleeditbrowseboxcell.obj \
- $(SLO)$/textwindowaccessibility.obj \
- $(SLO)$/AccessibleGridControlBase.obj \
- $(SLO)$/AccessibleGridControl.obj \
- $(SLO)$/AccessibleGridControlTableBase.obj \
- $(SLO)$/AccessibleGridControlHeader.obj \
- $(SLO)$/AccessibleGridControlTableCell.obj \
- $(SLO)$/AccessibleGridControlHeaderCell.obj \
- $(SLO)$/AccessibleGridControlTable.obj \
- $(SLO)$/AccessibleToolPanelDeck.obj \
- $(SLO)$/AccessibleToolPanelDeckTabBar.obj \
- $(SLO)$/AccessibleToolPanelDeckTabBarItem.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/accessibility/source/helper/makefile.mk b/accessibility/source/helper/makefile.mk
deleted file mode 100644
index 72284e3..0000000
--- a/accessibility/source/helper/makefile.mk
+++ /dev/null
@@ -1,53 +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=helper
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/acc_factory.obj \
- $(SLO)$/accresmgr.obj \
- $(SLO)$/characterattributeshelper.obj \
-
-SRS1NAME=$(TARGET)
-SRC1FILES=\
- accessiblestrings.src
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/accessibility/source/standard/makefile.mk b/accessibility/source/standard/makefile.mk
deleted file mode 100644
index b79d98f..0000000
--- a/accessibility/source/standard/makefile.mk
+++ /dev/null
@@ -1,78 +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=standard
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/accessiblemenubasecomponent.obj \
- $(SLO)$/accessiblemenucomponent.obj \
- $(SLO)$/accessiblemenuitemcomponent.obj \
- $(SLO)$/floatingwindowaccessible.obj \
- $(SLO)$/vclxaccessiblebox.obj \
- $(SLO)$/vclxaccessiblebutton.obj \
- $(SLO)$/vclxaccessiblecheckbox.obj \
- $(SLO)$/vclxaccessiblecombobox.obj \
- $(SLO)$/vclxaccessibledropdowncombobox.obj \
- $(SLO)$/vclxaccessibledropdownlistbox.obj \
- $(SLO)$/vclxaccessibleedit.obj \
- $(SLO)$/vclxaccessiblefixedhyperlink.obj \
- $(SLO)$/vclxaccessiblefixedtext.obj \
- $(SLO)$/vclxaccessiblelist.obj \
- $(SLO)$/vclxaccessiblelistbox.obj \
- $(SLO)$/vclxaccessiblelistitem.obj \
- $(SLO)$/vclxaccessiblemenu.obj \
- $(SLO)$/vclxaccessiblemenubar.obj \
- $(SLO)$/vclxaccessiblemenuitem.obj \
- $(SLO)$/vclxaccessiblemenuseparator.obj \
- $(SLO)$/vclxaccessiblepopupmenu.obj \
- $(SLO)$/vclxaccessibleradiobutton.obj \
- $(SLO)$/vclxaccessiblescrollbar.obj \
- $(SLO)$/vclxaccessiblestatusbar.obj \
- $(SLO)$/vclxaccessiblestatusbaritem.obj \
- $(SLO)$/vclxaccessibletabcontrol.obj \
- $(SLO)$/vclxaccessibletabpage.obj \
- $(SLO)$/vclxaccessibletabpagewindow.obj \
- $(SLO)$/vclxaccessibletextcomponent.obj \
- $(SLO)$/vclxaccessibletextfield.obj \
- $(SLO)$/vclxaccessibletoolbox.obj \
- $(SLO)$/vclxaccessibletoolboxitem.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/accessibility/util/acc.map b/accessibility/util/acc.map
deleted file mode 100644
index b9e53f4..0000000
--- a/accessibility/util/acc.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
- global:
- getStandardAccessibleFactory;
- getSvtAccessibilityComponentFactory;
- local:
- *;
-};
diff --git a/accessibility/util/makefile.mk b/accessibility/util/makefile.mk
deleted file mode 100644
index b9f57a8..0000000
--- a/accessibility/util/makefile.mk
+++ /dev/null
@@ -1,82 +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=acc
-USE_DEFFILE=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-LDUMP=ldump2.exe
-
-# --- Library -----------------------------------
-# --- acc ---------------------------------------
-LIB1TARGET=$(SLB)$/$(PRJNAME).lib
-LIB1FILES=\
- $(SLB)$/standard.lib \
- $(SLB)$/extended.lib \
- $(SLB)$/helper.lib
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
- $(VCLLIB) \
- $(COMPHELPERLIB) \
- $(SOTLIB) \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(UNOTOOLSLIB) \
- $(TKLIB) \
- $(TOOLSLIB) \
- $(SVTOOLLIB) \
- $(SVLLIB) \
- $(SALLIB)
-
-SHL1LIBS=$(LIB1TARGET)
-SHL1DEPN=$(LIB1TARGET) \
- makefile.mk
-
-
-SHL1VERSIONMAP= $(TARGET).map
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-DEF1NAME= $(SHL1TARGET)
-
-# === .res file ==========================================================
-
-RES1FILELIST=\
- $(SRS)$/helper.srs
-
-RESLIB1NAME=$(TARGET)
-RESLIB1SRSFILES=$(RES1FILELIST)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
commit c438af4d8a3eadb437278cae5912eaf1583271c9
Author: David Tardon <dtardon at redhat.com>
Date: Wed Dec 21 15:09:38 2011 +0100
eval at the calling side, like other gbuild classes
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 1e075af..84c6f11 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -56,20 +56,23 @@ endef
define gb_CustomTarget_CustomTarget
$(call gb_CustomTarget_get_target,$(1)) : \
$(call gb_CustomTarget__get_makefile,$(1))
+
endef
define gb_CustomTarget_add_dependency
-$(eval $(call gb_CustomTarget_get_target,$(1)) : \
- $(SRCDIR)/$(2))
+$(call gb_CustomTarget_get_target,$(1)) : $(SRCDIR)/$(2)
+
endef
define gb_CustomTarget_add_dependencies
$(foreach dependency,$(2),$(call gb_CustomTarget_add_dependency,$(1),$(dependency)))
+
endef
define gb_CustomTarget_add_outdir_dependency
-$(eval $(call gb_CustomTarget_get_target,$(1)) : $(2))
+$(call gb_CustomTarget_get_target,$(1)) : $(2)
+
endef
define gb_CustomTarget_add_outdir_dependencies
commit 07a87420ade12155b14be40e38a09a9ad0061719
Author: David Tardon <dtardon at redhat.com>
Date: Tue Dec 20 15:30:38 2011 +0100
eval at the calling side, like other gbuild classes
diff --git a/filter/Jar_XSLTFilter.mk b/filter/Jar_XSLTFilter.mk
index d68b353..da798a4 100644
--- a/filter/Jar_XSLTFilter.mk
+++ b/filter/Jar_XSLTFilter.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_Jar_add_jars,XSLTFilter,\
$(OUTDIR)/bin/juh.jar \
))
-$(call gb_Jar_use_externals,XSLTFilter,saxon)
+$(eval $(call gb_Jar_use_externals,XSLTFilter,saxon))
$(eval $(call gb_Jar_set_componentfile,XSLTFilter,filter/source/xsltfilter/XSLTFilter.jar,OOO))
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 6a108ba..36e5112 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -96,11 +96,13 @@ endef
# source files are forwarded to the ClassSet
define gb_Jar_add_sourcefile
$(call gb_JavaClassSet_add_sourcefile,$(call gb_Jar_get_classsetname,$(1)),$(2))
+
endef
# PACKAGEROOTS is the list of all root folders to pack into the jar (without META-INF as this is added automatically)
define gb_Jar_set_packageroot
$(call gb_Jar_get_target,$(1)) : PACKAGEROOTS := $(2)
+
endef
# PACKAGEFILES is the list of all root files to pack into the jar
@@ -115,16 +117,18 @@ endef
define gb_Jar_add_sourcefiles
$(foreach sourcefile,$(2),$(call gb_Jar_add_sourcefile,$(1),$(sourcefile)))
+
endef
define gb_JarTest_set_classpath
$(call gb_JavaClassSet_set_classpath,$(call gb_Jar_get_classsetname,$(1)),$(2))
+
endef
# JARCLASSPATH is the class path that is written to the manifest of the jar
define gb_Jar_set_jarclasspath
-
$(call gb_Jar_get_target,$(1)) : JARCLASSPATH := $(2)
+
endef
# provide a manifest template containing jar specific information to be written into the manifest
@@ -139,27 +143,33 @@ endef
# remember: classpath is "inherited" to ClassSet
define gb_Jar_add_jar
$(call gb_JavaClassSet_add_jar,$(call gb_Jar_get_classsetname,$(1)),$(2))
+
endef
define gb_Jar_add_system_jar
$(call gb_JavaClassSet_add_system_jar,$(call gb_Jar_get_classsetname,$(1)),$(2))
+
endef
# specify jars with imported modules
define gb_Jar_add_jars
$(call gb_JavaClassSet_add_jars,$(call gb_Jar_get_classsetname,$(1)),$(2))
+
endef
define gb_Jar_add_system_jars
$(call gb_JavaClassSet_add_system_jars,$(call gb_Jar_get_classsetname,$(1)),$(2))
+
endef
define gb_Jar_use_external
$(call gb_JavaClassSet_use_external,$(call gb_Jar_get_classsetname,$(1)),$(2))
+
endef
define gb_Jar_use_externals
$(call gb_JavaClassSet_use_externals,$(call gb_Jar_get_classsetname,$(1)),$(2))
+
endef
# possible directories for jar files containing UNO services
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 4c8d7cf..61cb4e8 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -62,6 +62,7 @@ $(call gb_JavaClassSet_get_clean_target,%) :
define gb_JavaClassSet_JavaClassSet
$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS :=
+
endef
define gb_JavaClassSet__get_sourcefile
@@ -69,8 +70,8 @@ $(SRCDIR)/$(1).java
endef
define gb_JavaClassSet_add_sourcefile
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : \
- $(call gb_JavaClassSet__get_sourcefile,$(2)))
+$(call gb_JavaClassSet_get_target,$(1)) : $(call gb_JavaClassSet__get_sourcefile,$(2))
+
endef
define gb_JavaClassSet_add_sourcefiles
@@ -79,42 +80,48 @@ $(foreach sourcefile,$(2),$(call gb_JavaClassSet_add_sourcefile,$(1),$(sourcefil
endef
define gb_JavaClassSet_set_classpath
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $(2))
+$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $(2)
endef
# problem: currently we can't get these dependencies to work
# build order dependency is a hack to get these prerequisites out of the way in the build command
define gb_JavaClassSet_add_jar
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : $(2))
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2)))
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2))
+$(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)
+
endef
# this does not generate dependency on the jar
define gb_JavaClassSet_add_system_jar
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2)))
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2))
+$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2))
+$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2)
+
endef
define gb_JavaClassSet_add_jars
$(foreach jar,$(2),$(call gb_JavaClassSet_add_jar,$(1),$(jar)))
+
endef
define gb_JavaClassSet_add_system_jars
$(foreach jar,$(2),$(call gb_JavaClassSet_add_system_jar,$(1),$(jar)))
+
endef
# this forwards to functions that must be defined in RepositoryExternal.mk.
-# $(call gb_LinkTarget_use_external,library,external)
+# $(eval $(call gb_LinkTarget_use_external,library,external))
define gb_JavaClassSet_use_external
-$(eval $(if $(value gb_JavaClassSet__use_$(2)),\
+$(if $(value gb_JavaClassSet__use_$(2)),\
$(call gb_JavaClassSet__use_$(2),$(1)),\
- $(error gb_JavaClassSet_use_external: unknown external: $(2))))
+ $(error gb_JavaClassSet_use_external: unknown external: $(2)))
+
endef
define gb_JavaClassSet_use_externals
$(foreach external,$(2),$(call gb_JavaClassSet_use_external,$(1),$(external)))
+
endef
# vim: set noet sw=4:
More information about the Libreoffice-commits
mailing list