Commit graph

186 commits

Author SHA1 Message Date
Steven Armstrong
db66d3731d merge master
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 15:27:00 +02:00
Steven Armstrong
4ee5d74c9f implement dependency handling at the object level
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 14:55:58 +02:00
Nico Schottelius
0a14aa080c prepare version change
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-26 23:04:06 +01:00
Steven Armstrong
31a0b6c3d0 fixed inconsistencies between local and remote variable naming
- /__cdist_remote_out_object_base_dir/__cdist_remote_out_object_dir/
- __cdist_remote_object_dir += __cdist_name_dot_cdist

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 01:43:55 +01:00
Nico Schottelius
a9ce26f968 integrate cdist-cache
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-25 23:35:11 +01:00
Nico Schottelius
3356564c77 upgrade to 1.4.1
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-25 22:24:02 +01:00
Nico Schottelius
5e5334dee1 prepare release 1.4.0
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 17:24:21 +01:00
Nico Schottelius
65763a1b4d search for .cdist not source
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 16:39:06 +01:00
Nico Schottelius
1dacf779e6 HUGE cleanup of cdist-manifest-run-all
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 16:33:16 +01:00
Nico Schottelius
d7b765e498 base_dir not dir_base
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 13:38:14 +01:00
Nico Schottelius
1756608720 in theory finish new algorithm to allow same objects
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 13:33:26 +01:00
Nico Schottelius
d8f7ebc73f move .dotfiles to .cdist/dotfiles (without dot)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:45:50 +01:00
Nico Schottelius
b46850cd12 begin to reintegrate parameter recording
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:39:17 +01:00
Nico Schottelius
a6702cc804 do not setup variables in cdist-config
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:32:22 +01:00
Nico Schottelius
69453feaa5 add __cdist_object_source_add
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:30:22 +01:00
Nico Schottelius
6f67911a0b sort object area in cdist-config
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:19:05 +01:00
Nico Schottelius
359e252ef7 begin to sort cdist-config by alphabet
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:12:39 +01:00
Nico Schottelius
7f3e22239f add dot-cdist to cdist-config
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-21 16:18:04 +01:00
Nico Schottelius
b41c1f7649 upgrade to 1.3.2
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-21 14:11:24 +01:00
Nico Schottelius
c0e2113643 update files for 1.3.1
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-21 08:59:04 +01:00
Nico Schottelius
69fc63df1e export __target_user to non-core
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-20 02:44:31 +01:00
Nico Schottelius
6f480810f3 Update to 1.3.0
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-20 00:02:44 +01:00
Nico Schottelius
c5590cb648 extend cdist-object-gencode* to include remote/local extension
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 22:19:44 +01:00
Nico Schottelius
1af34c74b8 begin to differentiate local and remote object code generation
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 22:15:54 +01:00
Nico Schottelius
8d4d5a5c15 switch to cdist 1.2.0
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 03:05:22 +01:00
Nico Schottelius
4cc237fa03 check for missing objects
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-18 01:45:54 +01:00
Nico Schottelius
42af407d3e refactor cdist-remote-code-run-all
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-18 01:31:30 +01:00
Nico Schottelius
02abb22a0d replace broken __cdist_object_base_dir with __cdist_out_object_dir}
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-17 23:54:16 +01:00
Nico Schottelius
93eef6900a + require in cdist-config
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-16 15:49:28 +01:00
Nico Schottelius
c733c9f9a4 Change to 1.1.0
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-16 11:10:37 +01:00
Nico Schottelius
e7eecb06d9 cdist-config needs to be executable, otherwise which does not find it
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-16 10:19:38 +01:00
Nico Schottelius
b6f231063e 0600 is enough for cdist-config (according to posix)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-16 09:48:59 +01:00
Nico Schottelius
e69db644b4 prepare version 1.0.4
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-15 21:38:09 +01:00
Nico Schottelius
068a7d272b place version on top
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-11 19:25:55 +01:00
Nico Schottelius
6a591d3e06 update version to be indpendent of git tree
Otherwise versions will include changes by users, which
will not be helpful for development.

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-11 19:17:31 +01:00
Nico Schottelius
19c7317cbb [DOC] document singleton behaviour in type manpage
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-11 19:09:36 +01:00
Nico Schottelius
24200865c9 remove __cdist_type_parameter_file in favor for new variants
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-10 17:44:16 +01:00
Nico Schottelius
e1a5a26cbf allow parameters to be missing, if not used
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-10 17:41:08 +01:00
Nico Schottelius
dc2a49afe8 -^
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-10 17:25:24 +01:00
Nico Schottelius
c67807af76 make regexp usable in the middle of an expression
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-10 17:23:47 +01:00
Nico Schottelius
99e6b9e6b1 update regexp for sane characters
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-10 17:19:25 +01:00
Nico Schottelius
70485e3516 extend cdist-type-emulator with singleton type
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-09 22:09:44 +01:00
Nico Schottelius
ac9d574049 rename param -> parameter
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-08 00:07:28 +01:00
Nico Schottelius
1d234550df add __cdist_type_param_dir
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-07 23:55:46 +01:00
Nico Schottelius
054cb7e611 ensure cdist-type-emulator has __cdist_version set before and does not run git
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-04 09:15:18 +01:00
Nico Schottelius
f3eb9368cd always chdir to git dir before getting version
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-04 09:07:48 +01:00
Nico Schottelius
7b3cee877d next todo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-04 02:08:05 +01:00
Nico Schottelius
a7ab994bc8 make version dynamic from git
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-03 20:24:25 +01:00
Nico Schottelius
3ff0b4a393 Use ../conf as default conf and change remote bin directory (next to conf/)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-03 15:27:51 +01:00
Nico Schottelius
8d3d11ea1b cleanup / sort cdist-config
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-03 14:49:48 +01:00
Nico Schottelius
cc05c6324c provide __global for manifests and codegen
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-03 10:37:11 +01:00
Nico Schottelius
8bb3a5b416 beautify output
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-03 09:47:02 +01:00
Nico Schottelius
f75f2a0de5 Cleanup local and remote base_dir before execution
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-03 09:43:04 +01:00
Nico Schottelius
06a56ab6d2 AR Steven: DOC: manifest can access $__type (implement $__type ;-)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-25 18:42:38 +01:00
Nico Schottelius
3b7bbb0756 replace __cdist_type_mydir with __cdist_type_dir
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-25 18:39:21 +01:00
Nico Schottelius
45429c2ca0 Allow ids to contain slashes
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-25 02:13:11 +01:00
Nico Schottelius
66bfe35a46 add user information
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-25 01:48:18 +01:00
Nico Schottelius
8aa560d111 save a variable
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-25 01:17:48 +01:00
Nico Schottelius
ea39e137f3 re-integrate cdist-object-codegen-all
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-25 01:06:02 +01:00
Nico Schottelius
8d774ff152 fix some issues in cdist-config, transfer parameters
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-25 00:54:49 +01:00
Nico Schottelius
72f62a8734 cleanup and fix some missing } in cdist-config
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-25 00:14:26 +01:00
Nico Schottelius
238b5119eb begin to migrate from plural to singular, CONSISTENTLY
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-24 21:32:01 +01:00
Nico Schottelius
39b2976f9a in theory, finish bin/cdist-object-explorer-all
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-24 21:24:21 +01:00
Nico Schottelius
16ac8117b2 cleanup much of bin/cdist-object-explorer-all
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-24 17:28:14 +01:00
Nico Schottelius
e599e1684c continue on bin/cdist-object-explorer-all, make scp silent
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-24 16:33:08 +01:00
Nico Schottelius
24ce08820e export __object and __object_id
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-24 15:34:17 +01:00
Nico Schottelius
93253f7fda export __target_host
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-24 15:05:31 +01:00
Nico Schottelius
7d766d5376 export __manifests
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-24 14:47:52 +01:00
Nico Schottelius
40752d4ac4 remove autoexport from cdist-config
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-24 14:28:29 +01:00
Nico Schottelius
f5eccb2cb1 introduce new variable names and use __explorers
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-24 14:24:47 +01:00
Nico Schottelius
957ab446fa introduce __cdist_local_base_dir and use it in HACKERS_README
This way out/ and conf/ are debugable.

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-23 19:05:46 +01:00
Nico Schottelius
e6c4533464 BREAK: rename __cdist_config to __cdist_conf_dir
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-23 19:01:29 +01:00
Nico Schottelius
0b94a11d27 implement the rename to cdist-type-build-emulation in cdist-manifest-run and cleanups
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-23 18:40:58 +01:00
Nico Schottelius
fde8b2b1b9 out does not need _dir in the fs
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-23 18:30:06 +01:00
Nico Schottelius
45237ec5ae conf != out
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-23 18:13:08 +01:00
Nico Schottelius
2e0d1b78fb rename: cdist-remote-* = remote
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-23 18:10:26 +01:00
Nico Schottelius
995bf8d963 a giant commit into the future
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-23 16:45:38 +01:00
Nico Schottelius
84ede1ae29 cleanup cdist config, remove cache, add out_dir and conf_dir
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-23 16:19:41 +01:00
Nico Schottelius
d7299b8ab1 begin to integrate out_dir in cdist_config
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-23 16:10:36 +01:00
Nico Schottelius
17838de1ef remove exports from cdist-config, let subscribts take care about that, add out_dir
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-23 16:01:18 +01:00
Nico Schottelius
ce69491c34 sed -i 's/__cdist_name_type_params/__cdist_name_params/g'
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-23 10:12:26 +01:00
Nico Schottelius
a12df5ce7c create __cdist_object_id_from_object and use it + __cdist_type_from_object in cdist-manifest-run-all
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-23 09:50:30 +01:00
Nico Schottelius
76057615b3 and rename to __cdist_type_explorer_dir
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-23 00:21:32 +01:00
Nico Schottelius
db40e6c1a1 add __cdist_type_explorers
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-23 00:21:11 +01:00
Nico Schottelius
2c5356ba9c introduce __cdist_type_from_object
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-23 00:17:55 +01:00
Nico Schottelius
b6a143143d cleanup + introduce __cdist_remote_user
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-22 20:40:54 +01:00
Nico Schottelius
63f702ceae remove slash before marker
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-22 13:04:41 +01:00
Nico Schottelius
5dcb719844 introduce and use __cdist_exec_fail_on_error
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-22 11:39:23 +01:00
Nico Schottelius
da8abcb770 -c
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-22 11:33:34 +01:00
Nico Schottelius
35387cbc61 add __cdist_exec_fail_on_error
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-22 11:31:37 +01:00
Nico Schottelius
15fa6f76e6 -debug from cdist-config
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-19 12:58:32 +01:00
Nico Schottelius
aec77a05ae cdist-config broken
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-17 17:46:18 +01:00
Nico Schottelius
b1c5012f3c Make __cdist_exit_err write on stderr :-)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-17 16:07:07 +01:00
Nico Schottelius
255124b8c9 Create, finish and integrate bin/cdist-exec-transfer
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-17 15:11:41 +01:00
Nico Schottelius
662eee7ea3 rename manifest -> manifests and use subshell in__cdist_object_list()
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-17 09:17:13 +01:00
Nico Schottelius
a134d6c9e1 add function: __cdist_type_param_file
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-16 23:04:02 +01:00
Nico Schottelius
c8242ef7da cleanup bin/cdist_tree_wrapper and introduce __cdist_object_source
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-16 22:11:53 +01:00
Nico Schottelius
80c745383a finish cdist-object-codegen-all
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-16 20:24:58 +01:00
Nico Schottelius
6914071fe0 finish __cdist_object_list
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-16 20:16:19 +01:00
Nico Schottelius
3c3dad1842 rename __cdist_name_object_finished as well
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-02-16 20:14:40 +01:00