diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-28 14:11:12 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-28 14:11:12 +0000 |
| commit | 292b444f07e2ccf0939c6a409f8470a619a6a19b (patch) | |
| tree | 24c23ae5d686ca749c64c5857f7c8f295675a9d7 /extensions | |
| parent | 1af640070d6d0b1f52ca896a4e3b8f40e2ecf9a9 (diff) | |
INTEGRATION: CWS dba205a (1.2.72); FILE MERGED
2006/07/24 13:57:23 fs 1.2.72.1: #i67720# no localized resources if they're not part of the product
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/qa/complex/extensions/makefile.mk | 43 |
1 files changed, 33 insertions, 10 deletions
diff --git a/extensions/qa/complex/extensions/makefile.mk b/extensions/qa/complex/extensions/makefile.mk index 2ffc0d53beaa..5b1819a24d31 100644 --- a/extensions/qa/complex/extensions/makefile.mk +++ b/extensions/qa/complex/extensions/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: obo $ $Date: 2006-03-29 12:41:43 $ +# last change: $Author: ihi $ $Date: 2006-08-28 15:11:12 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -40,6 +40,12 @@ PACKAGE = complex$/$(PRJNAME) RES_TARGET = orl +.IF "$(GUI)"=="WNT" +command_seperator=&& +.ELSE +command_seperator=; +.ENDIF + # --- Settings ----------------------------------------------------- .INCLUDE : svpre.mk .INCLUDE : settings.mk @@ -48,17 +54,29 @@ RES_TARGET = orl #----- resource files for the OfficeResourceLoader test ------------ -SRS1NAME=$(RES_TARGET) +SRS1NAME=$(RES_TARGET)_A_ SRC1FILES= \ - $(RES_TARGET).src + $(RES_TARGET)_en-US.src RES1FILELIST=\ - $(SRS)$/$(RES_TARGET).srs + $(SRS)$/$(RES_TARGET)_A_.srs -RESLIB1NAME=$(RES_TARGET) +RESLIB1NAME=$(RES_TARGET)_A_ RESLIB1SRSFILES=$(RES1FILELIST) + +SRS2NAME=$(RES_TARGET)_B_ +SRC2FILES= \ + $(RES_TARGET)_de.src + +RES2FILELIST=\ + $(SRS)$/$(RES_TARGET)_B_.srs + +RESLIB2NAME=$(RES_TARGET)_B_ +RESLIB2SRSFILES=$(RES2FILELIST) + + #----- compile .java files ----------------------------------------- JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar ConnectivityTools.jar @@ -87,9 +105,14 @@ ALL: ALLDEP RUNNER_CLASSPATH = -cp $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar$(PATH_SEPERATOR)$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/ConnectivityTools.jar RUNNER_ARGS = org.openoffice.Runner -TestBase java_complex -run: - +$(COPY) $(PRJ)$/common$/bin$/$(RES_TARGET)*.res $(CLASSDIR)$/$(PACKAGE) && java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -sce extensions_all.sce +run:copy_resources + +java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -sce extensions_all.sce + +run_%:copy_resources + +java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o complex.$(PRJNAME).$(@:s/run_//) + -run_%: - +$(COPY) $(PRJ)$/common$/bin$/$(RES_TARGET)*.res $(CLASSDIR)$/$(PACKAGE) && java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o complex.$(PRJNAME).$(@:s/run_//) +copy_resources: $(RESLIB1TARGETN) $(RESLIB2TARGETN) + +@$(foreach,i,$(RESLIB1TARGETN) $(COPY) $i $(i:s/de/invalid/:s/_A_//) $(command_seperator)) echo. + +@$(foreach,i,$(RESLIB2TARGETN) $(COPY) $i $(i:s/en-US/invalid/:s/_B_//) $(command_seperator)) echo. |