[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
180/376: Don't rely on process substitution
From: |
Ludovic Courtès |
Subject: |
180/376: Don't rely on process substitution |
Date: |
Wed, 28 Jan 2015 22:04:52 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit 72d684d592233829b785d5fbec10da6e9ce580df
Author: Eelco Dolstra <address@hidden>
Date: Fri Sep 12 12:50:03 2014 +0200
Don't rely on process substitution
---
jars.mk | 4 +++-
lib.mk | 4 ----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/jars.mk b/jars.mk
index a111783..c8513e6 100644
--- a/jars.mk
+++ b/jars.mk
@@ -16,7 +16,9 @@ define build-jar
$$(trace-javac) javac $(GLOBAL_JAVACFLAGS) $$($(1)_JAVACFLAGS) -d
$$($(1)_TMPDIR) \
$$(foreach fn, $$($(1)_SOURCES), '$$(fn)') \
-cp "$$(subst $$(space),,$$(foreach
jar,$$($(1)_JARS),$$($$(jar)_PATH):))$$$$CLASSPATH"
- $$(trace-jar) jar cfm $$($(1)_PATH) <(echo -e '$$(subst
$$(newline),\n,$$($(1)_MANIFEST))') -C $$($(1)_TMPDIR) .
+ @echo -e '$$(subst $$(newline),\n,$$($(1)_MANIFEST))' >
$$($(1)_PATH).manifest
+ $$(trace-jar) jar cfm $$($(1)_PATH) $$($(1)_PATH).manifest -C
$$($(1)_TMPDIR) .
+ @rm $$($(1)_PATH).manifest
@rm -rf $$($(1)_TMPDIR)
$(1)_INSTALL_DIR ?= $$(jardir)
diff --git a/lib.mk b/lib.mk
index fd39d35..f390a7e 100644
--- a/lib.mk
+++ b/lib.mk
@@ -14,10 +14,6 @@ dist-files :=
OS = $(shell uname -s)
-# Use bash (required for process substitution in the JAR function).
-SHELL = bash
-
-
# Hack to define a literal space.
space :=
space +=
- 167/376: Add an 'optimiseStore' remote procedure call., (continued)
- 167/376: Add an 'optimiseStore' remote procedure call., Ludovic Courtès, 2015/01/28
- 171/376: Fix build-remote.pl, Ludovic Courtès, 2015/01/28
- 172/376: tests/remote-builds.nix: Time out faster, Ludovic Courtès, 2015/01/28
- 176/376: Add support for using a build directory, Ludovic Courtès, 2015/01/28
- 178/376: Support specifying a JAR manifest, Ludovic Courtès, 2015/01/28
- 181/376: Add some hyperlinks between NIXPATH and -I, Ludovic Courtès, 2015/01/28
- 165/376: Add disallowedReferences / disallowedRequisites, Ludovic Courtès, 2015/01/28
- 173/376: Tweak, Ludovic Courtès, 2015/01/28
- 168/376: Fix boost::too_many_args error, Ludovic Courtès, 2015/01/28
- 174/376: build-remote.pl: UTF-8-decode errors, Ludovic Courtès, 2015/01/28
- 180/376: Don't rely on process substitution,
Ludovic Courtès <=
- 177/376: Improved support for building JARs, Ludovic Courtès, 2015/01/28
- 187/376: Drop reference to FreeBSD, Ludovic Courtès, 2015/01/28
- 189/376: Tweak some chapter titles, Ludovic Courtès, 2015/01/28
- 175/376: Hack to prevent Makefile.config from being regenerated by "make clean", Ludovic Courtès, 2015/01/28
- 186/376: Remove pointless "license" section, Ludovic Courtès, 2015/01/28
- 190/376: Undocument NIX_OTHER_STORES, Ludovic Courtès, 2015/01/28
- 184/376: Nicer file names for the release notes, Ludovic Courtès, 2015/01/28
- 198/376: Derive Emacs nix-mode from prog-mode., Ludovic Courtès, 2015/01/28
- 179/376: Fix JAR installation, Ludovic Courtès, 2015/01/28
- 194/376: Style tweak, Ludovic Courtès, 2015/01/28