author | Michael Krelin <hacker@klever.net> | 2014-06-30 19:23:23 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2014-06-30 19:23:23 (UTC) |
commit | b9ee39b810aae10da83534776028585309b53a24 (patch) (unidiff) | |
tree | 02de66579bbc322cc10bcb5727ef69d03775783e /scripts/builder/main.py | |
parent | 7a1f88f679d1574b93fba3415aa11fc4471eacbf (diff) | |
download | clipperz-b9ee39b810aae10da83534776028585309b53a24.zip clipperz-b9ee39b810aae10da83534776028585309b53a24.tar.gz clipperz-b9ee39b810aae10da83534776028585309b53a24.tar.bz2 |
builder: add --force-dirty flag
Besides being good for development, it seems to be a necessity in case
we are checked out as a submodule
-rwxr-xr-x | scripts/builder/main.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/builder/main.py b/scripts/builder/main.py index ecdbf6a..47e10a0 100755 --- a/scripts/builder/main.py +++ b/scripts/builder/main.py | |||
@@ -87,9 +87,9 @@ def assembleBackend (backend, frontends, versions): | |||
87 | def build (settings, repository): | 87 | def build (settings, repository): |
88 | frontends = [] | 88 | frontends = [] |
89 | 89 | ||
90 | if repository.areTherePendingChanges(): | 90 | if repository.areTherePendingChanges(): |
91 | if 'install' in settings['versions']: | 91 | if 'install' in settings['versions'] and not settings['forcedirty']: |
92 | raise Exception("repository has pending changes, can't 'install'") | 92 | raise Exception("repository has pending changes, can't 'install'") |
93 | else: | 93 | else: |
94 | print "\nWARNING: repository has pending changes\n" | 94 | print "\nWARNING: repository has pending changes\n" |
95 | 95 | ||
@@ -149,8 +149,11 @@ def main (): | |||
149 | sys.path.append(os.path.join(scriptDir(), 'backends')) | 149 | sys.path.append(os.path.join(scriptDir(), 'backends')) |
150 | sys.path.append(os.path.join(scriptDir(), 'frontends')) | 150 | sys.path.append(os.path.join(scriptDir(), 'frontends')) |
151 | currentRepository = repository.repositoryWithPath(projectBaseDir()) | 151 | currentRepository = repository.repositoryWithPath(projectBaseDir()) |
152 | 152 | ||
153 | settings['forcedirty'] = len(parameters) | ||
154 | parameters = list(itertools.ifilter(lambda x: not x=='--force-dirty', parameters)) | ||
155 | settings['forcedirty'] = len(parameters)==settings['forcedirty'] | ||
153 | clean() | 156 | clean() |
154 | versions = list(itertools.takewhile(lambda x: not x.startswith('--'), parameters)) | 157 | versions = list(itertools.takewhile(lambda x: not x.startswith('--'), parameters)) |
155 | settings['versions'] = versions; #['debug', 'install', 'development', 'checksum'] | 158 | settings['versions'] = versions; #['debug', 'install', 'development', 'checksum'] |
156 | parameters = deque(itertools.dropwhile(lambda x: not x.startswith('--'), parameters)) | 159 | parameters = deque(itertools.dropwhile(lambda x: not x.startswith('--'), parameters)) |