diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-10-25 13:54:03 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-10-25 14:00:05 +0200 |
| commit | 5ba1694606577f9cda2b773d82ae765118bfc9e1 (patch) | |
| tree | 4d88884585526a46b34ac0ca942aa48190fd755d /accessibility/Jar_uno_accessbridge.mk | |
| parent | d922cc0398ac4ec8de1a1b47402ceeb5d5d152b5 (diff) | |
fdo#53474: Fix Windows Java Accessibility Bridge
...by folding the contents of java_accessibility.jar back into
java_uno_accessbridge.jar.
In the old build system there were two jars, java_uno_accessbridge.jar
containing the handful of org.openoffice.accessibility classes and all
org.openoffice.java.accessibility classes (though how the latter got included
was fairly obscure in the makefile.mk) and unused java_accessibility.jar that
contained all org.openoffice.java.accessibility classes. When adapting this to
gbuild, the unused java_accessibility.jar was carried over, but all its
org.openoffice.accessibility classes were inadvertently droped from
java_uno_accessbridge.jar.
Change-Id: I9b582ba22667b1dae635828e85c4cc5b530353ac
Diffstat (limited to 'accessibility/Jar_uno_accessbridge.mk')
| -rw-r--r-- | accessibility/Jar_uno_accessbridge.mk | 50 |
1 files changed, 49 insertions, 1 deletions
diff --git a/accessibility/Jar_uno_accessbridge.mk b/accessibility/Jar_uno_accessbridge.mk index 20be9f8b68b1..0486750633af 100644 --- a/accessibility/Jar_uno_accessbridge.mk +++ b/accessibility/Jar_uno_accessbridge.mk @@ -28,7 +28,6 @@ $(eval $(call gb_Jar_Jar,java_uno_accessbridge)) $(eval $(call gb_Jar_use_jars,java_uno_accessbridge,\ - java_accessibility \ jurt \ ridl \ unoil \ @@ -45,6 +44,55 @@ $(eval $(call gb_Jar_add_sourcefiles,java_uno_accessbridge,\ accessibility/bridge/org/openoffice/accessibility/KeyHandler \ accessibility/bridge/org/openoffice/accessibility/PopupWindow \ accessibility/bridge/org/openoffice/accessibility/WindowsAccessBridgeAdapter \ + 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 \ +)) + +$(eval $(call gb_Jar_add_generated_sourcefiles,java_uno_accessbridge,\ + CustomTarget/accessibility/bridge/org/openoffice/java/accessibility/Build \ )) # vim:set shiftwidth=4 softtabstop=4 expandtab: |