[GR-15355] [GR-15352] Use new sulong home layout.

PullRequest: truffleruby/814

Author: zapster

lib/cext/include/sulong/truffle.h

@@ -20,7 +20,11 @@ extern "C" {
 
 #define TRUFFLERUBY
 
+#ifdef SULONG_TRUFFLE_H
+#include SULONG_TRUFFLE_H
+#else
 #include <sulong/truffle.h>
+#endif
 
 #ifdef SULONG_POLYGLOT_H
 #include SULONG_POLYGLOT_H

lib/cext/include/truffleruby/truffleruby-pre.h

@@ -96,7 +96,8 @@
 
   relative_debug_paths = "-fdebug-prefix-map=#{ruby_home}=."
   polyglot_h = "-DSULONG_POLYGLOT_H='\"#{ENV.fetch('SULONG_POLYGLOT_H')}\"'"
-  mkconfig['CPPFLAGS'] = "#{relative_debug_paths} #{polyglot_h}"
+  truffle_h = "-DSULONG_TRUFFLE_H='\"#{ENV.fetch('SULONG_TRUFFLE_H')}\"'"
+  mkconfig['CPPFLAGS'] = "#{relative_debug_paths} #{polyglot_h} #{truffle_h}"
   expanded['CPPFLAGS'] = mkconfig['CPPFLAGS']
 
   # Default to the ruby in $PATH to build core C extensions faster

lib/truffle/rbconfig-for-mkmf.rb

@@ -9,7 +9,7 @@
                 "name": "tools",
                 "subdir": True,
                 # version must always be equal to the version of the "sulong" import below
-                "version": "32df1a7718df4b2f76c8cbfed505177f46165f4e",
+                "version": "636e1ca4fa50df0b7741aa1e1e12f474bee3dd5a",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -19,7 +19,7 @@
                 "name": "sulong",
                 "subdir": True,
                 # version must always be equal to the version of the "tools" import above
-                "version": "32df1a7718df4b2f76c8cbfed505177f46165f4e",
+                "version": "636e1ca4fa50df0b7741aa1e1e12f474bee3dd5a",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -256,13 +256,16 @@
                 "TRUFFLERUBY", # We need this jar to run extconf.rb
                 "TRUFFLERUBY-LAUNCHER", # We need this jar to run extconf.rb
                 "truffle:TRUFFLE_NFI_NATIVE", # trufflenfi.h
-                "sulong:SULONG_LIBS", # polyglot.h
+                "sulong:SULONG_HOME", # polyglot.h
+                "sulong:SULONG_LEGACY", # truffle.h
             ],
             "buildEnv": {
               "TRUFFLERUBYOPT": "--building-core-cexts",
               "NFI_HEADERS_DIR": "<path:truffle:TRUFFLE_NFI_NATIVE>/include",
-              "SULONG_HEADERS_DIR": "<path:SULONG_LIBS>",
-              "SULONG_POLYGLOT_H": "<path:SULONG_LIBS>/polyglot.h",
+              "SULONG_HEADERS_DIR": "<path:SULONG_HOME>/include",
+              "SULONG_POLYGLOT_H": "<path:SULONG_HOME>/include/polyglot.h",
+              "SULONG_TRUFFLE_H": "<path:SULONG_LEGACY>/include/truffle.h",
+              "SULONG_TRUFFLE_DIR": "<path:SULONG_LEGACY>/include",
             },
             "output": ".",
             "results": [
@@ -415,11 +418,11 @@
                     "file:lib/cext/include/*.h",
                 ],
                 "lib/cext/include/sulong/": [
-                    "file:lib/cext/include/sulong/truffle.h",
-                    "extracted-dependency:sulong:SULONG_LIBS/*.h",
+                    "extracted-dependency:sulong:SULONG_LEGACY/include/truffle.h",
+                    "link:../../sulong-libs/include/polyglot.h",
                 ],
                 "lib/cext/sulong-libs/": [
-                    "extracted-dependency:sulong:SULONG_LIBS/*",
+                    "extracted-dependency:sulong:SULONG_HOME/*",
                 ],
                 "lib/mri/": [
                     "dependency:org.truffleruby.cext/src/main/c/etc/etc.su",

mx.truffleruby/suite.py

@@ -17,7 +17,7 @@ CFLAGS := -Wall -Werror -Wno-unused-function -fPIC -std=c99
 LDFLAGS := -m64
 
 TRUFFLE_POSIX := truffleposix/libtruffleposix.$(DLEXT)
-SULONG_HEADERS := $(ROOT)/lib/cext/include/sulong/truffle.h $(SULONG_POLYGLOT_H)
+SULONG_HEADERS := $(SULONG_TRUFFLE_H) $(SULONG_POLYGLOT_H)
 GENERATE_SULONG_MOCK := $(ROOT)/tool/generate-sulongmock.rb
 
 RUBY_HEADERS := $(wildcard $(ROOT)/lib/cext/include/*.h) $(wildcard $(ROOT)/lib/cext/include/*/*.h) $(wildcard $(ROOT)/lib/cext/include/*/*/*.h)
@@ -60,11 +60,11 @@ sulongmock/sulongmock.c: $(GENERATE_SULONG_MOCK) $(SULONG_HEADERS) $(TRUFFLE_POS
 	$(RUBY) $(GENERATE_SULONG_MOCK) $(SULONG_HEADERS)
 
 sulongmock/sulongmock.o: sulongmock/sulongmock.c
-	$(CC) -o $@ -c $(CFLAGS) $(LDFLAGS) -I$(ROOT)/lib/cext/include -I$(SULONG_HEADERS_DIR) $<
+	$(CC) -o $@ -c $(CFLAGS) $(LDFLAGS) -I$(ROOT)/lib/cext/include -I$(SULONG_TRUFFLE_DIR) -I$(SULONG_HEADERS_DIR) $<
 
 # ruby.o
 cext/ruby.o: cext/*.c $(RUBY_HEADERS)
-	$(CC) -o $@ -c $(CFLAGS) $(LDFLAGS) -DSULONG_POLYGLOT_H=\"$(SULONG_POLYGLOT_H)\" -I$(ROOT)/lib/cext/include cext/ruby.c
+	$(CC) -o $@ -c $(CFLAGS) $(LDFLAGS) -DSULONG_TRUFFLE_H=\"$(SULONG_TRUFFLE_H)\" -DSULONG_POLYGLOT_H=\"$(SULONG_POLYGLOT_H)\" -I$(ROOT)/lib/cext/include cext/ruby.c
 
 # ruby.su
 cext/Makefile: cext/extconf.rb $(BASIC_EXTCONF_DEPS)

src/main/c/Makefile

@@ -49,7 +49,7 @@
 
 #include <stdio.h>
 #include <stdint.h>
-#include <sulong/truffle.h>
+#include <truffle.h>
 #include <polyglot.h>
 
 void rb_tr_mock() {