Build YARP using configure and its Makefile

Author: eregon

mx.truffleruby/mx_truffleruby.py

@@ -121,6 +121,24 @@ def contents(self, result):
         command = [jdk.java] + jvm_args + [main_class] + ruby_options + ['"$@"']
         return "#!/usr/bin/env bash\n" + "exec " + " ".join(command) + "\n"
 
+
+class YARPNativeProject(mx.NativeProject):
+    def __init__(self, suite, name, deps, workingSets, output=None, **kwArgs):
+        path = join(root, kwArgs.pop('dir'))
+        super(YARPNativeProject, self).__init__(
+            suite, name, subDir=None, srcDirs=[path], deps=deps, workingSets=workingSets,
+            results=kwArgs.pop('results'),
+            output=path, d=path, vpath=False, **kwArgs)
+
+    def getBuildTask(self, args):
+        return YARPNativeBuildTask(args, self)
+
+class YARPNativeBuildTask(mx.NativeBuildTask):
+    def build(self):
+        mx.run(['autoreconf'], cwd=self.subject.dir)
+        mx.run(['./configure'], cwd=self.subject.dir)
+        super(YARPNativeBuildTask, self).build() # make
+
 # Commands
 
 def jt(*args):

mx.truffleruby/suite.py

@@ -204,16 +204,26 @@
         },
 
         "org.yarp.libyarp": {
+            "class": "YARPNativeProject",
             "dir": "src/main/c/yarp",
+            "makeTarget": "all-no-debug", # Comment this out to build with asserts and no optimizations
+            "results": ["build/librubyparser.a"],
+            "description": "YARP used as a static library"
+        },
+
+        "org.truffleruby.yarp.bindings": {
+            "dir": "src/main/c/yarp_bindings",
             "native": "shared_lib",
             "deliverable": "yarp",
             "buildDependencies": [
+                "org.yarp.libyarp", # librubyparser.a
                 "org.yarp", # for the generated JNI header file
             ],
             "use_jdk_headers": True, # the generated JNI header includes jni.h
-            "cflags": ["-g", "-Wall", "-Werror", "-pthread"],
+            "cflags": ["-g", "-Wall", "-Werror", "-pthread", "-I<path:org.yarp.libyarp>/include"],
             "ldflags": ["-pthread"],
-            "description": "YARP + JNI bindings as a single lib"
+            "ldlibs": ["<path:org.yarp.libyarp>/build/librubyparser.a"],
+            "description": "JNI bindings for YARP"
         },
 
         "org.truffleruby": {
@@ -485,7 +495,7 @@
                     "file:lib/mri",
                     "file:lib/patches",
                     "file:lib/truffle",
-                    "dependency:org.yarp.libyarp",
+                    "dependency:org.truffleruby.yarp.bindings",
                 ],
                 "lib/cext/": [
                     "file:lib/cext/*.rb",

src/main/c/yarp/LICENSE.md

@@ -0,0 +1,7 @@
+Copyright 2022-present, Shopify Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

src/main/c/yarp/src/yarp_bindings.c renamed to src/main/c/yarp_bindings/src/yarp_bindings.c

@@ -3,16 +3,19 @@
 set -x
 set -e
 
+YARP=../../yarp
+
 # Create generated files
-pushd ../../yarp
+pushd $YARP
+bundle
+bundle exec rake clobber
 bundle exec rake templates
 popd
 
-rm -rf src/main/c/yarp/src/yarp
-# Copy under src/yarp and not just src/ because we also have yarp_bindings.c
-mkdir src/main/c/yarp/src/yarp
-cp -R ../../yarp/include src/main/c/yarp/src/yarp
-cp -R ../../yarp/src src/main/c/yarp/src/yarp
+rm -rf src/main/c/yarp
+mkdir src/main/c/yarp
+cp -R $YARP/{include,src} src/main/c/yarp
+cp $YARP/{configure.ac,LICENSE.md,Makefile.in} src/main/c/yarp
 
 rm -rf src/yarp/java
-cp -R ../../yarp/java src/yarp/java
+cp -R $YARP/java src/yarp/java