Mercurial > hg > truffle

changeset 21888:878786299d2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 543f150e7fa0
children 9fe51d8fae0f
files make/jvmci.make mx/mx_graal_makefile.py
diffstat 2 files changed, 9 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/make/jvmci.make	Tue Jun 09 22:44:34 2015 +0200
+++ b/make/jvmci.make	Tue Jun 09 23:00:38 2015 +0200
@@ -12,9 +12,9 @@
 HS_COMMON_SRC=.
 
 # Directories, where the generated property-files reside within the JAR files
-PROVIDERS_INF=/META-INF/providers/
-SERVICES_INF=/META-INF/services/
-OPTIONS_INF=/META-INF/options/
+PROVIDERS_INF=/META-INF/providers
+SERVICES_INF=/META-INF/services
+OPTIONS_INF=/META-INF/options
 
 ifeq ($(ABS_BOOTDIR),)
     $(error Variable ABS_BOOTDIR must be set to a JDK installation.)
@@ -40,7 +40,8 @@
 define extract
     $(eval TMP := $(shell mktemp -d $(1)_XXXXX))
     mkdir -p $(2);
-    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))));
+    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))));
     rm -r $(TMP);
     cp $(1) $(2);
 endef
--- a/mx/mx_graal_makefile.py	Tue Jun 09 22:44:34 2015 +0200
+++ b/mx/mx_graal_makefile.py	Tue Jun 09 23:00:38 2015 +0200
@@ -183,9 +183,9 @@
 HS_COMMON_SRC=.
 
 # Directories, where the generated property-files reside within the JAR files
-PROVIDERS_INF=/META-INF/providers/
-SERVICES_INF=/META-INF/services/
-OPTIONS_INF=/META-INF/options/
+PROVIDERS_INF=/META-INF/providers
+SERVICES_INF=/META-INF/services
+OPTIONS_INF=/META-INF/options
 
 ifeq ($(ABS_BOOTDIR),)
     $(error Variable ABS_BOOTDIR must be set to a JDK installation.)
@@ -211,7 +211,7 @@
 define extract
     $(eval TMP := $(shell mktemp -d $(1)_XXXXX))
     mkdir -p $(2);
-    cd $(TMP) && $(JAR) xf $(abspath $(1)) && \
+    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))));
     rm -r $(TMP);
     cp $(1) $(2);