Add rust project with tests working properly.

Author: viferga

source/loaders/rs_loader/CMakeLists.txt

@@ -4,7 +4,7 @@ if(NOT OPTION_BUILD_LOADERS OR NOT OPTION_BUILD_LOADERS_RS)
 endif()
 
 #
-# Plugin name and options
+# External dependencies
 #
 
 find_package(Rust)
@@ -14,44 +14,202 @@ if(NOT RUST_FOUND)
 	return()
 endif()
 
+add_subdirectory(rust)
+
+#
+# Plugin name and options
+#
+
 # Target name
 set(target rs_loader)
 
 # Exit here if required dependencies are not met
 message(STATUS "Plugin ${target}")
 
-set(TARGET_BUILD_NAME "${CMAKE_SHARED_LIBRARY_PREFIX}rs_loader${CMAKE_SHARED_LIBRARY_SUFFIX}")
+# Set API export file and macro
+string(TOUPPER ${target} target_upper)
+set(feature_file "include/${target}/${target}_features.h")
+set(export_file  "include/${target}/${target}_api.h")
+set(export_macro "${target_upper}_API")
 
-if(CMAKE_BUILD_TYPE STREQUAL "Release")
-	set(TARGET_BUILD_TYPE "--release")
-	set(TARGET_BUILD_PATH "${CMAKE_CURRENT_SOURCE_DIR}/target/release/${TARGET_BUILD_NAME}")
-	set(TARGET_OUTPUT_NAME "${CMAKE_SHARED_LIBRARY_PREFIX}rs_loader${CMAKE_SHARED_LIBRARY_SUFFIX}")
-else()
-	set(TARGET_BUILD_TYPE)
-	set(TARGET_BUILD_PATH "${CMAKE_CURRENT_SOURCE_DIR}/target/debug/${TARGET_BUILD_NAME}")
-	set(TARGET_OUTPUT_NAME "${CMAKE_SHARED_LIBRARY_PREFIX}rs_loaderd${CMAKE_SHARED_LIBRARY_SUFFIX}")
-endif()
+#
+# Compiler warnings
+#
+
+include(Warnings)
+
+#
+# Compiler security
+#
+
+include(SecurityFlags)
+
+#
+# Sources
+#
+
+set(include_path "${CMAKE_CURRENT_SOURCE_DIR}/include/${target}")
+set(source_path  "${CMAKE_CURRENT_SOURCE_DIR}/source")
 
-if(MSVC)
-	set(TARGET_OUTPUT_PATH "${PROJECT_BINARY_DIR}/${CMAKE_BUILD_TYPE}")
+set(headers
+	${include_path}/rs_loader.h
+	${include_path}/rs_loader_impl.h
+)
+
+set(sources
+	${source_path}/rs_loader.c
+)
+
+# Group source files
+set(header_group "Header Files (API)")
+set(source_group "Source Files")
+source_group_by_path(${include_path} "\\\\.h$|\\\\.hpp$"
+	${header_group} ${headers})
+source_group_by_path(${source_path}  "\\\\.cpp$|\\\\.c$|\\\\.h$|\\\\.hpp$"
+	${source_group} ${sources})
+
+#
+# Create library
+#
+
+# Build library
+add_library(${target}
+	${sources}
+	${headers}
+)
+
+add_dependencies(${target} rs_loader_impl)
+
+# Create namespaced alias
+add_library(${META_PROJECT_NAME}::${target} ALIAS ${target})
+
+# Export library for downstream projects
+export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/cmake/${target}/${target}-export.cmake)
+
+# Create feature detection header
+# Compilers: https://cmake.org/cmake/help/v3.1/variable/CMAKE_LANG_COMPILER_ID.html#variable:CMAKE_%3CLANG%3E_COMPILER_ID
+# Feature: https://cmake.org/cmake/help/v3.1/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.html
+
+# Check for availability of module; use pre-generated version if not found
+if (WriterCompilerDetectionHeaderFound)
+	write_compiler_detection_header(
+		FILE ${feature_file}
+		PREFIX ${target_upper}
+		COMPILERS AppleClang Clang GNU MSVC
+		FEATURES cxx_alignas cxx_alignof cxx_constexpr cxx_final cxx_noexcept cxx_nullptr cxx_sizeof_member cxx_thread_local
+		VERSION 3.2
+	)
 else()
-	set(TARGET_OUTPUT_PATH "${PROJECT_BINARY_DIR}")
+	file(
+		COPY ${PROJECT_SOURCE_DIR}/codegeneration/${target}_features.h
+		DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/include/${target}
+		USE_SOURCE_PERMISSIONS
+	)
 endif()
 
-# Build without internet access
-add_custom_target(${target}
-	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-	COMMAND ${CARGO_EXECUTABLE} build ${TARGET_BUILD_TYPE}
-	COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_BUILD_PATH} ${TARGET_OUTPUT_PATH}/${TARGET_OUTPUT_NAME}
+# Create API export header
+generate_export_header(${target}
+	EXPORT_FILE_NAME  ${export_file}
+	EXPORT_MACRO_NAME ${export_macro}
+)
+
+#
+# Project options
+#
+
+set_target_properties(${target}
+	PROPERTIES
+	${DEFAULT_PROJECT_OPTIONS}
+	FOLDER "${IDE_FOLDER}"
+	BUNDLE $<$<BOOL:${APPLE}>:$<$<VERSION_GREATER:${PROJECT_OS_VERSION},8>>>
+)
+
+#
+# Include directories
+#
+
+target_include_directories(${target}
+	PRIVATE
+	${PROJECT_BINARY_DIR}/source/include
+	${CMAKE_CURRENT_SOURCE_DIR}/include
+	${CMAKE_CURRENT_BINARY_DIR}/include
+
+	$<TARGET_PROPERTY:${META_PROJECT_NAME}::metacall,INCLUDE_DIRECTORIES> # MetaCall includes
+
+	PUBLIC
+	${DEFAULT_INCLUDE_DIRECTORIES}
+
+	INTERFACE
+	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+	$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
+	$<INSTALL_INTERFACE:include>
+)
+
+#
+# Libraries
+#
+
+get_target_property(RS_LOADER_IMPL rs_loader_impl OUTPUT_NAME)
+
+target_link_libraries(${target}
+	PRIVATE
+	${META_PROJECT_NAME}::metacall # MetaCall library
+	${RS_LOADER_IMPL} # Rust implementation library
+
+	PUBLIC
+	${DEFAULT_LIBRARIES}
+
+	INTERFACE
+)
+
+#
+# Compile definitions
+#
+
+target_compile_definitions(${target}
+	PRIVATE
+
+	PUBLIC
+	$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:${target_upper}_STATIC_DEFINE>
+	${DEFAULT_COMPILE_DEFINITIONS}
+
+	INTERFACE
+)
+
+#
+# Compile options
+#
+
+target_compile_options(${target}
+	PRIVATE
+
+	PUBLIC
+	${DEFAULT_COMPILE_OPTIONS}
+
+	INTERFACE
+)
+
+#
+# Linker options
+#
+
+target_link_libraries(${target}
+	PRIVATE
+
+	PUBLIC
+	${DEFAULT_LINKER_OPTIONS}
+
+	INTERFACE
 )
 
 #
 # Deployment
 #
 
-# Files
-install(FILES
-	${TARGET_OUTPUT_PATH}/${TARGET_OUTPUT_NAME}
-	DESTINATION ${INSTALL_LIB}
-	COMPONENT runtime
+# Library
+install(TARGETS ${target}
+	EXPORT  "${target}-export"				COMPONENT dev
+	RUNTIME DESTINATION ${INSTALL_BIN}		COMPONENT runtime
+	LIBRARY DESTINATION ${INSTALL_SHARED}	COMPONENT runtime
+	ARCHIVE DESTINATION ${INSTALL_LIB}		COMPONENT dev
 )

source/loaders/rs_loader/Cargo.lock

@@ -0,0 +1,46 @@
+/*
+ *	Loader Library by Parra Studios
+ *	A plugin for loading rust code at run-time into a process.
+ *
+ *	Copyright (C) 2016 - 2021 Vicente Eduardo Ferrer Garcia <[email protected]>
+ *
+ *	Licensed under the Apache License, Version 2.0 (the "License");
+ *	you may not use this file except in compliance with the License.
+ *	You may obtain a copy of the License at
+ *
+ *		http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *	Unless required by applicable law or agreed to in writing, software
+ *	distributed under the License is distributed on an "AS IS" BASIS,
+ *	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *	See the License for the specific language governing permissions and
+ *	limitations under the License.
+ *
+ */
+
+#ifndef RS_LOADER_H
+#define RS_LOADER_H 1
+
+#include <rs_loader/rs_loader_api.h>
+
+#include <loader/loader_impl_interface.h>
+
+#include <dynlink/dynlink.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+RS_LOADER_API loader_impl_interface rs_loader_impl_interface_singleton(void);
+
+DYNLINK_SYMBOL_EXPORT(rs_loader_impl_interface_singleton);
+
+RS_LOADER_API const char *rs_loader_print_info(void);
+
+DYNLINK_SYMBOL_EXPORT(rs_loader_print_info);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* RS_LOADER_H */

source/loaders/rs_loader/include/rs_loader/rs_loader.h

@@ -0,0 +1,54 @@
+/*
+ *	Loader Library by Parra Studios
+ *	A plugin for loading rust code at run-time into a process.
+ *
+ *	Copyright (C) 2016 - 2021 Vicente Eduardo Ferrer Garcia <[email protected]>
+ *
+ *	Licensed under the Apache License, Version 2.0 (the "License");
+ *	you may not use this file except in compliance with the License.
+ *	You may obtain a copy of the License at
+ *
+ *		http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *	Unless required by applicable law or agreed to in writing, software
+ *	distributed under the License is distributed on an "AS IS" BASIS,
+ *	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *	See the License for the specific language governing permissions and
+ *	limitations under the License.
+ *
+ */
+
+#ifndef RS_LOADER_IMPL_H
+#define RS_LOADER_IMPL_H 1
+
+#include <rs_loader/rs_loader_api.h>
+
+#include <loader/loader_impl_interface.h>
+
+#include <configuration/configuration.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+RS_LOADER_API loader_impl_data rs_loader_impl_initialize(loader_impl impl, configuration config);
+
+RS_LOADER_API int rs_loader_impl_execution_path(loader_impl impl, const loader_naming_path path);
+
+RS_LOADER_API loader_handle rs_loader_impl_load_from_file(loader_impl impl, const loader_naming_path paths[], size_t size);
+
+RS_LOADER_API loader_handle rs_loader_impl_load_from_memory(loader_impl impl, const loader_naming_name name, const char *buffer, size_t size);
+
+RS_LOADER_API loader_handle rs_loader_impl_load_from_package(loader_impl impl, const loader_naming_path path);
+
+RS_LOADER_API int rs_loader_impl_clear(loader_impl impl, loader_handle handle);
+
+RS_LOADER_API int rs_loader_impl_discover(loader_impl impl, loader_handle handle, context ctx);
+
+RS_LOADER_API int rs_loader_impl_destroy(loader_impl impl);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* RS_LOADER_IMPL_H */