build: rename `klotski` to `klotski_core`

.gitignore

@@ -5,4 +5,4 @@
 
 /src/cli/target/
 /src/rust_ffi/target/
-/src/klotski/utils/version.h
+/src/klotski_core/utils/version.h

CMakeLists.txt

@@ -9,6 +9,9 @@ endif()
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
 
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin)
+
 # TODO: only in libklotski.so
 add_compile_options(-fPIC)
 

src/CMakeLists.txt

@@ -2,9 +2,8 @@ cmake_minimum_required(VERSION 3.0)
 
 project(klotski-cli LANGUAGES C)
 
-include_directories(klotski/ffi)
+add_subdirectory(klotski_core)
-
+include_directories(klotski_core)
-add_subdirectory(klotski)
 
 add_executable(cli main.c)
 target_link_libraries(cli PRIVATE klotski)

src/demo.py

@@ -2,6 +2,6 @@
 
 import ctypes
 
-lib = ctypes.CDLL('../cmake-build-release/src/klotski/libklotski.so')
+lib = ctypes.CDLL('../cmake-build-release/src/klotski_core/libklotski.so')
 
 lib.tmain()

src/klotski/CMakeLists.txt → src/klotski_core/CMakeLists.txt

@@ -23,6 +23,10 @@ git_commit_id(GIT_COMMIT_ID)
 
 string(TIMESTAMP BUILD_TIME "%Y-%m-%d %H:%M:%S")
 
+set(VERSION_MAJOR ${klotski-core_VERSION_MAJOR})
+set(VERSION_MINOR ${klotski-core_VERSION_MINOR})
+set(VERSION_PATCH ${klotski-core_VERSION_PATCH})
+
 set(SYSTEM_INFO "${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_PROCESSOR}")
 
 set(COMPILER_INFO "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
@@ -63,6 +67,7 @@ add_subdirectory(benchmark)
 
 ################################################################################
 
+include_directories(.)
 set(FFI_SRC codec.cc all_cases.cc tmain.cc metadata.cc)
 list(TRANSFORM FFI_SRC PREPEND "ffi/")
 add_library(klotski-ffi OBJECT ${FFI_SRC})
@@ -84,11 +89,11 @@ list(APPEND OBJS $<TARGET_OBJECTS:benchmark>)
 
 ################################################################################
 
-option(STATIC_LIB "build static library" ON)
+option(BUILD_DYN "build shared klotski core library" OFF)
-if (STATIC_LIB)
+if (BUILD_DYN)
-    add_library(klotski STATIC ${OBJS})
-else()
     add_library(klotski SHARED ${OBJS})
+else()
+    add_library(klotski STATIC ${OBJS})
 endif()
 
 ################################################################################

src/klotski/all_cases/CMakeLists.txt → src/klotski_core/all_cases/CMakeLists.txt

@@ -1,4 +1,3 @@
 cmake_minimum_required(VERSION 3.0)
 
 add_library(all_cases OBJECT all_cases.cc basic_ranges.cc)
-#target_link_libraries(all_cases PUBLIC utils)

src/klotski/analyse/CMakeLists.txt → src/klotski_core/analyse/CMakeLists.txt

@@ -1,4 +1,3 @@
 cmake_minimum_required(VERSION 3.0)
 
 add_library(analyse OBJECT analyse.cc backtrack.cc)
-#target_link_libraries(analyse PUBLIC core)

src/klotski/benchmark/CMakeLists.txt → src/klotski_core/benchmark/CMakeLists.txt

@@ -1,4 +1,3 @@
 cmake_minimum_required(VERSION 3.0)
 
 add_library(benchmark OBJECT chore.cc benchmark.cc)
-#target_link_libraries(benchmark PUBLIC all_cases)

src/klotski/common_code/CMakeLists.txt → src/klotski_core/common_code/CMakeLists.txt

@@ -1,4 +1,3 @@
 cmake_minimum_required(VERSION 3.0)
 
 add_library(common_code OBJECT convert.cc serialize.cc common_code.cc)
-#target_link_libraries(common_code PUBLIC utils)

src/klotski/fast_cal/CMakeLists.txt → src/klotski_core/fast_cal/CMakeLists.txt

@@ -1,4 +1,3 @@
 cmake_minimum_required(VERSION 3.0)
 
 add_library(fast_cal OBJECT cal_core.cc fast_cal.cc)
-#target_link_libraries(fast_cal PUBLIC core)

src/klotski/graph/CMakeLists.txt → src/klotski_core/graph/CMakeLists.txt

@@ -8,3 +8,6 @@ add_subdirectory(svg)
 # TODO: STATIC flag
 add_library(graph case.cc graph.cc)
 target_link_libraries(graph PUBLIC analyse svg)
+
+# TODO: using OBJECT instead of STATIC
+# TODO: remove `target_link_libraries`

src/klotski/raw_code/CMakeLists.txt → src/klotski_core/raw_code/CMakeLists.txt

@@ -1,4 +1,3 @@
 cmake_minimum_required(VERSION 3.0)
 
 add_library(raw_code OBJECT convert.cc raw_code.cc)
-#target_link_libraries(raw_code PUBLIC utils)

src/klotski/short_code/CMakeLists.txt → src/klotski_core/short_code/CMakeLists.txt

@@ -3,4 +3,3 @@ cmake_minimum_required(VERSION 3.0)
 include_directories(offset)
 
 add_library(short_code OBJECT convert.cc serialize.cc short_code.cc)
-#target_link_libraries(short_code PUBLIC utils all_cases)

src/klotski/utils/version.h.in → src/klotski_core/utils/version.h.in

@@ -1,9 +1,9 @@
 #pragma once
 
-#define VERSION_MAJOR (@klotski-core_VERSION_MAJOR@)
+#define VERSION_MAJOR (@VERSION_MAJOR@)
-#define VERSION_MINOR (@klotski-core_VERSION_MINOR@)
+#define VERSION_MINOR (@VERSION_MINOR@)
-#define VERSION_PATCH (@klotski-core_VERSION_PATCH@)
+#define VERSION_PATCH (@VERSION_PATCH@)
-#define VERSION_STR   "v@klotski-core_VERSION_MAJOR@.@klotski-core_VERSION_MINOR@.@klotski-core_VERSION_PATCH@"
+#define VERSION_STR   "v@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@"
 
 #define AUTHOR          "dnomd343"
 #define SYSTEM          "@SYSTEM_INFO@"

src/rust_ffi/build.rs

@@ -3,11 +3,11 @@ extern crate bindgen;
 use std::env;
 use std::path::PathBuf;
 
-const RELEASE_DIR: &str = "../../cmake-build-release/src/klotski";
+const LIB_CORE_DIR: &str = "../../bin";
 
 fn main() {
     // basic compile options
-    println!("cargo:rustc-link-search={}", RELEASE_DIR);
+    println!("cargo:rustc-link-search={}", LIB_CORE_DIR);
     println!("cargo:rustc-link-lib=static=klotski");
     println!("cargo:rerun-if-changed=wrapper.h");
     println!("cargo:rustc-link-lib=stdc++");

src/rust_ffi/wrapper.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#include "../klotski/ffi/klotski.h"
+#include "../klotski_core/klotski.h"

test/CMakeLists.txt

@@ -6,12 +6,13 @@ enable_testing()
 
 ################################################################
 
+unset(CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
 include_directories(../third_party/md5)
 add_library(md5 STATIC ../third_party/md5/md5.cpp)
 
 ################################################################
 
-include_directories(../src/klotski/utils)
+include_directories(../src/klotski_core/utils)
 add_executable(test_utils utils.cc)
 target_link_libraries(test_utils PUBLIC gtest gtest_main)
 target_link_libraries(test_utils PUBLIC klotski)
@@ -19,7 +20,7 @@ add_test(NAME utils COMMAND test_utils)
 
 ################################################################
 
-include_directories(../src/klotski/all_cases)
+include_directories(../src/klotski_core/all_cases)
 add_executable(test_all_cases all_cases.cc)
 target_link_libraries(test_all_cases PUBLIC gtest gtest_main)
 target_link_libraries(test_all_cases PUBLIC klotski md5)