diff options
Diffstat (limited to 'attoconf/lib')
| -rw-r--r-- | attoconf/lib/install.py | 15 | ||||
| -rw-r--r-- | attoconf/lib/make.py | 2 |
2 files changed, 4 insertions, 13 deletions
diff --git a/attoconf/lib/install.py b/attoconf/lib/install.py index 2bbc7c7..b32ebe0 100644 --- a/attoconf/lib/install.py +++ b/attoconf/lib/install.py @@ -20,15 +20,12 @@ from __future__ import print_function, division, absolute_import import os from ..classy import ClassyProject -from ..types import shell_word, version, filepath, quoted_string +from ..types import shell_word, filepath, quoted_string def package(build, PACKAGE): pass -def package_version(build, VERSION): - pass - def package_name(build, NAME): pass @@ -187,11 +184,10 @@ class Install(ClassyProject): @classmethod def slots(cls): return super(Install, cls).slots() + ( - 'package', 'package_version', 'package_name') + 'package', 'package_name') - def set_package(self, package, version, name): + def set_package(self, package, name): self.package = package - self.package_version = version self.package_name = name def general(self): @@ -200,11 +196,6 @@ class Install(ClassyProject): type=shell_word, check=package, help='Short name of this package (don\'t change!)', hidden=True) - self.add_option('--package-version', init=self.package_version, - type=version, check=package_version, - help='Version of this package (change in configure)', - hidden=True, - help_var='VERSION') self.add_option('--package-name', init=self.package_name, type=quoted_string, check=package_name, help='Long name of this package (don\'t change)', diff --git a/attoconf/lib/make.py b/attoconf/lib/make.py index ec03d1d..8bcd3b5 100644 --- a/attoconf/lib/make.py +++ b/attoconf/lib/make.py @@ -47,7 +47,7 @@ class MakeHook(object): out.write('\n') continue val, origin = build.vars[var] - out.write('%s = %s # %s\n' % (var, val, origin)) + out.write('# %s\n%s = %s\n' % (origin, var, val)) if self.infile is not None: out.write('# The rest was copied from %s\n' % self.infile) infile = os.path.join(build.project.srcdir, self.infile) |