diff options
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/prj/build.lst | 2 | ||||
| -rw-r--r-- | testtools/source/bridgetest/pyuno/makefile.mk | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/testtools/prj/build.lst b/testtools/prj/build.lst index 24dce4119821..c1609c6c364d 100644 --- a/testtools/prj/build.lst +++ b/testtools/prj/build.lst @@ -1,4 +1,4 @@ -tt testtools : cpputools io remotebridges stoc javaunohelper pyuno cli_ure offapi NULL +tt testtools : cpputools io remotebridges stoc javaunohelper PYUNO:pyuno cli_ure offapi NULL tt testtools\inc nmake - all tt_inc NULL tt testtools\source\bridgetest nmake - all tt_bridgetest tt_bridgetest_idl tt_javaTestObjs tt_inc NULL tt testtools\source\bridgetest\cli nmake - w,vc7 tt_cli tt_bridgetest tt_bridgetest_idl tt_inc NULL diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk index fb7a78f71f4a..04b529aa9646 100644 --- a/testtools/source/bridgetest/pyuno/makefile.mk +++ b/testtools/source/bridgetest/pyuno/makefile.mk @@ -37,6 +37,7 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk # --- Files -------------------------------------------------------- +.IF "$(DISABLE_PYTHON)" != "TRUE" .IF "$(L10N_framework)"=="" PYEXC=$(DLLDEST)$/python$(EXECPOST) REGEXC=$(DLLDEST)$/regcomp$(EXECPOST) @@ -79,8 +80,11 @@ ALL : \ doc \ ALLTAR .ENDIF # L10N_framework +.ENDIF # DISABLE_PYTHON .INCLUDE : target.mk + +.IF "$(DISABLE_PYTHON)" != "TRUE" .IF "$(L10N_framework)"=="" $(DLLDEST)$/%.py: %.py cp $? $@ @@ -105,4 +109,5 @@ runtest : ALL cd $(DLLDEST) && $(TEST_ENV) && $(WRAPCMD) $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy2.rdb \ -l com.sun.star.loader.Python -c vnd.sun.star.expand:$$FOO/samplecomponent.py .ENDIF # L10N_framework +.ENDIF # DISABLE_PYTHON |