diff options
author | David Tardon <dtardon@redhat.com> | 2012-04-07 08:22:44 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2012-05-29 07:24:52 +0200 |
commit | 50c5dd122ec7ce9543c09bbe2c54988b16af8fe2 (patch) | |
tree | a450833bf183d415e3ca7cf0937e9d73d491e917 /connectivity/qa | |
parent | aa99f076047dac84ec80d588bfcbe4c0e6db34f1 (diff) |
switch connectivity to gbuild
Change-Id: I37e6706ff244c9cc21b0826e61ef5d7cd72b3566
Diffstat (limited to 'connectivity/qa')
-rw-r--r-- | connectivity/qa/connectivity/tools/makefile.mk | 72 | ||||
-rw-r--r-- | connectivity/qa/makefile.mk | 86 |
2 files changed, 0 insertions, 158 deletions
diff --git a/connectivity/qa/connectivity/tools/makefile.mk b/connectivity/qa/connectivity/tools/makefile.mk deleted file mode 100644 index 4cd76ffc215a..000000000000 --- a/connectivity/qa/connectivity/tools/makefile.mk +++ /dev/null @@ -1,72 +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. -# -#************************************************************************* - -PRJ = ../../.. -TARGET = ConnectivityTools -PRJNAME = connectivity -PACKAGE = connectivity/tools - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - -.IF "$(SOLAR_JAVA)" == "" - -all: -# nothing - -.ELSE - -.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/QADEVOOO//)" - -all: -# nothing - -.ELSE - -#----- compile .java files ----------------------------------------- - -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunnerLight.jar -JAVAFILES := $(shell @$(FIND) . -name "*.java") - -#----- make a jar from compiled files ------------------------------ - -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar - -# --- Targets ------------------------------------------------------ - -.IF "$(depend)" == "" -ALL : ALLTAR -.ELSE -ALL: ALLDEP -.ENDIF - -.ENDIF # QADEVOOO option -.ENDIF # "$(SOLAR_JAVA)" == "" - -.INCLUDE : target.mk - diff --git a/connectivity/qa/makefile.mk b/connectivity/qa/makefile.mk deleted file mode 100644 index c3179d513988..000000000000 --- a/connectivity/qa/makefile.mk +++ /dev/null @@ -1,86 +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. -# -#************************************************************************* - -PRJ = .. -TARGET = ConnectivityComplexTests -PRJNAME = connectivity -PACKAGE = complex/connectivity - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - -.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/QADEVOOO//)" - -all: -# nothing - -.ELSE -#----- compile .java files ----------------------------------------- - -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -JAVAFILES := $(shell @$(FIND) complex -name "*.java") - -.IF "$(SYSTEM_HSQLDB)" == "YES" -EXTRAJARFILES = $(HSQLDB_JAR) -.ELSE -JARFILES += hsqldb.jar -.ENDIF - -#----- make a jar from compiled files ------------------------------ - -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar - -# --- 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 -.ENDIF # QADEVOOO option - -.INCLUDE : target.mk - -show_targets: - +@$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) complexlib.ShowTargets $(foreach,i,$(JAVAFILES) $(i:s/.\$///:s/.java//)) - -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.$(PRJNAME).$(@:s/run_//) - |