solenv/gbuild/CliLibrary.mk | 5 +++-- solenv/gbuild/CliNativeLibrary.mk | 2 +- solenv/gbuild/Helper.mk | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-)
New commits: commit 5fae3213d72702e38d00a501e4e91d1f163fc867 Author: Matúš Kukan <matus.ku...@gmail.com> Date: Mon Aug 6 16:40:24 2012 +0200 get cli_ure closer to successful build Change-Id: I28ba1f4e802b3736a9f82966a2c7908388df4a92 diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk index 62c9d78..bf2c88c 100644 --- a/solenv/gbuild/CliLibrary.mk +++ b/solenv/gbuild/CliLibrary.mk @@ -36,14 +36,15 @@ gb_CliLibraryTarget__get_generated_source = $(WORKDIR)/$(1).cs define gb_CliLibraryTarget__command $(call gb_Output_announce,$(2),$(true),CSC,3) $(call gb_Helper_abbreviate_dirs,\ - csc \ + csc $(call gb_Helper_windows_path, \ $(call gb_CliLibraryTarget__get_csflags) \ $(CLI_CSCFLAGS) \ -target:library \ -out:$(1) \ -reference:System.dll \ - $(foreach assembly,$(CLI_ASSEMBLIES),-reference:$(assembly).dll) \ + $(foreach assembly,$(CLI_ASSEMBLIES),-reference:$(assembly)) \ $(CLI_SOURCES) \ + ) \ ) endef diff --git a/solenv/gbuild/CliNativeLibrary.mk b/solenv/gbuild/CliNativeLibrary.mk index 5751cc8..a11c1d1 100644 --- a/solenv/gbuild/CliNativeLibrary.mk +++ b/solenv/gbuild/CliNativeLibrary.mk @@ -35,7 +35,7 @@ $(call gb_CliNativeLibraryTarget_get_target,%) : $(call gb_CliNativeLibraryTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),SN ,4) $(call gb_Helper_abbreviate_dirs,\ - rm -r $(call gb_CliNativeLibraryTarget_get_target,$*) \ + rm -rf $(call gb_CliNativeLibraryTarget_get_target,$*) \ ) define gb_CliNativeLibraryTarget_CliNativeLibraryTarget diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 93a0ad7..b83ecbe 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -55,6 +55,11 @@ define gb_Helper_native_path $(call gb_Output_error,gb_Helper_native_path: Do not use. Should not be necessary.) endef +# cygwin seems to eat one backslash when executing command, thus replace with '\\' +define gb_Helper_windows_path +$(subst /,\\,$(1)) +endef + define gb_Helper_make_clean_target gb_$(1)_get_clean_target = $(WORKDIR)/Clean/$(1)/$$(1)
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits