diff options
| author | Oliver Bolte <obo@openoffice.org> | 2003-09-05 11:58:56 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2003-09-05 11:58:56 +0000 |
| commit | e6a77c064a82ab38b8146e902ed44d76c467a346 (patch) | |
| tree | 1884d9de204f2071fb3cb1590462d3e4bd058073 /testtools | |
| parent | 40e8ad41b513c481423e7a31a5ede300256eb23b (diff) | |
#100000# UNIX not buildable
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/source/bridgetest/makefile.mk | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk index d9a0f070a4e6..07a4d92ade20 100644 --- a/testtools/source/bridgetest/makefile.mk +++ b/testtools/source/bridgetest/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # -# last change: $Author: obo $ $Date: 2003-09-04 09:16:38 $ +# last change: $Author: obo $ $Date: 2003-09-05 12:58:56 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -223,13 +223,11 @@ $(DESTDIR)$/bridgetest_inprocess_java$(BATCH_SUFFIX) : makefile.mk $(GIVE_EXEC_RIGHTS) $@ .ENDIF -bla=testComponent.jar -JAVACOMP=$(PWD) -JavaComponentURL : $$JAVACOMP=file:///$($(assign $(JAVACOMP)= $(subst,\,/ $(PWD:d))class/testComponent.jar)) ; - echo ###JavaComponentURL - @echo $(JAVACOMP) - -# $(JAVACOMP)=file:///$($(assign $(JAVACOMP)= $(subst,\,/ $(PWD:d))class/testComponent.jar)) +.IF "$(GUI)"=="WNT" +JAVA_TEST_COMPONENT = $(subst,\,/ file:///$(PWD:d))class/testComponent.jar +.ELSE +JAVA_TEST_COMPONENT = $(subst,\,/ file://$(PWD:d))class/testComponent.jar +.ENDIF # I can't make a dependency on shared libraries, because dependent targets # get the .setdir current directory. AAARGGGGGG ! @@ -247,13 +245,11 @@ $(DESTDIR)$/uno_services.rdb .SETDIR=$(DESTDIR) : $(WINTARGETS) -c javaloader.uno$(MY_DLLPOSTFIX) \ -c javavm.uno$(MY_DLLPOSTFIX) regcomp -register -br uno_types.rdb -br uno_services.rdb -r uno_services.rdb \ - -c $(subst,\,/ file:///$(PWD:d))class/testComponent.jar \ + -c $(JAVA_TEST_COMPONENT) \ -l com.sun.star.loader.Java \ -classpath $(MY_CLASSPATH) .ENDIF -BLA:=$(PWD:s/bin/class) - $(DESTDIR)$/regcomp.exe : $(SOLARBINDIR)$/regcomp.exe -rm -f $@ cp $? $@ |