[Libreoffice-commits] .: Branch 'feature/gbuild_java' - 2 commits - solenv/gbuild unoil/climaker

[Matus Kukan]

 solenv/gbuild/Jar.mk    |    2 +-
 unoil/climaker/Makefile |    9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 144390821535d03735819d229e5ec397972b2436
Author: Matus Kukan <matus.kukan at gmail.com>
Date:   Thu Feb 16 15:05:55 2012 +0100

    unoil: fix Windows build

diff --git a/unoil/climaker/Makefile b/unoil/climaker/Makefile
index a1f1fe6..0d029f7 100644
--- a/unoil/climaker/Makefile
+++ b/unoil/climaker/Makefile
@@ -31,6 +31,7 @@ include $(GBUILDDIR)/gbuild_simple.mk
 include $(SRCDIR)/unoil/climaker/version.txt
 
 cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt
+	$(call gb_Helper_abbreviate_dirs_native, \
 	$(call gb_Helper_execute,climaker \
 		$(if $(filter -s,$(MAKEFLAGS)),,--verbose) \
 		--out $@ \
@@ -40,16 +41,18 @@ cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt
 		-X $(OUTDIR)/bin/udkapi.rdb \
 		-r $(OUTDIR)/bin/cli_uretypes.dll \
 		--keyfile $(OUTDIR)/bin/cliuno.snk \
-		$(OUTDIR)/bin/offapi.rdb)
+		$(OUTDIR)/bin/offapi.rdb) > /dev/null)
 
 cli_oootypes.config : $(SRCDIR)/unoil/climaker/cli_oootypes_config $(SRCDIR)/unoil/climaker/version.txt
-	perl $(SRCDIR)/solenv/bin/clipatchconfig.pl $< $@
+	$(call gb_Helper_abbreviate_dirs_native, \
+	perl $(SRCDIR)/solenv/bin/clipatchconfig.pl $^ $@)
 
 $(CLI_OOOTYPES_POLICY_ASSEMBLY).dll : cli_oootypes.dll cli_oootypes.config
+	$(call gb_Helper_abbreviate_dirs_native, \
 	al -out:$@ \
 		-version:$(CLI_OOOTYPES_POLICY_VERSION) \
 		-keyfile:$(OUTDIR)/bin/cliuno.snk \
-		-link:cli_oootypes.config
+		-link:cli_oootypes.config)
 
 .DEFAULT_GOAL := all
 .PHONY : all
commit 22431c50922eab47df0d8bd4f5c886e06fba24fb
Author: Matus Kukan <matus.kukan at gmail.com>
Date:   Thu Feb 16 15:02:01 2012 +0100

    gbuild: Jar: fix building .jars on Windows

diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index bf4ed12..70c14c5 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -65,7 +65,7 @@ define gb_Jar__command
 	mkdir -p $(dir $(2)) && cd $(call gb_Jar_get_workdir,$(1)) && \
 	$(gb_Jar_JARCOMMAND) cfm $(2) $(call gb_Jar_get_manifest_target,$(1)) \
 		META-INF $(PACKAGEROOTS) $(PACKAGEFILES) \
-	$(foreach root,$(PACKAGEDIRS),&& $(gb_Jar_JARCOMMAND) uf $(2) -C $(dir $(root)) $(notdir $(root))) \
+	$(foreach root,$(PACKAGEDIRS),&& cd $(dir $(root)) && $(gb_Jar_JARCOMMAND) uf $(2) $(notdir $(root))) \
 	|| (rm $(2); false) )
 endef