summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2003-06-12 07:03:20 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2003-06-12 07:03:20 +0000
commitad6dfab5cd80ed2c9fc92bb65d04d6d94646aa0c (patch)
treed4b4cfa7ee255b74bbd513a68e48bdb5b3c0f97d
parentd696e7a6294df05cc842898ab3370ce48c80f4c1 (diff)
INTEGRATION: CWS uaa04 (1.12.2); FILE MERGED
2003/06/03 15:18:19 obr 1.12.2.4: switched to JAVANUMVER 2003/06/02 12:50:00 obr 1.12.2.3: #109747# implement getAccessibleContext in a failsafe way, so that it can't kill the dispatch thread of the Java AccessBridge for Windows 2003/05/28 14:45:45 obr 1.12.2.2: #i14100# changed the private text change protocol with the JABG 2003/05/27 05:56:41 obr 1.12.2.1: added member to generated Build class and make it depend on makefile.mk
-rwxr-xr-xaccessibility/bridge/org/openoffice/java/accessibility/makefile.mk21
1 files changed, 15 insertions, 6 deletions
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
index c380dc0ad865..d6bf55c230ef 100755
--- a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
+++ b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.12 $
+# $Revision: 1.13 $
#
-# last change: $Author: vg $ $Date: 2003-05-22 12:40:39 $
+# last change: $Author: rt $ $Date: 2003-06-12 08:03:20 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -71,15 +71,19 @@ USE_JAVAVER:=TRUE
.INCLUDE : settings.mk
-.IF "$(JAVAVER:s/.//)" >= "140"
+.IF "$(JAVANUMVER:s/.//)" >= "000100040000"
+
JAVADIR = $(OUT)$/misc$/java
JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar
JAVAFILES = \
+ logging$/XAccessibleEventLog.java \
+ logging$/XAccessibleTextLog.java \
AbstractButton.java \
AccessibleActionImpl.java \
AccessibleComponentImpl.java \
AccessibleEditableTextImpl.java \
AccessibleExtendedState.java \
+ AccessibleHypertextImpl.java \
AccessibleIconImpl.java \
AccessibleKeyBinding.java \
AccessibleObjectFactory.java \
@@ -119,7 +123,8 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
JARTARGET = $(TARGET).jar
JARCOMPRESS = TRUE
JARCLASSDIRS = $(PACKAGE)
-.ENDIF
+
+.ENDIF # "$(JAVANUMVER:s/.//)" >= "000100040000"
# --- Targets ------------------------------------------------------
@@ -128,23 +133,27 @@ JARCLASSDIRS = $(PACKAGE)
# Enable logging in non-product only
.IF "$(PRODUCT)"!=""
DEBUGSWITCH = false
+PRODUCTSWITCH = true
.ELSE
+PRODUCTSWITCH = false
DEBUGSWITCH = true
.ENDIF
.IF "$(GUI)"=="UNX" || "$(USE_SHELL)" != "4nt"
-$(JAVADIR)$/$(PACKAGE)$/%.java:
+$(JAVADIR)$/$(PACKAGE)$/%.java: makefile.mk
@-+$(MKDIRHIER) $(JAVADIR)$/$(PACKAGE) >& $(NULLDEV)
@-+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 } >> $@
.ELSE
-$(JAVADIR)$/$(PACKAGE)$/%.java:
+$(JAVADIR)$/$(PACKAGE)$/%.java: makefile.mk
@-+$(MKDIRHIER) $(JAVADIR)$/$(PACKAGE) >& $(NULLDEV)
@-+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 } >> $@
.ENDIF