applied_patches/0315-buildfix-testtool-disabled.diff

   1 diff --git testtools/source/bridgetest/idl/makefile.mk testtools/source/bridgetest/idl/makefile.mk
   2 index 671f982..01b9e0c 100644
   3 --- testtools/source/bridgetest/idl/makefile.mk
   4 +++ testtools/source/bridgetest/idl/makefile.mk
   5 @@ -60,6 +60,8 @@ CLIMAKERFLAGS =
   6  CLIMAKERFLAGS += --verbose
   7  .ENDIF
   8
   9 +
  10 +.IF "$(BUILD_FOR_CLI)" == "true"
  11  ALLTAR: $(MISC)$/$(TARGET).cppumaker.done \
  12      $(MISC)$/$(TARGET).javamaker.done \
  13      $(BIN)$/cli_types_bridgetest.dll
  14 @@ -68,4 +70,8 @@ $(BIN)$/cli_types_bridgetest.dll: $(BIN)$/bridgetest.rdb
  15      $(CLIMAKER) $(CLIMAKERFLAGS) --out $@ -r $(SOLARBINDIR)$/cli_uretypes.dll \
  16          -X $(SOLARBINDIR)$/types.rdb $<
  17      $(TOUCH) $@
  18 +.ELSE
  19 +ALLTAR: $(MISC)$/$(TARGET).cppumaker.done \
  20 +    $(MISC)$/$(TARGET).javamaker.done
  21 +.ENDIF
  22
  23 diff --git testtools/util/makefile.pmk testtools/util/makefile.pmk
  24 index b52727a..b380d74 100644
  25 --- testtools/util/makefile.pmk
  26 +++ testtools/util/makefile.pmk
  27 @@ -31,7 +31,7 @@
  28
  29  # no translation here anyway
  30  .IF "$(L10N_framework)"==""
  31 -.IF "$(COM)" == "MSC"
  32 +.IF "$(COM)" == "MSC" || "$(ENABLE_MONO)" == "YES"
  33  BUILD_FOR_CLI = "true"
  34  CFLAGSENABLESYMBOLS:=-Z7
  35  .ENDIF