diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-09-07 13:35:07 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-09-07 13:35:07 +0000 |
| commit | ae0228cdb340de85f42c25024986ce0e557503a3 (patch) | |
| tree | 55439cdf267c7cd8eef9a0ce6fa0c1775b3a133f /solenv/inc/javaunittest.mk | |
| parent | 9d7d35bce00ec0b2676d0428872300cc257e3288 (diff) | |
CWS-TOOLING: integrate CWS kick4nt
Diffstat (limited to 'solenv/inc/javaunittest.mk')
| -rw-r--r-- | solenv/inc/javaunittest.mk | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/solenv/inc/javaunittest.mk b/solenv/inc/javaunittest.mk index 46bb537c86cf..6d34ced82a61 100644 --- a/solenv/inc/javaunittest.mk +++ b/solenv/inc/javaunittest.mk @@ -67,15 +67,15 @@ XCLASSPATH := $(CLASSDIR) .ELSE XCLASSPATH !:= $(XCLASSPATH)$(PATH_SEPERATOR)$(CLASSDIR) .ENDIF -CLASSDIR !:= $(CLASSDIR)$/test +CLASSDIR !:= $(CLASSDIR)/test .INCLUDE: target.mk ALLTAR: $(TESTS) -$(JAVAFILES): $(MISC)$/$(TARGET).classdir.flag +$(JAVAFILES): $(MISC)/$(TARGET).classdir.flag -$(MISC)$/$(TARGET).classdir.flag: +$(MISC)/$(TARGET).classdir.flag: - $(MKDIR) $(CLASSDIR) $(TOUCH) $@ @@ -85,26 +85,26 @@ $(TESTS): $(JAVACLASSFILES) %.test .PHONY: %.java $(JAVAI) $(JAVACPS) $(CLASSPATH) org.openoffice.Runner -TestBase java_complex \ - -NoOffice yes -o $(subst,$/,. $(subst,.test, $(PACKAGE).$@)) + -NoOffice yes -o $(subst,/,. $(subst,.test, $(PACKAGE).$@)) .IF "$(IDLTESTFILES)" != "" # The following dependency (to execute javac whenever javamaker has run) does # not work reliably, see #i28827#: -$(JAVAFILES) $(JAVACLASSFILES): $(MISC)$/$(TARGET).javamaker.flag +$(JAVAFILES) $(JAVACLASSFILES): $(MISC)/$(TARGET).javamaker.flag -$(MISC)$/$(TARGET).javamaker.flag: $(MISC)$/$(TARGET).rdb - $(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD $< -X$(SOLARBINDIR)$/types.rdb +$(MISC)/$(TARGET).javamaker.flag: $(MISC)/$(TARGET).rdb + $(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD $< -X$(SOLARBINDIR)/types.rdb $(TOUCH) $@ -$(MISC)$/$(TARGET).rdb .ERRREMOVE: \ - $(foreach,i,$(IDLTESTFILES) $(subst,.idl,.urd $(MISC)$/$(TARGET)$/$i)) +$(MISC)/$(TARGET).rdb .ERRREMOVE: \ + $(foreach,i,$(IDLTESTFILES) $(subst,.idl,.urd $(MISC)/$(TARGET)/$i)) - rm $@ $(REGMERGE) $@ /UCR $< -$(foreach,i,$(IDLTESTFILES) $(subst,.idl,.urd $(MISC)$/$(TARGET)$/$i)): \ +$(foreach,i,$(IDLTESTFILES) $(subst,.idl,.urd $(MISC)/$(TARGET)/$i)): \ $(IDLTESTFILES) - - $(MKDIR) $(MISC)$/$(TARGET) - $(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $< + - $(MKDIR) $(MISC)/$(TARGET) + $(IDLC) -O$(MISC)/$(TARGET) -I$(SOLARIDLDIR) -cid -we $< .ENDIF |