[Libreoffice-commits] .: testgraphical/prechecks testtools/source

[François Tigeot]

 testgraphical/prechecks/makefile.mk           |    2 +-
 testtools/source/bridgetest/makefile.mk       |    5 -----
 testtools/source/bridgetest/pyuno/makefile.mk |    2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit b0d71c16932d72b2f1187e7939013daadb330ed0
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Thu Apr 28 08:27:16 2011 +0200

    Remove OS/2 support

diff --git a/testgraphical/prechecks/makefile.mk b/testgraphical/prechecks/makefile.mk
index 13796c9..e86698f 100644
--- a/testgraphical/prechecks/makefile.mk
+++ b/testgraphical/prechecks/makefile.mk
@@ -47,7 +47,7 @@ TARGET=notargetyet
 
 # PERLDEBUG=-d:ptkdb
 ALLTAR: 
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
     $(PERL) $(PERLDEBUG) softwaretests.pl -printerdriver -imagemagick -ghostscript $(P_VERBOSE) $(P_JAVA6)
 .ELSE
     $(PERL) $(PERLDEBUG) softwaretests.pl -imagemagick -ghostscript $(P_VERBOSE) $(P_JAVA6)
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk
index 0abe1ab..8ce4116 100644
--- a/testtools/source/bridgetest/makefile.mk
+++ b/testtools/source/bridgetest/makefile.mk
@@ -42,11 +42,6 @@ BATCH_SUFFIX=.bat
 GIVE_EXEC_RIGHTS=@echo
 MY_URE_INTERNAL_JAVA_DIR=$(strip $(subst,\,/ file:///$(shell @$(WRAPCMD) echo $(SOLARBINDIR))))
 MY_LOCAL_CLASSDIR=$(strip $(subst,\,/ file:///$(shell $(WRAPCMD) echo $(PWD)/$(CLASSDIR)/)))
-.ELIF "$(GUI)"=="OS2"
-BATCH_SUFFIX=.cmd
-GIVE_EXEC_RIGHTS=@echo
-MY_URE_INTERNAL_JAVA_DIR=$(strip $(subst,\,/ file:///$(shell @$(WRAPCMD) echo $(SOLARBINDIR))))
-MY_LOCAL_CLASSDIR=$(strip $(subst,\,/ file:///$(shell $(WRAPCMD) echo $(PWD)/$(CLASSDIR)/)))
 .ELSE
 GIVE_EXEC_RIGHTS=chmod +x 
 MY_URE_INTERNAL_JAVA_DIR=file://$(SOLARBINDIR)
diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk
index 417bdfc..b5d90cb 100644
--- a/testtools/source/bridgetest/pyuno/makefile.mk
+++ b/testtools/source/bridgetest/pyuno/makefile.mk
@@ -56,7 +56,7 @@ PYTHONPATH:=$(SOLARLIBDIR)$/pyuno:$(PWD):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$
 .ENDIF                  # "$(GUI)"=="WNT"
 .EXPORT: PYTHONPATH
 
-.IF "$(GUI)"!="WNT" && "$(GUI)"!="OS2"
+.IF "$(GUI)"!="WNT"
 TEST_ENV=export FOO=file://$(shell @pwd)$/$(DLLDEST) \
     UNO_TYPES=uno_types.rdb UNO_SERVICES=pyuno_services.rdb
 .ELSE # "$(GUI)" != "WNT"