Mercurial > hg > graal-jvmci-8
comparison mx/mx_graal_makefile.py @ 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 |
---|---|
181 | 181 |
182 EXPORTED_FILES_ADDITIONAL=$(TARGET)/options $(TARGET)/services | 182 EXPORTED_FILES_ADDITIONAL=$(TARGET)/options $(TARGET)/services |
183 HS_COMMON_SRC=. | 183 HS_COMMON_SRC=. |
184 | 184 |
185 # Directories, where the generated property-files reside within the JAR files | 185 # Directories, where the generated property-files reside within the JAR files |
186 PROVIDERS_INF=/META-INF/providers/ | 186 PROVIDERS_INF=/META-INF/providers |
187 SERVICES_INF=/META-INF/services/ | 187 SERVICES_INF=/META-INF/services |
188 OPTIONS_INF=/META-INF/options/ | 188 OPTIONS_INF=/META-INF/options |
189 | 189 |
190 ifeq ($(ABS_BOOTDIR),) | 190 ifeq ($(ABS_BOOTDIR),) |
191 $(error Variable ABS_BOOTDIR must be set to a JDK installation.) | 191 $(error Variable ABS_BOOTDIR must be set to a JDK installation.) |
192 endif | 192 endif |
193 ifneq ($(MAKE_VERBOSE),) | 193 ifneq ($(MAKE_VERBOSE),) |
209 endef | 209 endef |
210 | 210 |
211 define extract | 211 define extract |
212 $(eval TMP := $(shell mktemp -d $(1)_XXXXX)) | 212 $(eval TMP := $(shell mktemp -d $(1)_XXXXX)) |
213 mkdir -p $(2); | 213 mkdir -p $(2); |
214 cd $(TMP) && $(JAR) xf $(abspath $(1)) && \ | 214 cd $(TMP) && $(JAR) xf $(abspath $(1)) && \\ |
215 ((test ! -d .$(SERVICES_INF) || cp -r .$(SERVICES_INF) $(abspath $(2))) && (test ! -d .$(OPTIONS_INF) || cp -r .$(OPTIONS_INF) $(abspath $(2)))); | 215 ((test ! -d .$(SERVICES_INF) || cp -r .$(SERVICES_INF) $(abspath $(2))) && (test ! -d .$(OPTIONS_INF) || cp -r .$(OPTIONS_INF) $(abspath $(2)))); |
216 rm -r $(TMP); | 216 rm -r $(TMP); |
217 cp $(1) $(2); | 217 cp $(1) $(2); |
218 endef | 218 endef |
219 | 219 |