Moved data file components.cif to rsrc

.gitignore

@@ -2,7 +2,7 @@ build/
 .vscode/
 .vscode/
 .vs/
 .vs/
 tools/update-libcifpp-data
 tools/update-libcifpp-data
-data/components.cif*
+rsrc/components.cif*
 CMakeSettings.json
 CMakeSettings.json
 msvc/
 msvc/
 src/revision.hpp
 src/revision.hpp

CMakeLists.txt

@@ -360,7 +360,7 @@ endif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
 
 
 if(CIFPP_DOWNLOAD_CCD)
 if(CIFPP_DOWNLOAD_CCD)
 	# download the components.cif file from CCD
 	# download the components.cif file from CCD
-	set(COMPONENTS_CIF ${PROJECT_SOURCE_DIR}/data/components.cif)
+	set(COMPONENTS_CIF ${PROJECT_SOURCE_DIR}/rsrc/components.cif)
 
 
 	if(EXISTS ${COMPONENTS_CIF})
 	if(EXISTS ${COMPONENTS_CIF})
 		file(SIZE ${COMPONENTS_CIF} CCD_FILE_SIZE)
 		file(SIZE ${COMPONENTS_CIF} CCD_FILE_SIZE)
@@ -372,10 +372,6 @@ if(CIFPP_DOWNLOAD_CCD)
 	endif()
 	endif()
 
 
 	if(NOT EXISTS ${COMPONENTS_CIF})
 	if(NOT EXISTS ${COMPONENTS_CIF})
-		if(NOT EXISTS ${PROJECT_SOURCE_DIR}/data)
-			file(MAKE_DIRECTORY ${PROJECT_SOURCE_DIR}/data/)
-		endif()
-
 		# Since the file(DOWNLOAD) command in cmake does not use
 		# Since the file(DOWNLOAD) command in cmake does not use
 		# compression, we try to download the gzipped version and
 		# compression, we try to download the gzipped version and
 		# decompress it ourselves.
 		# decompress it ourselves.
@@ -389,7 +385,7 @@ if(CIFPP_DOWNLOAD_CCD)
 
 
 			add_custom_command(OUTPUT ${COMPONENTS_CIF}
 			add_custom_command(OUTPUT ${COMPONENTS_CIF}
 				COMMAND ${GUNZIP} ${COMPONENTS_CIF}.gz
 				COMMAND ${GUNZIP} ${COMPONENTS_CIF}.gz
-				WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/data/)
+				WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/rsrc/)
 		else()
 		else()
 			file(DOWNLOAD https://files.wwpdb.org/pub/pdb/data/monomers/components.cif ${COMPONENTS_CIF}
 			file(DOWNLOAD https://files.wwpdb.org/pub/pdb/data/monomers/components.cif ${COMPONENTS_CIF}
 				SHOW_PROGRESS STATUS CCD_FETCH_STATUS)
 				SHOW_PROGRESS STATUS CCD_FETCH_STATUS)
@@ -613,7 +609,7 @@ set(CPACK_SOURCE_TGZ ON)
 set(CPACK_SOURCE_TBZ2 OFF)
 set(CPACK_SOURCE_TBZ2 OFF)
 set(CPACK_SOURCE_TXZ OFF)
 set(CPACK_SOURCE_TXZ OFF)
 set(CPACK_SOURCE_TZ OFF)
 set(CPACK_SOURCE_TZ OFF)
-set(CPACK_SOURCE_IGNORE_FILES "/data/components.cif;/build;/.vscode;/.git")
+set(CPACK_SOURCE_IGNORE_FILES "/rsrc/components.cif;/build;/.vscode;/.git")
 set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}")
 set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME})
 set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME})
 include(CPack)
 include(CPack)

test/rename-compound-test.cpp

@@ -37,8 +37,8 @@ TEST_CASE("rename")
 {
 {
 	cif::VERBOSE = 3;
 	cif::VERBOSE = 3;
 
 
-	if (std::filesystem::exists(gTestDir / ".." / "data" / "ccd-subset.cif"))
-		cif::add_file_resource("components.cif", gTestDir / ".." / "data" / "ccd-subset.cif");
+	if (std::filesystem::exists(gTestDir / ".." / "rsrc" / "ccd-subset.cif"))
+		cif::add_file_resource("components.cif", gTestDir / ".." / "rsrc" / "ccd-subset.cif");
 
 
 	if (std::filesystem::exists(gTestDir / ".." / "rsrc" / "mmcif_pdbx.dic"))
 	if (std::filesystem::exists(gTestDir / ".." / "rsrc" / "mmcif_pdbx.dic"))
 		cif::add_file_resource("mmcif_pdbx.dic", gTestDir / ".." / "rsrc" / "mmcif_pdbx.dic");
 		cif::add_file_resource("mmcif_pdbx.dic", gTestDir / ".." / "rsrc" / "mmcif_pdbx.dic");

test/test-main.cpp

@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
 	cif::add_file_resource("mmcif_pdbx.dic", gTestDir / ".." / "rsrc" / "mmcif_pdbx.dic");
 	cif::add_file_resource("mmcif_pdbx.dic", gTestDir / ".." / "rsrc" / "mmcif_pdbx.dic");
 
 
 	// initialize CCD location
 	// initialize CCD location
-	cif::add_file_resource("components.cif", gTestDir / ".." / "data" / "ccd-subset.cif");
+	cif::add_file_resource("components.cif", gTestDir / ".." / "rsrc" / "ccd-subset.cif");
 
 
 	cif::compound_factory::instance().push_dictionary(gTestDir / "HEM.cif");
 	cif::compound_factory::instance().push_dictionary(gTestDir / "HEM.cif");