1 files changed, 25 insertions, 42 deletions
diff --git a/framework/qa/complex/desktop/makefile.mk b/framework/qa/complex/desktop/makefile.mk
index 3ad4801eb0d5..74db8d34e160 100755
--- a/framework/qa/complex/desktop/makefile.mk
+++ b/framework/qa/complex/desktop/makefile.mk
@@ -25,55 +25,38 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..
-TARGET  = DesktopTerminate
-PRJNAME = $(TARGET)
-PACKAGE = complex$/desktop
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar 
-JAVAFILES       = DesktopTerminate.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-# --- Parameters for the test --------------------------------------
-
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
 .ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
 
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
+PRJ = ../../..
+PRJNAME = framework
+TARGET = qa_complex_desktop
+
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = complex/desktop
 
-# test looks something like the.full.package.TestName
-CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
+# here store only Files which contain a @Test
+JAVATESTFILES = \
+    DesktopTerminate.java
 
-# start the runner application
-CT_APP      = org.openoffice.Runner
+# put here all other files
+JAVAFILES = $(JAVATESTFILES)
 
-# --- Targets ------------------------------------------------------
+JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
+#JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \
+#                  OOoRunner.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
 
-$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR
+# Sample how to debug
+# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
 
-.INCLUDE :  target.mk
+.END
 
-RUN: run
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
-run:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) -NoOffice yes $(CT_TESTBASE) $(CT_TEST)
+ALLTAR : javatest
 
+.END