summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorHenning Brinkmann <hbrinkm@openoffice.org>2011-02-02 13:51:09 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-17 15:23:55 +0200
commita9c6105e76789864a4c0e80ffe08537a0b03e0d1 (patch)
tree2299c267e6eaa38924aac6d0bf119136b04228b4 /toolkit
parentbd162cb75a4115affb5451584bd9f094f3e37905 (diff)
meged from outgoing [hg:e7087a952a92]
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/prj/build.lst1
-rw-r--r--toolkit/qa/unoapi/makefile.mk48
2 files changed, 0 insertions, 49 deletions
diff --git a/toolkit/prj/build.lst b/toolkit/prj/build.lst
index e11d32c435bf..a0ddbffd8718 100644
--- a/toolkit/prj/build.lst
+++ b/toolkit/prj/build.lst
@@ -1,3 +1,2 @@
ti toolkit : LIBXSLT:libxslt vcl qadevOOo test NULL
ti toolkit\prj nmake - all ti_prj NULL
-ti toolkit\qa\complex\toolkit nmake - all ti_complex_toolkit NULL
diff --git a/toolkit/qa/unoapi/makefile.mk b/toolkit/qa/unoapi/makefile.mk
deleted file mode 100644
index 9517601c3917..000000000000
--- a/toolkit/qa/unoapi/makefile.mk
+++ /dev/null
@@ -1,48 +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.
-#***********************************************************************/
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = toolkit
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/toolkit/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END