Merge pull request #423 from carstene1ns/bugfix/install-config

Fix installation of lcf/config.h

Author: carstene1ns

CMakeLists.txt

@@ -401,7 +401,7 @@ install(
 	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
-set(LCF_INSTALL_HEADERS ${LCF_HEADERS})
+set(LCF_INSTALL_HEADERS ${LCF_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/src/lcf/config.h)
 foreach(S ldb lmt lmu lsd rpg third_party)
 	set(SUBDIR_HEADERS ${LCF_INSTALL_HEADERS})
 	list(FILTER SUBDIR_HEADERS INCLUDE REGEX "/${S}/")

COPYING

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2020 liblcf authors
+Copyright (c) 2014-2021 liblcf authors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

builds/release-helper.sh

@@ -39,11 +39,15 @@ sed -i "1,1 s/2014-2[0-9][0-9][0-9]/2014-$year/" COPYING
 # update copyright years, but filter out external sources
 echo "Updating source files…"
 
-find src tests -maxdepth 1 -type f \
-    -a \( -name "*.h" -o -name "*.cpp" \) \
+find src tests -maxdepth 3 \
+  \( -path src/generated -o -path src/lcf/third_party \) -prune \
+  -o -type f -a \( -name "*.h" -o -name "*.cpp" \) \
     -a \! \( -name "ini*" -o -name "doctest*" \) \
   -exec sed -i "/liblcf\. Copyright/,1 s/2[0-9][0-9][0-9]/$year/" {} +
 
+find tools -maxdepth 1 -type f -a \( -name "*.h" -o -name "*.cpp" \) \
+  -exec sed -i "/Copyright/,1 s/2[0-9][0-9][0-9]/$year/" {} +
+
 # updating header for generated source files
 grep -q "liblcf\. Copyright.*$year" generator/templates/copyright.tmpl ||
   echo " -> You need to run the generator."

generator/generate.py

@@ -248,7 +248,7 @@ def process_file(filename, namedtup):
     # Mapping is: All elements of the line grouped by the first column
 
     path = os.path.join(csv_dir, filename)
-    df = pd.read_csv(path, comment='#', dtype=np.str)
+    df = pd.read_csv(path, comment='#', dtype=str)
     df = df.fillna("")
 
     lines = [ list(r) for _i, r in df.iterrows() ]

generator/templates/copyright.tmpl

@@ -1,7 +1,7 @@
 /* !!!! GENERATED FILE - DO NOT EDIT !!!!
  * --------------------------------------
  *
- * This file is part of liblcf. Copyright (c) 2020 liblcf authors.
+ * This file is part of liblcf. Copyright (c) 2021 liblcf authors.
  * https://github.com/EasyRPG/liblcf - https://easyrpg.org
  *
  * liblcf is Free/Libre Open Source Software, released under the MIT License.

src/encoder.cpp

@@ -1,5 +1,5 @@
 /*
- * This file is part of liblcf. Copyright (c) 2020 liblcf authors.
+ * This file is part of liblcf. Copyright (c) 2021 liblcf authors.
  * https://github.com/EasyRPG/liblcf - https://easyrpg.org
  *
  * liblcf is Free/Libre Open Source Software, released under the MIT License.

src/generated/fwd_struct_impl.h

@@ -1,7 +1,7 @@
 /* !!!! GENERATED FILE - DO NOT EDIT !!!!
  * --------------------------------------
  *
- * This file is part of liblcf. Copyright (c) 2020 liblcf authors.
+ * This file is part of liblcf. Copyright (c) 2021 liblcf authors.
  * https://github.com/EasyRPG/liblcf - https://easyrpg.org
  *
  * liblcf is Free/Libre Open Source Software, released under the MIT License.

src/generated/lcf/ldb/chunks.h

@@ -1,7 +1,7 @@
 /* !!!! GENERATED FILE - DO NOT EDIT !!!!
  * --------------------------------------
  *
- * This file is part of liblcf. Copyright (c) 2020 liblcf authors.
+ * This file is part of liblcf. Copyright (c) 2021 liblcf authors.
  * https://github.com/EasyRPG/liblcf - https://easyrpg.org
  *
  * liblcf is Free/Libre Open Source Software, released under the MIT License.

src/generated/lcf/lmt/chunks.h

@@ -1,7 +1,7 @@
 /* !!!! GENERATED FILE - DO NOT EDIT !!!!
  * --------------------------------------
  *
- * This file is part of liblcf. Copyright (c) 2020 liblcf authors.
+ * This file is part of liblcf. Copyright (c) 2021 liblcf authors.
  * https://github.com/EasyRPG/liblcf - https://easyrpg.org
  *
  * liblcf is Free/Libre Open Source Software, released under the MIT License.

src/generated/lcf/lmu/chunks.h

@@ -1,7 +1,7 @@
 /* !!!! GENERATED FILE - DO NOT EDIT !!!!
  * --------------------------------------
  *
- * This file is part of liblcf. Copyright (c) 2020 liblcf authors.
+ * This file is part of liblcf. Copyright (c) 2021 liblcf authors.
  * https://github.com/EasyRPG/liblcf - https://easyrpg.org
  *
  * liblcf is Free/Libre Open Source Software, released under the MIT License.