diff options
Diffstat (limited to 'ure/source')
| -rw-r--r-- | ure/source/uretest/Makefile | 7 | ||||
| -rw-r--r-- | ure/source/uretest/Makefile.pln | 15 | ||||
| -rw-r--r-- | ure/source/uretest/README | 4 |
3 files changed, 8 insertions, 18 deletions
diff --git a/ure/source/uretest/Makefile b/ure/source/uretest/Makefile index ebfcd4bb96cf..1ba97fd79593 100644 --- a/ure/source/uretest/Makefile +++ b/ure/source/uretest/Makefile @@ -266,11 +266,8 @@ out.sdk/types.javamaker.flag: out.sdk/types.rdb | out.sdk out.sdk/class touch $@ -out.sdk/types.rdb: out.sdk/types.urd | out.sdk - $(REGMERGE) $@ /UCR $< - -out.sdk/types.urd: types.idl | out.sdk - $(IDLC) -O$(@D) -I$(IDL_DIR) -cid -we $< +out.sdk/types.rdb: types.idl | out.sdk + $(UNOIDLWRITE) $(URE_TYPES) $< $@ out.sdk/services.rdb: services.rdb.in | out.sdk/cpptest.uno.$(SHAREDLIB_EXT) \ diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln index 990c32bf5771..37025d7acb39 100644 --- a/ure/source/uretest/Makefile.pln +++ b/ure/source/uretest/Makefile.pln @@ -30,11 +30,7 @@ URE_HOME ?= /opt/libreoffice .PHONY: check -check: test-regview test-cpptest test-javatest test-javanative test-clientserver - -.PHONY: test-regview -test-regview: out.pln/types.rdb - $(URE_HOME)/program/regview $< > /dev/null +check: test-cpptest test-javatest test-javanative test-clientserver .PHONY: test-cpptest test-cpptest: out.pln/cppmain.uno.so out.pln/types.rdb out.pln/services.rdb @@ -247,12 +243,9 @@ out.pln/types.javamaker.flag: out.pln/types.rdb | out.pln out.pln/class touch $@ -out.pln/types.rdb: out.pln/types.urd | out.pln - $(URE_HOME)/program/regmerge $@ /UCR $< - -out.pln/types.urd: types.idl | out.pln - LD_LIBRARY_PATH=$(URE_HOME)/program $(SDK_HOME)/bin/idlc -O$(@D) \ - -I$(SDK_HOME)/idl -cid -we $< +out.pln/types.rdb: types.idl | out.pln + LD_LIBRARY_PATH=$(URE_HOME)/program $(SDK_HOME)/bin/unoidl-write \ + $(URE_HOME)/program/types.rdb $< $@ out.pln/services.rdb: services.rdb.in | out.pln/cpptest.uno.so \ diff --git a/ure/source/uretest/README b/ure/source/uretest/README index 2699156a5e59..c4ef98332738 100644 --- a/ure/source/uretest/README +++ b/ure/source/uretest/README @@ -43,8 +43,8 @@ environment variables: - SDK_HOME Points to the base directory of an OpenOffice.org SDK so that you can access UNO -programming tools and files that are not part of the URE. For example, idlc, -cppumaker, javamaker, UNOIDL files, and C++ headers. +programming tools and files that are not part of the URE. For example, unoidl-write, +cppumaker, javamaker, and C++ headers. - PATH Points to a GCC installation (including g++) as well as a JDK installation that |