Merge pull request #80 from ESTOS/feature/BUILDSYS-416

Fix copying of files while filtering
ESTOS · Sep 16, 2024 · 91beac1 · 91beac1
2 parents 11622a5 + 80e317b
commit 91beac1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/c-lib/CMakeLists.txt b/c-lib/CMakeLists.txt
@@ -19,9 +19,9 @@ if(C_LIBRARY_OUTPUT_PATH)
 	set(OUTPUT_PATH ${C_LIBRARY_OUTPUT_PATH})
 else()
 	if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-		set(OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/libx64)
+		set(OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/libx64/)
 	else()
-		set(OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib)
+		set(OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/)
 	endif()
 endif()
 set_target_properties(c-lib PROPERTIES ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${OUTPUT_PATH})

diff --git a/compiler/CMakeLists.txt b/compiler/CMakeLists.txt
@@ -43,7 +43,7 @@ file(GLOB header_files *.h core/*.h back-ends/*.h back-ends/**/*.h)
 if(COMPILER_OUTPUT_PATH)
 	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${COMPILER_OUTPUT_PATH})
 else()
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/output/bin)
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/output/bin/)
 endif()
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})

diff --git a/compiler/core/snacc.c b/compiler/core/snacc.c
@@ -2116,15 +2116,16 @@ int copy_file(const char* source, const char* destination)
 {
 	// Open the source file in binary read mode
 	FILE* src = 0;
-	if (!fopen_s(&src, source, "rb") || !src)
+	if (fopen_s(&src, source, "rb") != 0 || !src)
 	{
 		perror("Error opening source file");
+		perror(source);
 		return 1;
 	}
 
 	// Open the destination file in binary write mode
 	FILE* dest = 0;
-	if (!fopen_s(&dest, destination, "rb") || !dest)
+	if (fopen_s(&dest, destination, "wb") != 0 || !dest)
 	{
 		perror("Error opening destination file");
 		fclose(src);

diff --git a/cpp-lib/CMakeLists.txt b/cpp-lib/CMakeLists.txt
@@ -23,14 +23,13 @@ if(CPP_LIBRARY_OUTPUT_PATH)
 	set(OUTPUT_PATH ${CPP_LIBRARY_OUTPUT_PATH})
 else()
 	if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-		set(OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/libx64)
+		set(OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/libx64/)
 	else()
-		set(OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib)
+		set(OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/)
 	endif()
 endif()
 set_target_properties(cpp-lib PROPERTIES ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${OUTPUT_PATH})
 set_target_properties(cpp-lib PROPERTIES ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${OUTPUT_PATH})
-set_target_properties(cpp-lib PROPERTIES ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${OUTPUT_PATH})
 
 # configure compiler specific options
 # - warning levels

diff --git a/version.h b/version.h
@@ -1,8 +1,8 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define VERSION "6.0.15"
-#define VERSION_RC 6, 0, 15
-#define RELDATE "14.09.2024"
+#define VERSION "6.0.16"
+#define VERSION_RC 6, 0, 16
+#define RELDATE "16.09.2024"
 
 #endif // VERSION_H