diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 12:31:55 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 12:31:55 +0000 |
| commit | 8098f9ea6cf640c6a6ecb6505b642f036ebffc31 (patch) | |
| tree | 7c3c73bd41faedbb856d5d4a6423c19f79c23dbf /bridges/test | |
| parent | 3dcac23c8ff15575c2a4cba82761a3e33102c226 (diff) | |
INTEGRATION: CWS ause069 (1.5.82); FILE MERGED
2006/11/28 11:48:44 hjs 1.5.82.1: #i70359# remove forced shell calls; a bit cleanup
Diffstat (limited to 'bridges/test')
| -rw-r--r-- | bridges/test/java_uno/equals/makefile.mk | 18 | ||||
| -rw-r--r-- | bridges/test/java_uno/nativethreadpool/makefile.mk | 20 |
2 files changed, 19 insertions, 19 deletions
diff --git a/bridges/test/java_uno/equals/makefile.mk b/bridges/test/java_uno/equals/makefile.mk index 2a7de5140..bfa240f0e 100644 --- a/bridges/test/java_uno/equals/makefile.mk +++ b/bridges/test/java_uno/equals/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: rt $ $Date: 2005-09-07 23:00:05 $ +# last change: $Author: obo $ $Date: 2007-01-25 13:31:43 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -82,10 +82,10 @@ $(MISC)$/$(TARGET).rdb: types.idl - rm $@ - $(MKDIR) $(MISC)$/$(TARGET) - $(MKDIR) $(MISC)$/$(TARGET)$/inc - idlc -I$(SOLARIDLDIR) -O$(MISC)$/$(TARGET) $< - regmerge $(MISC)$/$(TARGET).rdb /UCR $(MISC)$/$(TARGET)$/types.urd - cppumaker -BUCR -C -O$(MISC)$/$(TARGET)$/inc $@ -X$(SOLARBINDIR)$/types.rdb - javamaker -BUCR -nD -O$(CLASSDIR) $@ -X$(SOLARBINDIR)$/types.rdb + $(IDLC) -I$(SOLARIDLDIR) -O$(MISC)$/$(TARGET) $< + $(REGMERGE) $(MISC)$/$(TARGET).rdb /UCR $(MISC)$/$(TARGET)$/types.urd + $(CPPUMAKER) -BUCR -C -O$(MISC)$/$(TARGET)$/inc $@ -X$(SOLARBINDIR)$/types.rdb + $(JAVAMAKER) -BUCR -nD -O$(CLASSDIR) $@ -X$(SOLARBINDIR)$/types.rdb $(SLOFILES) $(JAVACLASSFILES): $(MISC)$/$(TARGET).rdb @@ -99,6 +99,6 @@ $(BIN)$/testequals$(SCRIPTEXT): $(BIN)$/testequals_services.rdb $(BIN)$/testequals_services.rdb: - rm $@ - regcomp -register -r $@ -c bridgefac.uno - regcomp -register -r $@ -c connector.uno - regcomp -register -r $@ -c remotebridge.uno + $(REGCOMP) -register -r $@ -c bridgefac.uno + $(REGCOMP) -register -r $@ -c connector.uno + $(REGCOMP) -register -r $@ -c remotebridge.uno diff --git a/bridges/test/java_uno/nativethreadpool/makefile.mk b/bridges/test/java_uno/nativethreadpool/makefile.mk index 68d0875d8..b55e061b5 100644 --- a/bridges/test/java_uno/nativethreadpool/makefile.mk +++ b/bridges/test/java_uno/nativethreadpool/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: rt $ $Date: 2005-09-07 23:01:08 $ +# last change: $Author: obo $ $Date: 2007-01-25 13:31:55 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -82,10 +82,10 @@ $(MISC)$/$(TARGET)$/types.rdb: types.idl - rm $@ - $(MKDIR) $(MISC)$/$(TARGET) - $(MKDIR) $(MISC)$/$(TARGET)$/inc - idlc -I$(SOLARIDLDIR) -O$(MISC)$/$(TARGET) $< - regmerge $@ /UCR $(MISC)$/$(TARGET)$/types.urd - cppumaker -BUCR -C -O$(MISC)$/$(TARGET)$/inc $@ -X$(SOLARBINDIR)$/types.rdb - javamaker -BUCR -nD -O$(CLASSDIR) $@ -X$(SOLARBINDIR)$/types.rdb + $(IDLC) -I$(SOLARIDLDIR) -O$(MISC)$/$(TARGET) $< + $(REGMERGE) $@ /UCR $(MISC)$/$(TARGET)$/types.urd + $(CPPUMAKER) -BUCR -C -O$(MISC)$/$(TARGET)$/inc $@ -X$(SOLARBINDIR)$/types.rdb + $(JAVAMAKER) -BUCR -nD -O$(CLASSDIR) $@ -X$(SOLARBINDIR)$/types.rdb $(SLOFILES) $(JAVACLASSFILES): $(MISC)$/$(TARGET)$/types.rdb @@ -95,21 +95,21 @@ $(BIN)$/$(TARGET).uno.jar: $(JAVACLASSFILES) relay.manifest $(BIN)$/$(TARGET).rdb .ERRREMOVE: $(MISC)$/$(TARGET)$/types.rdb \ $(BIN)$/$(TARGET).uno.jar cp $(MISC)$/$(TARGET)$/types.rdb $@ - regmerge $@ / $(SOLARBINDIR)$/types.rdb - regcomp -register -r $@ -c acceptor.uno$(DLLPOST) \ + $(REGMERGE) $@ / $(SOLARBINDIR)$/types.rdb + $(REGCOMP) -register -r $@ -c acceptor.uno$(DLLPOST) \ -c bridgefac.uno$(DLLPOST) -c connector.uno$(DLLPOST) \ -c remotebridge.uno$(DLLPOST) -c uuresolver.uno$(DLLPOST) \ -c javaloader.uno$(DLLPOST) -c javavm.uno$(DLLPOST) \ -c uriproc.uno$(DLLPOST) cp $(SOLARBINDIR)$/types.rdb $(MISC)$/$(TARGET)$/bootstrap.rdb - regcomp -register -r $(MISC)$/$(TARGET)$/bootstrap.rdb \ + $(REGCOMP) -register -r $(MISC)$/$(TARGET)$/bootstrap.rdb \ -c javaloader.uno$(DLLPOST) -c javavm.uno$(DLLPOST) \ -c uriproc.uno$(DLLPOST) .IF "$(GUI)" == "WNT" ERROR -- missing platform .ELSE # GUI, WNT + setenv OO_JAVA_PROPERTIES RuntimeLib=$(JVM_LIB_URL) ; \ - regcomp -register -r $@ -c file://$(PWD)/$(BIN)$/$(TARGET).uno.jar \ + $(REGCOMP) -register -r $@ -c file://$(PWD)/$(BIN)$/$(TARGET).uno.jar \ -br $(MISC)$/$(TARGET)$/bootstrap.rdb -classpath $(EXEC_CLASSPATH) \ -env:URE_INTERNAL_JAVA_DIR=file://$(SOLARBINDIR) .ENDIF # GUI, WNT |