diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-16 11:45:54 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-16 11:45:54 +0000 |
| commit | 46c6fa84d275a81f9b1eb0d953baec342ea7f052 (patch) | |
| tree | a702c593baf2801cbd1a2c5f2328d3a184d5046a /testtools | |
| parent | 067a4c72eaa42d5346aaa0dd07d742b391f9fe46 (diff) | |
CWS-TOOLING: integrate CWS l10nframework01
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/source/bridgetest/idl/makefile.mk | 4 | ||||
| -rw-r--r-- | testtools/source/bridgetest/makefile.mk | 7 | ||||
| -rw-r--r-- | testtools/source/bridgetest/pyuno/makefile.mk | 6 |
3 files changed, 12 insertions, 5 deletions
diff --git a/testtools/source/bridgetest/idl/makefile.mk b/testtools/source/bridgetest/idl/makefile.mk index 0d44c6cc6a18..1b4b5179b4f7 100644 --- a/testtools/source/bridgetest/idl/makefile.mk +++ b/testtools/source/bridgetest/idl/makefile.mk @@ -35,7 +35,7 @@ TARGET := bridgetest_idl .INCLUDE: settings.mk .INCLUDE: target.mk - +.IF "$(L10N_framework)"=="" ALLTAR: $(MISC)$/$(TARGET).cppumaker.done $(MISC)$/$(TARGET).javamaker.done $(MISC)$/$(TARGET).cppumaker.done: $(BIN)$/bridgetest.rdb @@ -70,3 +70,5 @@ $(BIN)$/cli_types_bridgetest.dll: $(BIN)$/bridgetest.rdb .ENDIF .ENDIF # GUI, WNT +.ENDIF # L10N_framework + diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk index bad0d2f76506..3dfb18c7dd4d 100644 --- a/testtools/source/bridgetest/makefile.mk +++ b/testtools/source/bridgetest/makefile.mk @@ -38,7 +38,7 @@ ENABLE_EXCEPTIONS=TRUE LIBTARGET=NO .INCLUDE: settings.mk - +.IF "$(L10N_framework)"=="" DLLPRE = # no leading "lib" on .so files .IF "$(GUI)"=="WNT" @@ -129,9 +129,10 @@ JAVATARGETS=\ .ENDIF # --- Targets ------------------------------------------------------ +.ENDIF # L10N_framework .INCLUDE : target.mk - +.IF "$(L10N_framework)"=="" ALLTAR: \ test \ $(DLLDEST)$/uno_types.rdb \ @@ -242,3 +243,5 @@ $(MISC)$/$(TARGET)$/bootstrap.rdb .ERRREMOVE: $(REGCOMP) -register -r $@ -c javaloader.uno$(DLLPOST) \ -c javavm.uno$(DLLPOST) -c stocservices.uno$(DLLPOST) .ENDIF +.ENDIF # L10N_framework + diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk index 83ea7b829094..d3be59540bd1 100644 --- a/testtools/source/bridgetest/pyuno/makefile.mk +++ b/testtools/source/bridgetest/pyuno/makefile.mk @@ -41,7 +41,7 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk # --- Files -------------------------------------------------------- - +.IF "$(L10N_framework)"=="" PYEXC=$(DLLDEST)$/python$(EXECPOST) REGEXC=$(DLLDEST)$/regcomp$(EXECPOST) @@ -91,9 +91,10 @@ ALL : \ $(DLLDEST)$/pyuno_regcomp.rdb \ doc \ ALLTAR +.ENDIF # L10N_framework .INCLUDE : target.mk - +.IF "$(L10N_framework)"=="" $(DLLDEST)$/%.py: %.py cp $? $@ @@ -116,4 +117,5 @@ runtest : ALL -l com.sun.star.loader.Python $(foreach,i,$(PYCOMPONENTS) -c vnd.openoffice.pymodule:$(i)) cd $(DLLDEST) && $(TEST_ENV) && $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy2.rdb \ -l com.sun.star.loader.Python -c vnd.sun.star.expand:$(DOLLAR_SIGN)FOO/samplecomponent.py +.ENDIF # L10N_framework |