diff options
| author | Joseph Hunkeler <jhunkeler@gmail.com> | 2024-07-20 11:46:29 -0400 |
|---|---|---|
| committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2024-07-20 11:46:29 -0400 |
| commit | 14a4a198d55713280648344f8b2a01d6e65092f1 (patch) | |
| tree | 04cce26181be7bae8bacb0d08731c55709f94d33 /include/core.h | |
| parent | 07dc44efdc5c2fbc2b34c969e623d3b0bc0df15a (diff) | |
| download | stasis-14a4a198d55713280648344f8b2a01d6e65092f1.tar.gz | |
Found too many bugs
* Implements a regression test
* Moves and completely refactors the envctl code
* Allows the user to keep @STR@ values in output files (if you want full control over where external packages comes from post-build)
* Fixes wording in a few places
* envctl redaction is not implemented yet. The original redaction code hasn't been modified.
Diffstat (limited to 'include/core.h')
| -rw-r--r-- | include/core.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/include/core.h b/include/core.h index d065096..1ea0f5e 100644 --- a/include/core.h +++ b/include/core.h @@ -21,6 +21,7 @@ #define HTTP_ERROR(X) X >= 400 #include "config.h" +#include "envctl.h" #include "template.h" #include "utils.h" #include "copy.h" @@ -59,11 +60,6 @@ } \ } while (0) -struct EnvCtl { - unsigned flags; - const char *name[10]; -}; - struct STASIS_GLOBAL { bool verbose; //!< Enable verbose output bool always_update_base_environment; //!< Update base environment immediately after activation @@ -73,6 +69,7 @@ struct STASIS_GLOBAL { bool enable_artifactory; //!< Enable artifactory uploads bool enable_testing; //!< Enable package testing bool enable_overwrite; //!< Enable release file clobbering + bool enable_rewrite_spec_stage_2; //!< Enable automatic @STR@ replacement in output files struct StrList *conda_packages; //!< Conda packages to install after initial activation struct StrList *pip_packages; //!< Pip packages to install after initial activation char *tmpdir; //!< Path to temporary storage directory @@ -93,13 +90,10 @@ struct STASIS_GLOBAL { char *repo; char *url; } jfrog; - struct EnvCtl envctl[]; + struct EnvCtl *envctl; }; extern struct STASIS_GLOBAL globals; -#define STASIS_ENVCTL_PASSTHRU 0 << 1 -#define STASIS_ENVCTL_REQUIRED 1 << 1 -#define STASIS_ENVCTL_REDACT 2 << 1 extern const char *VERSION; extern const char *AUTHOR; extern const char *BANNER; |