diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 11:07:39 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 11:07:39 +0000 |
| commit | f36cacdef4851f95f7494b31c87387c229197a7e (patch) | |
| tree | 8d4b1214156b75b06d237ee1aa0e4755ddcb48ba /cppuhelper/qa | |
| parent | a925934f12742efbd1c6b4b0cd03ce8a38b3d727 (diff) | |
INTEGRATION: CWS ause069 (1.2.60); FILE MERGED
2006/10/18 17:10:23 hjs 1.2.60.1: #i70359# remove forced shell calls
Diffstat (limited to 'cppuhelper/qa')
| -rw-r--r-- | cppuhelper/qa/propertysetmixin/makefile.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk index e849ba48c..c2760f18c 100644 --- a/cppuhelper/qa/propertysetmixin/makefile.mk +++ b/cppuhelper/qa/propertysetmixin/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: hr $ $Date: 2005-10-27 17:17:38 $ +# last change: $Author: obo $ $Date: 2007-01-25 12:07:39 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -45,7 +45,7 @@ ENABLE_EXCEPTIONS := TRUE .IF "$(GUI)" == "WNT" FILEURLPREFIX = file:/// -MY_URE_INTERNAL_JAVA_DIR=$(strip $(subst,\,/ file:///$(shell +$(WRAPCMD) echo $(SOLARBINDIR)))) +MY_URE_INTERNAL_JAVA_DIR=$(strip $(subst,\,/ file:///$(shell $(WRAPCMD) echo $(SOLARBINDIR)))) .ELSE FILEURLPREFIX = file:// MY_URE_INTERNAL_JAVA_DIR=file://$(SOLARBINDIR) @@ -89,14 +89,14 @@ $(MISC)$/$(TARGET)$/types.urd: types.idl $(IDLC) -O$(@:d) -I$(SOLARIDLDIR) -cid -we $< $(MISC)$/$(TARGET)$/types.rdb .ERRREMOVE: $(MISC)$/$(TARGET)$/types.urd - -+ $(RM) $@ + - $(RM) $@ $(REGMERGE) $@ /UCR $< $(MISC)$/$(TARGET)$/uno.rdb .ERRREMOVE: $(MISC)$/$(TARGET)$/types.rdb \ $(DLLDEST)$/$(SHL2TARGET)$(DLLPOST) \ $(MISC)$/$(TARGET)$/$(TARGET).uno.jar $(MISC)$/$(TARGET)$/bootstrap.rdb - $(MKDIR) $(@:d) - + $(COPY) $(SOLARBINDIR)$/types.rdb $@ + $(COPY) $(SOLARBINDIR)$/types.rdb $@ $(REGMERGE) $@ / $(MISC)$/$(TARGET)$/types.rdb $(REGCOMP) -register -r $@ -c javaloader.uno$(DLLPOST) \ -c javavm.uno$(DLLPOST) -c reflection.uno$(DLLPOST) \ @@ -111,7 +111,7 @@ $(MISC)$/$(TARGET)$/uno.rdb .ERRREMOVE: $(MISC)$/$(TARGET)$/types.rdb \ $(MISC)$/$(TARGET)$/bootstrap.rdb .ERRREMOVE: - $(MKDIR) $(@:d) - + $(COPY) $(SOLARBINDIR)$/types.rdb $@ + $(COPY) $(SOLARBINDIR)$/types.rdb $@ $(REGCOMP) -register -r $@ -c javaloader.uno$(DLLPOST) \ -c javavm.uno$(DLLPOST) -c uriproc.uno$(DLLPOST) @@ -136,11 +136,11 @@ $(MISC)$/$(TARGET)$/$(TARGET).uno.jar: $(JAVACLASSFILES) \ test .PHONY: $(SHL1TARGETN) $(MISC)$/$(TARGET)$/uno.rdb .IF "$(GUI)" == "WNT" - + set CLASSPATH=$(CLASSPATH) && \ + set CLASSPATH=$(CLASSPATH) && \ set URE_INTERNAL_JAVA_DIR=$(MY_URE_INTERNAL_JAVA_DIR) && \ testshl2 $(SHL1TARGETN) -forward "$(MISC)$/$(TARGET)$/uno.rdb#$(SOLARBINDIR)" .ELSE - + setenv CLASSPATH $(CLASSPATH) && \ + setenv CLASSPATH $(CLASSPATH) && \ setenv URE_INTERNAL_JAVA_DIR $(MY_URE_INTERNAL_JAVA_DIR) && \ testshl2 $(SHL1TARGETN) -forward "$(MISC)$/$(TARGET)$/uno.rdb#$(SOLARLIBDIR)" .ENDIF |