summaryrefslogtreecommitdiff
path: root/cli_ure/qa
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2006-03-09 09:50:36 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2006-03-09 09:50:36 +0000
commit7520961b6111e2ea8c0dba70af07c3160d872d52 (patch)
tree5456dd09de10ed276ad15e477c8039add2dace3a /cli_ure/qa
parentc47ca4093e8ac1680d9db483f10f743f099f2884 (diff)
INTEGRATION: CWS jl31 (1.2.4); FILE MERGED
2006/03/01 12:24:43 jl 1.2.4.2: #i62317# 2006/02/20 16:56:45 jl 1.2.4.1: #i62317# tests for new assembly versions
Diffstat (limited to 'cli_ure/qa')
-rw-r--r--cli_ure/qa/versioning/makefile.mk49
1 files changed, 47 insertions, 2 deletions
diff --git a/cli_ure/qa/versioning/makefile.mk b/cli_ure/qa/versioning/makefile.mk
index 73b925671c24..c90a6991bf85 100644
--- a/cli_ure/qa/versioning/makefile.mk
+++ b/cli_ure/qa/versioning/makefile.mk
@@ -1,3 +1,39 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.3 $
+#
+# last change: $Author: rt $ $Date: 2006-03-09 10:50:36 $
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+# GNU Lesser General Public License Version 2.1
+# =============================================
+# Copyright 2005 by Sun Microsystems, Inc.
+# 901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1, as published by the Free Software Foundation.
+#
+# This library 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 for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+#*************************************************************************
+
+
# Builds the SpreadSheet examples of the Developers Guide.
PRJ = ..$/..
@@ -71,6 +107,15 @@ $(TESTLIB): $(CSFILESLIB) MAKEOUTDIR
-reference:$(BIN)$/cli_cppuhelper.dll \
$(CSFILESLIB)
+#This target only checks if the the office/program/assembly directory
+#contains the proper libraries.
+$(OUTDIR)$/buildwithofficelibs.dll: MAKEOUTDIR
+ +$(CSC) $(CSCFLAGS) -target:library -out:$@ \
+ -reference:"$(office)"$/program$/assembly$/cli_ure.dll \
+ -reference:"$(office)"$/program$/assembly$/cli_types.dll \
+ -reference:"$(office)"$/program$/assembly$/cli_basetypes.dll \
+ -reference:"$(office)"$/program$/assembly$/cli_cppuhelper.dll \
+ $(CSFILESLIB)
#-----------------------------------------------------------------------------
@@ -117,8 +162,8 @@ CT_APP = org.openoffice.Runner
CT_NOOFFICE = -NoOffice
# --- Targets ------------------------------------------------------
-RUN:
- +java -cp $(CLASSPATH) -Dcli_test_program=$(EXETARGET2) -Duno_path=$(office)\program $(CT_APP) $(CT_NOOFFICE) $(CT_TESTBASE) $(CT_TEST)
+RUN: $(OUTDIR)$/buildwithofficelibs.dll
+ +java -cp $(CLASSPATH) -Dcli_test_program=$(EXETARGET2) -Duno_path="$(office)"\program $(CT_APP) $(CT_NOOFFICE) $(CT_TESTBASE) $(CT_TEST)
run: RUN