Merge pull request #517 from jepler/test-515

Allow userspace components to include files relative to the location of the .comp file

Author: jepler

src/hal/utils/halcompile.g

@@ -795,7 +795,9 @@ def build_usr(tempdir, filename, mode, origfilename):
     makefile = os.path.join(tempdir, "Makefile")
     f = open(makefile, "w")
     print("%s: %s" % (binname, filename), file=f)
-    print("\t$(CC) -I$(EMC2_HOME)/include -I/usr/include/linuxcnc -URTAPI -U__MODULE__ -DULAPI -Os %s -o $@ $< -Wl,-rpath,$(LIBDIR) -L$(LIBDIR) -llinuxcnchal %s" % (
+    print("\t$(CC) -I%s -I$(EMC2_HOME)/include -I/usr/include/linuxcnc -URTAPI -U__MODULE__ -DULAPI -Os %s -o $@ $< -Wl,-rpath,$(LIBDIR) -L$(LIBDIR) -llinuxcnchal %s" % (
+
+        os.path.abspath(os.path.dirname(origfilename)),
         options.get("extra_compile_args", ""),
         options.get("extra_link_args", "")), file=f)
     print("include %s" % find_modinc(), file=f)

tests/halcompile/relative-header-user/checkresult

@@ -0,0 +1,2 @@
+#!/bin/sh
+[ -e "`dirname "$1"`/relative_header" ]

tests/halcompile/relative-header-user/local.h

@@ -0,0 +1 @@
+#define X 1

tests/halcompile/relative-header-user/relative_header.comp

@@ -0,0 +1,10 @@
+component relative_header;
+pin out bit out;
+include "local.h";
+license "GPL";
+option userspace yes;
+;;
+void user_mainloop(void) {
+    FOR_ALL_INSTS() { out = ! out; }
+    rtapi_delay(100 * 1000 * 1000);
+}

tests/halcompile/relative-header-user/test.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+rm -f relative_header
+halcompile --compile relative_header.comp