max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-10 08:16:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't rely on process substitution

Browse source
This commit is contained in:
Eelco Dolstra 2014-09-12 12:50:03 +02:00
parent 5c4d2dab99
commit 72d684d592
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
jars.mk
View file

@ -16,7 +16,9 @@ define build-jar
$$(trace-javac) javac $(GLOBAL_JAVACFLAGS) $$($(1)_JAVACFLAGS) -d $$($(1)_TMPDIR) \ $$(trace-javac) javac $(GLOBAL_JAVACFLAGS) $$($(1)_JAVACFLAGS) -d $$($(1)_TMPDIR) \
$$(foreach fn, $$($(1)_SOURCES), '$$(fn)') \ $$(foreach fn, $$($(1)_SOURCES), '$$(fn)') \
-cp "$$(subst $$(space),,$$(foreach jar,$$($(1)_JARS),$$($$(jar)_PATH):))$$$$CLASSPATH" -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) @rm -rf $$($(1)_TMPDIR)
$(1)_INSTALL_DIR ?= $$(jardir) $(1)_INSTALL_DIR ?= $$(jardir)

4
lib.mk
View file

@ -14,10 +14,6 @@ dist-files :=
OS = $(shell uname -s) OS = $(shell uname -s)
# Use bash (required for process substitution in the JAR function).
SHELL = bash
# Hack to define a literal space. # Hack to define a literal space.
space := space :=
space += space +=