Mercurial > hg > graal-jvmci-8
comparison make/jvmci.make @ 21888:878786299d2d
removed trailing slash from directory names in jvmci.make
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Tue, 09 Jun 2015 23:00:38 +0200 |
parents | 82d9b136fe5c |
children | 899d7cadd0a1 |
comparison
equal
deleted
inserted
replaced
21887:543f150e7fa0 | 21888:878786299d2d |
---|---|
10 | 10 |
11 EXPORTED_FILES_ADDITIONAL=$(TARGET)/options $(TARGET)/services | 11 EXPORTED_FILES_ADDITIONAL=$(TARGET)/options $(TARGET)/services |
12 HS_COMMON_SRC=. | 12 HS_COMMON_SRC=. |
13 | 13 |
14 # Directories, where the generated property-files reside within the JAR files | 14 # Directories, where the generated property-files reside within the JAR files |
15 PROVIDERS_INF=/META-INF/providers/ | 15 PROVIDERS_INF=/META-INF/providers |
16 SERVICES_INF=/META-INF/services/ | 16 SERVICES_INF=/META-INF/services |
17 OPTIONS_INF=/META-INF/options/ | 17 OPTIONS_INF=/META-INF/options |
18 | 18 |
19 ifeq ($(ABS_BOOTDIR),) | 19 ifeq ($(ABS_BOOTDIR),) |
20 $(error Variable ABS_BOOTDIR must be set to a JDK installation.) | 20 $(error Variable ABS_BOOTDIR must be set to a JDK installation.) |
21 endif | 21 endif |
22 ifneq ($(MAKE_VERBOSE),) | 22 ifneq ($(MAKE_VERBOSE),) |
38 endef | 38 endef |
39 | 39 |
40 define extract | 40 define extract |
41 $(eval TMP := $(shell mktemp -d $(1)_XXXXX)) | 41 $(eval TMP := $(shell mktemp -d $(1)_XXXXX)) |
42 mkdir -p $(2); | 42 mkdir -p $(2); |
43 cd $(TMP) && $(JAR) xf $(abspath $(1)) && ((test ! -d .$(SERVICES_INF) || cp -r .$(SERVICES_INF) $(abspath $(2))) && (test ! -d .$(OPTIONS_INF) || cp -r .$(OPTIONS_INF) $(abspath $(2)))); | 43 cd $(TMP) && $(JAR) xf $(abspath $(1)) && \ |
44 ((test ! -d .$(SERVICES_INF) || cp -r .$(SERVICES_INF) $(abspath $(2))) && (test ! -d .$(OPTIONS_INF) || cp -r .$(OPTIONS_INF) $(abspath $(2)))); | |
44 rm -r $(TMP); | 45 rm -r $(TMP); |
45 cp $(1) $(2); | 46 cp $(1) $(2); |
46 endef | 47 endef |
47 | 48 |
48 | 49 |