ia64/xen-unstable
changeset 15820:16e01b0dcdbc
Fix handling of auto-generated file xsm.py.
Signed-off-by: Keir Fraser <keir@xensource.com>
Signed-off-by: Keir Fraser <keir@xensource.com>
author | kfraser@localhost.localdomain |
---|---|
date | Fri Aug 31 12:12:27 2007 +0100 (2007-08-31) |
parents | 7e7e0ea6a0bb |
children | 06ac4c740c4a |
files | .hgignore tools/python/Makefile tools/python/xen/util/xsm/xsm.py |
line diff
1.1 --- a/.hgignore Fri Aug 31 12:05:07 2007 +0100 1.2 +++ b/.hgignore Fri Aug 31 12:12:27 2007 +0100 1.3 @@ -149,6 +149,7 @@ 1.4 ^tools/misc/xenperf$ 1.5 ^tools/pygrub/build/.*$ 1.6 ^tools/python/build/.*$ 1.7 +^tools/python/xen/util/xsm/xsm\.py$ 1.8 ^tools/security/secpol_tool$ 1.9 ^tools/security/xen/.*$ 1.10 ^tools/security/xensec_tool$
2.1 --- a/tools/python/Makefile Fri Aug 31 12:05:07 2007 +0100 2.2 +++ b/tools/python/Makefile Fri Aug 31 12:12:27 2007 +0100 2.3 @@ -23,10 +23,10 @@ CATALOGS = $(patsubst %,xen/xm/messages/ 2.4 NLSDIR = /usr/share/locale 2.5 2.6 .PHONY: build buildpy 2.7 -buildpy: 2.8 +buildpy: xsm.py 2.9 CC="$(CC)" CFLAGS="$(CFLAGS)" XEN_SECURITY_MODULE="$(XEN_SECURITY_MODULE)" python setup.py build 2.10 2.11 -build: xsm.py buildpy refresh-pot refresh-po $(CATALOGS) 2.12 +build: buildpy refresh-pot refresh-po $(CATALOGS) 2.13 2.14 # NB we take care to only update the .pot file it strings have 2.15 # actually changed. This is complicated by the embedded date
3.1 --- a/tools/python/xen/util/xsm/xsm.py Fri Aug 31 12:05:07 2007 +0100 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,9 +0,0 @@ 3.4 -XEN_SECURITY_MODULE = "flask" 3.5 -from xsm_core import * 3.6 - 3.7 -import xen.util.xsm.flask.flask as xsm_module 3.8 - 3.9 -xsm_init(xsm_module) 3.10 -from xen.util.xsm.flask.flask import * 3.11 -del xsm_module 3.12 -