9f73baa·Author: Ian Hinder·Closed by: Ian Hinder·2016-05-17
Description
Previously, the config-Cactus.tar.gz target in make.configuration.deps assumed that the files listed in config-Cactus.files were relative to CCTK_HOME. This is not true when using CACTUS_CONFIGS_DIR. Also, that file stored the names with a configs/ prefix, which isn't applicable when using CACTUS_CONFIGS_DIR. In this commit, store the filenames without the configs/ prefix (line 146), and tar them from CACTUS_CONFIGS_DIR instead of CCTK_HOME (line 133). The update-git-repo.pl script input is also read from config-Cactus.files. Prefix the content with CACTUS_CONFIGS_DIR using sed (line 388). Also use CACTUS_CONFIGS_DIR instead of configs/ for the BUILD-ID and CONFIG-ID files. This then trips up git update-index, which expects the input filenames to be relative to the git tree, and absolute paths are not allowed. Hence, in update-git-repo.pl, strip any prefix equal to CACTUS_CONFIGS_DIR and use that as the stored name (the object itself still comes from the full name). Back in make.configuration.deps, export the CACTUS_CONFIGS_DIR derived makefile variable as an environment variable (line 382) so that update-git-repo.pl doesn't have to worry about it not existing.
Previously, the config-Cactus.tar.gz target in make.configuration.deps assumed that the files listed in config-Cactus.files were relative to CCTK_HOME. This is not true when using CACTUS_CONFIGS_DIR. Also, that file stored the names with a configs/ prefix, which isn't applicable when using CACTUS_CONFIGS_DIR. In this commit, store the filenames without the configs/ prefix (line 146), and tar them from CACTUS_CONFIGS_DIR instead of CCTK_HOME (line 133). The update-git-repo.pl script input is also read from config-Cactus.files. Prefix the content with CACTUS_CONFIGS_DIR using sed (line 388). Also use CACTUS_CONFIGS_DIR instead of configs/ for the BUILD-ID and CONFIG-ID files. This then trips up git update-index, which expects the input filenames to be relative to the git tree, and absolute paths are not allowed. Hence, in update-git-repo.pl, strip any prefix equal to CACTUS_CONFIGS_DIR and use that as the stored name (the object itself still comes from the full name). Back in make.configuration.deps, export the CACTUS_CONFIGS_DIR derived makefile variable as an environment variable (line 382) so that update-git-repo.pl doesn't have to worry about it not existing.