Fix build

itsallcode · Sep 21, 2024 · 03e8c01 · 03e8c01
1 parent 68809c1
commit 03e8c01
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 29 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -17,8 +17,8 @@
             "--enable-native-access=ALL-UNNAMED"
         ],
         "env": {
-            "LD_LIBRARY_PATH": "${workspaceFolder}/build/lua-install/lib/",
-            "DYLD_LIBRARY_PATH": "${workspaceFolder}/build/lua-install/lib/"
+            "LD_LIBRARY_PATH": "${workspaceFolder}/build/lua-libs/",
+            "DYLD_LIBRARY_PATH": "${workspaceFolder}/build/lua-libs/"
         }
     },
     "files.exclude": {

diff --git a/build.gradle b/build.gradle
@@ -27,8 +27,8 @@ testing {
                     testTask.configure {
                         systemProperty 'java.util.logging.config.file', 'src/test/resources/logging.properties'
                         systemProperty 'jextract.trace.downcalls', 'true'
-                        environment "LD_LIBRARY_PATH", "${project.buildDir}/lua-install/lib/"
-                        environment "DYLD_LIBRARY_PATH", "${project.buildDir}/lua-install/lib/"
+                        environment "LD_LIBRARY_PATH", "${project.buildDir}/lua-libs/"
+                        environment "DYLD_LIBRARY_PATH", "${project.buildDir}/lua-libs/"
                         jvmArgs '--enable-native-access=ALL-UNNAMED'
                     }
                 }
@@ -91,6 +91,9 @@ task buildLua(type: Exec) {
     }
 }
 
+tasks.test.dependsOn(tasks.buildLua)
+tasks.build.dependsOn(tasks.buildLua)
+
 task cleanLua(type: Exec) {
     workingDir "${projectDir}/lua/src"
     commandLine 'make', 'clean'

diff --git a/src/main/java/org/itsallcode/jlua/Test.java b/src/main/java/org/itsallcode/jlua/Test.java