From 1abc669a810615e27c1ee1482a2e3f4f1274c736 Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Sat, 15 Oct 2022 16:22:56 +0200
Subject: [PATCH] RUST: Fix liblektor-rs build.rs file + move include files in
 the top level inc folder

---
 CMakeLists.txt                                            | 7 +------
 .../rust/liblektor-rs/inc => inc}/liblektor-rs/database.h | 0
 src/rust/liblektor-rs/build.rs                            | 8 ++++----
 3 files changed, 5 insertions(+), 10 deletions(-)
 rename {src/rust/liblektor-rs/inc => inc}/liblektor-rs/database.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42ff35c6..6bd5a38d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -303,11 +303,7 @@ if(GENERATE_MANPAGES)
 endif()
 
 target_include_directories(lkt     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/inc)
-target_include_directories(lektord PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/inc
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/rust/liblektor-rs/inc
-    ${CURL_INCLUDE_DIRS}
-)
+target_include_directories(lektord PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/inc ${CURL_INCLUDE_DIRS})
 
 target_compile_definitions(lkt     PRIVATE ${common_DEFINITIONS})
 target_compile_definitions(lektord PRIVATE ${common_DEFINITIONS}
@@ -400,4 +396,3 @@ foreach(CMD IN LISTS MANPAGE_COMMANDS)
 endforeach()
 
 qt_finalize_executable(lektord)
-
diff --git a/src/rust/liblektor-rs/inc/liblektor-rs/database.h b/inc/liblektor-rs/database.h
similarity index 100%
rename from src/rust/liblektor-rs/inc/liblektor-rs/database.h
rename to inc/liblektor-rs/database.h
diff --git a/src/rust/liblektor-rs/build.rs b/src/rust/liblektor-rs/build.rs
index 91f293db..e259c52b 100644
--- a/src/rust/liblektor-rs/build.rs
+++ b/src/rust/liblektor-rs/build.rs
@@ -30,11 +30,9 @@ fn rerun_directory<T: AsRef<Path> + ?Sized>(dir: &T) {
 fn main() {
     // Because the target folder was fixed, we know where the source folder is!
     let out_dir = env::var_os("OUT_DIR").unwrap();
-    let out_dir = Path::new(&out_dir);
-    let db_path = out_dir
-        .join("kara.db")
+    let out_dir = Path::new(&out_dir)
         .canonicalize()
-        .expect("failed to canonicalize the sample kara database path");
+        .expect("failed to canonicalize OUT_DIR");
     let source_dir = out_dir
         .join("../../../../../liblektor-rs")
         .canonicalize()
@@ -44,7 +42,9 @@ fn main() {
         .canonicalize()
         .expect("failed to canonicalize the migration dir");
 
+    let db_path = out_dir.join("kara.db");
     let _ = std::fs::remove_file(&db_path);
+
     env::set_var("DATABASE_URL", db_path);
     env::set_current_dir(source_dir).expect("failed to cwd to source folder!");
     cmd!( "diesel" => [ "migration", "run" ] );
-- 
GitLab