diff options
author | Samuli Seppänen <samuli@openvpn.net> | 2011-02-11 16:03:31 +0200 |
---|---|---|
committer | David Sommerseth <dazo@users.sourceforge.net> | 2011-02-27 00:55:38 +0100 |
commit | 3b44aa49400647b785721e77da9c5e38eeb9fd83 (patch) | |
tree | 9aba9c266d248a1d22f03ed89a01533731b23151 /win | |
parent | Added helper functionality to win/wb.py (diff) | |
download | openvpn-3b44aa49400647b785721e77da9c5e38eeb9fd83.tar.xz |
Added support for viewing config-win32.h paramters to win/show.py
The win/show.py tools is used to view build parameters interactively. This
changes it so that it displays parameters parsed from config-win32.h in addition
to those from win/settings.in.
Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: James Yonan <james@openvpn.net>
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to '')
-rw-r--r-- | win/show.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win/show.py b/win/show.py index 9558c87..111c965 100644 --- a/win/show.py +++ b/win/show.py @@ -1,9 +1,9 @@ -from wb import get_config
+from wb import get_config, get_build_params from js import JSON
def main():
- kv = get_config()
- print JSON().encode(kv)
+ print JSON().encode(get_config()) + print JSON().encode(get_build_params()) # if we are run directly, and not loaded as a module
if __name__ == "__main__":
|