Kaydet (Commit) 299c2f35 authored tarafından Jörg Budischewski's avatar Jörg Budischewski

#98508# added bridgetest_javaserver batch, tests work now also in .pro builds

üst ec9b7c79
...@@ -90,6 +90,8 @@ SHL2DEF= $(MISC)$/$(SHL2TARGET).def ...@@ -90,6 +90,8 @@ SHL2DEF= $(MISC)$/$(SHL2TARGET).def
DEF2NAME= $(SHL2TARGET) DEF2NAME= $(SHL2TARGET)
SHL2VERSIONMAP=$(SOLARENV)$/src$/component.map SHL2VERSIONMAP=$(SOLARENV)$/src$/component.map
# --- Targets ------------------------------------------------------ # --- Targets ------------------------------------------------------
ALL : \ ALL : \
ALLTAR \ ALLTAR \
...@@ -98,7 +100,7 @@ ALL : \ ...@@ -98,7 +100,7 @@ ALL : \
$(DESTDIR)$/bridgetest_inprocess$(BATCH_SUFFIX) \ $(DESTDIR)$/bridgetest_inprocess$(BATCH_SUFFIX) \
$(DESTDIR)$/bridgetest_server$(BATCH_SUFFIX) \ $(DESTDIR)$/bridgetest_server$(BATCH_SUFFIX) \
$(DESTDIR)$/bridgetest_client$(BATCH_SUFFIX) \ $(DESTDIR)$/bridgetest_client$(BATCH_SUFFIX) \
$(DESTDIR)$/bridgetest_javaserver$(BATCH_SUFFIX)
.INCLUDE : target.mk .INCLUDE : target.mk
...@@ -118,6 +120,23 @@ $(DESTDIR)$/bridgetest_server$(BATCH_SUFFIX) : bridgetest_server ...@@ -118,6 +120,23 @@ $(DESTDIR)$/bridgetest_server$(BATCH_SUFFIX) : bridgetest_server
$(GNUCOPY) -p $? $@ $(GNUCOPY) -p $? $@
$(GIVE_EXEC_RIGHTS) $@ $(GIVE_EXEC_RIGHTS) $@
.IF "$(SOLAR_JAVA)" != ""
# jar-files, which regcomp needs so that it can use java
MY_JARS=unoil.jar java_uno.jar ridl.jar sandbox.jar jurt.jar juh.jar
# CLASSPATH, which regcomp needs to be run
MY_CLASSPATH_TMP=$(foreach,i,$(MY_JARS) $(SOLARBINDIR)$/$i)$(PATH_SEPERATOR)$(XCLASSPATH)
MY_CLASSPATH=$(strip $(subst,!,$(PATH_SEPERATOR) $(MY_CLASSPATH_TMP:s/ /!/)))
$(DESTDIR)$/bridgetest_javaserver : makefile.mk
-rm -f $@
+echo java -classpath $(MY_CLASSPATH)$(PATH_SEPERATOR):..$/class$/testComponent.jar \
com.sun.star.comp.bridge.TestComponentMain \
\""uno:socket,host=localhost,port=2002;urp;test"\" \
> $@
$(GIVE_EXEC_RIGHTS) $@
.ENDIF
# I can't make a dependency on shared libraries, because dependent targets # I can't make a dependency on shared libraries, because dependent targets
# get the .setdir current directory. AAARGGGGGG ! # get the .setdir current directory. AAARGGGGGG !
$(DESTDIR)$/uno_services.rdb .SETDIR=$(DESTDIR) : $(DESTDIR)$/uno_services.rdb .SETDIR=$(DESTDIR) :
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment