From 739d57852596990fd32e7a1dd2e19ced3da6e738 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" <frank.schoenheit@sun.com>
Date: Thu, 30 Sep 2010 12:39:21 +0200
Subject: dba34b: step 1 of including the complex tests herein in a default
 build, and making them runnable with a single command

---
 connectivity/qa/makefile.mk | 75 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 connectivity/qa/makefile.mk

(limited to 'connectivity/qa/makefile.mk')

diff --git a/connectivity/qa/makefile.mk b/connectivity/qa/makefile.mk
new file mode 100644
index 000000000000..d43ea18df5f1
--- /dev/null
+++ b/connectivity/qa/makefile.mk
@@ -0,0 +1,75 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+PRJ = ..
+TARGET  = ConnectivityComplexTests
+PRJNAME = connectivity
+
+# --- Settings -----------------------------------------------------
+.INCLUDE: settings.mk
+
+#----- compile .java files -----------------------------------------
+
+JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar hsqldb.jar
+JAVAFILES       :=  $(shell @$(FIND) complex -name "*.java")
+JAVACLASSFILES	:= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(i:d)$/$(i:b).class)
+
+#----- make a jar from compiled files ------------------------------
+
+MAXLINELENGTH = 100000
+
+#JARCLASSDIRS    = $(PACKAGE)
+JARTARGET       = $(TARGET).jar
+JARCOMPRESS 	= TRUE
+
+# --- Runner Settings ----------------------------------------------
+
+# classpath and argument list
+RUNNER_CLASSPATH = -cp "$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar"
+RUNNER_ARGS = org.openoffice.Runner -TestBase java_complex
+
+# --- Targets ------------------------------------------------------
+
+.IF "$(depend)" == ""
+ALL :   ALLTAR
+    @echo -----------------------------------------------------
+    @echo - do a 'dmake show_targets' to show available targets
+    @echo -----------------------------------------------------
+.ELSE
+ALL: 	ALLDEP
+.ENDIF
+
+.INCLUDE :  target.mk
+
+show_targets:
+    +@$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) complexlib.ShowTargets $(foreach,i,$(JAVAFILES) $(i:s/.\$///:s/.java//))
+
+run:
+    +$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -sce connectivity_all.sce
+
+run_%:
+    +$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o complex.$(@:s/run_//:s/_/\./)
-- 
cgit 


From 522a402edc720525a4354e8f728a9b7a9074a3e2 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" <frank.schoenheit@sun.com>
Date: Thu, 30 Sep 2010 12:43:16 +0200
Subject: dba34b: renamed scenario file

---
 connectivity/qa/makefile.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'connectivity/qa/makefile.mk')

diff --git a/connectivity/qa/makefile.mk b/connectivity/qa/makefile.mk
index d43ea18df5f1..24218a8fa692 100644
--- a/connectivity/qa/makefile.mk
+++ b/connectivity/qa/makefile.mk
@@ -68,8 +68,8 @@ ALL: 	ALLDEP
 show_targets:
     +@$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) complexlib.ShowTargets $(foreach,i,$(JAVAFILES) $(i:s/.\$///:s/.java//))
 
-run:
-    +$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -sce connectivity_all.sce
+run: $(CLASSDIR)$/$(JARTARGET)
+    +$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -sce scenarios.sce
 
-run_%:
+run_%: $(CLASSDIR)$/$(JARTARGET)
     +$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o complex.$(@:s/run_//:s/_/\./)
-- 
cgit 


From fe4a50d598615844b61704b7beb2a86d1681627f Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" <frank.schoenheit@sun.com>
Date: Thu, 30 Sep 2010 13:08:12 +0200
Subject: dba34b: make tests runnable with a simple 'dmake run', and
 selectively runnable with a 'dmake run_<testname>'

---
 connectivity/qa/makefile.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'connectivity/qa/makefile.mk')

diff --git a/connectivity/qa/makefile.mk b/connectivity/qa/makefile.mk
index 24218a8fa692..2ae164868f0e 100644
--- a/connectivity/qa/makefile.mk
+++ b/connectivity/qa/makefile.mk
@@ -72,4 +72,4 @@ run: $(CLASSDIR)$/$(JARTARGET)
     +$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -sce scenarios.sce
 
 run_%: $(CLASSDIR)$/$(JARTARGET)
-    +$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o complex.$(@:s/run_//:s/_/\./)
+    +$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o complex.$(PRJNAME).$(@:s/run_//)
-- 
cgit 


From 66d230686f217bd692b789b97a961e57135312c8 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" <frank.schoenheit@sun.com>
Date: Mon, 11 Oct 2010 22:57:28 +0200
Subject: dba34b: made sure that different jars include disjunct sets of .class
 files

---
 connectivity/qa/makefile.mk | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'connectivity/qa/makefile.mk')

diff --git a/connectivity/qa/makefile.mk b/connectivity/qa/makefile.mk
index 2ae164868f0e..ee41cab63554 100644
--- a/connectivity/qa/makefile.mk
+++ b/connectivity/qa/makefile.mk
@@ -28,6 +28,7 @@
 PRJ = ..
 TARGET  = ConnectivityComplexTests
 PRJNAME = connectivity
+PACKAGE = complex/connectivity
 
 # --- Settings -----------------------------------------------------
 .INCLUDE: settings.mk
@@ -36,15 +37,11 @@ PRJNAME = connectivity
 
 JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar hsqldb.jar
 JAVAFILES       :=  $(shell @$(FIND) complex -name "*.java")
-JAVACLASSFILES	:= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(i:d)$/$(i:b).class)
 
 #----- make a jar from compiled files ------------------------------
 
-MAXLINELENGTH = 100000
-
-#JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
+JARCLASSDIRS = $(PACKAGE)
+JARTARGET    = $(TARGET).jar
 
 # --- Runner Settings ----------------------------------------------
 
-- 
cgit