Mercurial > hg > graal-compiler

changeset 21943:31be1c8f4905

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
switched to use of simple makefile assignment in jvmci.make and removed unnecessary semicolons
author Doug Simon <doug.simon@oracle.com>
date Fri, 12 Jun 2015 15:33:11 +0200
parents ebc99adcd766
children b121c00d3c4c
files make/jvmci.make mx/mx_graal_makefile.py
diffstat 2 files changed, 22 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/make/jvmci.make	Fri Jun 12 13:19:03 2015 +0200
+++ b/make/jvmci.make	Fri Jun 12 15:33:11 2015 +0200
@@ -30,15 +30,15 @@
 # Arguments:
 #  1: directory with contents of the JAR file
 define process_providers
-    $(eval providers=$(1)/$(PROVIDERS_INF))
-    $(eval services=$(1)/$(SERVICES_INF))
+    $(eval providers := $(1)/$(PROVIDERS_INF))
+    $(eval services := $(1)/$(SERVICES_INF))
     $(QUIETLY) test -d $(services) || mkdir -p $(services)
     $(QUIETLY) test ! -d $(providers) || (cd $(providers) && for i in $$(ls); do c=$$(cat $$i); echo $$i >> $(abspath $(services))/$$c; rm $$i; done)
 
     @# Since all projects are built together with one javac call we cannot determine
     @# which project contains HotSpotVMConfig.inline.hpp so we hardcode it.
-    $(eval vmconfig=$(1)/hotspot/HotSpotVMConfig.inline.hpp)
-    $(eval vmconfigDest=$(HS_COMMON_SRC)/../jvmci/com.oracle.jvmci.hotspot/src_gen/hotspot)
+    $(eval vmconfig := $(1)/hotspot/HotSpotVMConfig.inline.hpp)
+    $(eval vmconfigDest := $(HS_COMMON_SRC)/../jvmci/com.oracle.jvmci.hotspot/src_gen/hotspot)
     $(QUIETLY) test ! -f $(vmconfig) || (mkdir -p $(vmconfigDest) && cp $(vmconfig) $(vmconfigDest))
 endef
 
@@ -48,8 +48,8 @@
 # Arguments:
 #  1: directory with contents of the JAR file
 define process_options
-    $(eval options=$(1)/$(OPTIONS_INF))
-    $(eval services=$(1)/META-INF/services)
+    $(eval options := $(1)/$(OPTIONS_INF))
+    $(eval services := $(1)/META-INF/services)
     $(QUIETLY) test -d $(services) || mkdir -p $(services)
     $(QUIETLY) test ! -d $(options) || (cd $(options) && for i in $$(ls); do echo $${i}_Options >> $(abspath $(services))/com.oracle.jvmci.options.Options; done)
 endef
@@ -57,14 +57,13 @@
 # Extracts META-INF/jvmci.services and META-INF/jvmci.options of a JAR file into a given directory
 # Arguments:
 #  1: JAR file to extract
-#  2: target directory
+#  2: target directory (which already exists)
 define extract
     $(eval TMP := $(shell mktemp -d $(TARGET)/tmp_XXXXX))
-    $(QUIETLY) mkdir -p $(2)
     $(QUIETLY) 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))))
-    $(QUIETLY) rm -r $(TMP)
+         (test ! -d .$(OPTIONS_INF) || cp -r .$(OPTIONS_INF) $(abspath $(2))));
+    $(QUIETLY) rm -r $(TMP);
     $(QUIETLY) cp $(1) $(2)
 endef
 
@@ -92,8 +91,8 @@
 #  1: list of service or option files
 #  2: prefix to apply to each file to create match pattern
 define verify_defs_make
-    $(eval defs=make/defs.make)
-    $(eval exports=$(shell grep '$(2)' make/defs.make | sed 's:.*$(2)::g'))
+    $(eval defs := make/defs.make)
+    $(eval exports := $(shell grep '$(2)' make/defs.make | sed 's:.*$(2)::g'))
     $(foreach file,$(1),$(if $(findstring $(file),$(exports)), ,$(error "Pattern '$(2)$(file)' not found in $(defs)")))
     $(foreach export,$(exports),$(if $(findstring $(export),$(1)), ,$(error "The line '$(2)$(export)' should not be in $(defs)")))
 endef
--- a/mx/mx_graal_makefile.py	Fri Jun 12 13:19:03 2015 +0200
+++ b/mx/mx_graal_makefile.py	Fri Jun 12 15:33:11 2015 +0200
@@ -190,15 +190,15 @@
 # Arguments:
 #  1: directory with contents of the JAR file
 define process_providers
-    $(eval providers=$(1)/$(PROVIDERS_INF))
-    $(eval services=$(1)/$(SERVICES_INF))
+    $(eval providers := $(1)/$(PROVIDERS_INF))
+    $(eval services := $(1)/$(SERVICES_INF))
     $(QUIETLY) test -d $(services) || mkdir -p $(services)
     $(QUIETLY) test ! -d $(providers) || (cd $(providers) && for i in $$(ls); do c=$$(cat $$i); echo $$i >> $(abspath $(services))/$$c; rm $$i; done)
 
     @# Since all projects are built together with one javac call we cannot determine
     @# which project contains HotSpotVMConfig.inline.hpp so we hardcode it.
-    $(eval vmconfig=$(1)/hotspot/HotSpotVMConfig.inline.hpp)
-    $(eval vmconfigDest=$(HS_COMMON_SRC)/../jvmci/com.oracle.jvmci.hotspot/src_gen/hotspot)
+    $(eval vmconfig := $(1)/hotspot/HotSpotVMConfig.inline.hpp)
+    $(eval vmconfigDest := $(HS_COMMON_SRC)/../jvmci/com.oracle.jvmci.hotspot/src_gen/hotspot)
     $(QUIETLY) test ! -f $(vmconfig) || (mkdir -p $(vmconfigDest) && cp $(vmconfig) $(vmconfigDest))
 endef
 
@@ -208,8 +208,8 @@
 # Arguments:
 #  1: directory with contents of the JAR file
 define process_options
-    $(eval options=$(1)/$(OPTIONS_INF))
-    $(eval services=$(1)/META-INF/services)
+    $(eval options := $(1)/$(OPTIONS_INF))
+    $(eval services := $(1)/META-INF/services)
     $(QUIETLY) test -d $(services) || mkdir -p $(services)
     $(QUIETLY) test ! -d $(options) || (cd $(options) && for i in $$(ls); do echo $${i}_Options >> $(abspath $(services))/com.oracle.jvmci.options.Options; done)
 endef
@@ -217,14 +217,13 @@
 # Extracts META-INF/jvmci.services and META-INF/jvmci.options of a JAR file into a given directory
 # Arguments:
 #  1: JAR file to extract
-#  2: target directory
+#  2: target directory (which already exists)
 define extract
     $(eval TMP := $(shell mktemp -d $(TARGET)/tmp_XXXXX))
-    $(QUIETLY) mkdir -p $(2)
     $(QUIETLY) 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))))
-    $(QUIETLY) rm -r $(TMP)
+         (test ! -d .$(OPTIONS_INF) || cp -r .$(OPTIONS_INF) $(abspath $(2))));
+    $(QUIETLY) rm -r $(TMP);
     $(QUIETLY) cp $(1) $(2)
 endef
 
@@ -252,8 +251,8 @@
 #  1: list of service or option files
 #  2: prefix to apply to each file to create match pattern
 define verify_defs_make
-    $(eval defs=make/defs.make)
-    $(eval exports=$(shell grep '$(2)' make/defs.make | sed 's:.*$(2)::g'))
+    $(eval defs := make/defs.make)
+    $(eval exports := $(shell grep '$(2)' make/defs.make | sed 's:.*$(2)::g'))
     $(foreach file,$(1),$(if $(findstring $(file),$(exports)), ,$(error "Pattern '$(2)$(file)' not found in $(defs)")))
     $(foreach export,$(exports),$(if $(findstring $(export),$(1)), ,$(error "The line '$(2)$(export)' should not be in $(defs)")))
 endef