CWS-TOOLING: integrate CWS l10nframework01

5 files changed, 15 insertions, 7 deletions

diff --git a/qadevOOo/makefile.mk b/qadevOOo/makefile.mk
index de756b44a149..b6f816f3ce3d 100755
--- a/qadevOOo/makefile.mk
+++ b/qadevOOo/makefile.mk
@@ -42,13 +42,14 @@ debug=true
 # ------------------------------------------------
 
 .INCLUDE : ant.mk
-
 TST:
     echo $(SOLAR_JAVA)
 
 .IF "$(SOLAR_JAVA)"=="TRUE"	
 .IF "$(ANT_HOME)"!="NO_ANT_HOME"
 ANT_FLAGS+=-Dbuild.source=1.5
+.IF "$(L10N_framework)"==""
 ALLTAR: ANTBUILD
 .ENDIF
 .ENDIF
+.ENDIF 
diff --git a/qadevOOo/runner/makefile.mk b/qadevOOo/runner/makefile.mk
index b3afff1ba9ce..986111bd5bad 100644
--- a/qadevOOo/runner/makefile.mk
+++ b/qadevOOo/runner/makefile.mk
@@ -44,7 +44,7 @@ JARCOMMANDS_TESTS = $(foreach,i,$(SUBDIRS_TESTS) -C $(CLASSDIR) $i)
 JARCOMMANDS_RUNNER = $(foreach,i,$(SUBDIRS_RUNNER) -C $(CLASSDIR) $i)
 
 # --- Targets ------------------------------------------------------
-.IF "$(SOLAR_JAVA)"=="TRUE"
+.IF "$(SOLAR_JAVA)"=="TRUE" && "$(L10N_framework)"==""
 OWNJAR: ALLTAR
 
 
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