aboutsummaryrefslogtreecommitdiff
path: root/include/omc.h
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@gmail.com>2023-11-21 11:00:07 -0500
committerJoseph Hunkeler <jhunkeler@gmail.com>2023-11-21 11:00:07 -0500
commit4c3594a243ca43bd3d0bfca3728d4606a6b4e980 (patch)
treecf55917ffc6233ff6464a205877a88c26d4a581c /include/omc.h
parentf4c3d1318dd3c62a5af4099ef7624f49b5b2a4b4 (diff)
downloadstasis-4c3594a243ca43bd3d0bfca3728d4606a6b4e980.tar.gz
Read base packages from global config file
* Add conv_strlist_stackvar macro (globals is not a pointer) * Add "conda_packages" and "pip_package" to global config file * Fix unintended use of "conda build". Use "mambabuild".
Diffstat (limited to 'include/omc.h')
-rw-r--r--include/omc.h17
1 files changed, 10 insertions, 7 deletions
diff --git a/include/omc.h b/include/omc.h
index 432d88a..d798b33 100644
--- a/include/omc.h
+++ b/include/omc.h
@@ -9,13 +9,6 @@
#define SYSERROR stderr, "%s:%s:%d: %s\n", path_basename(__FILE__), __FUNCTION__, __LINE__, strerror(errno)
#define OMC_BUFSIZ 8192
-struct OMC_GLOBAL {
- unsigned char verbose;
- unsigned char always_update_base_environment;
- unsigned char continue_on_error;
- char *tmpdir;
-};
-
#include "utils.h"
#include "ini.h"
#include "conda.h"
@@ -34,4 +27,14 @@ struct OMC_GLOBAL {
exit(1); \
} \
}
+
+struct OMC_GLOBAL {
+ unsigned char verbose;
+ unsigned char always_update_base_environment;
+ unsigned char continue_on_error;
+ struct StrList *conda_packages;
+ struct StrList *pip_packages;
+ char *tmpdir;
+};
+
#endif //OMC_OMC_H