convert windows-specific bits, part 1: jars

8 files changed, 254 insertions, 178 deletions

diff --git a/accessibility/Jar_accessibility.mk b/accessibility/Jar_accessibility.mk
new file mode 100644
index 000000000000..5f5737ad17bb
--- /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@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 000000000000..919e428a5746
--- /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@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 1e4b133220b8..1b97bb9c0a0d 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 000000000000..44aa98fcb798
--- /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@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 000000000000..67792cd542ba
--- /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@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 1fa29f5bfcb1..000000000000
--- 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 0d98760a31df..000000000000
--- 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 fe829fa4799f..78a7b0cbf925 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 \