From a3405560a639e8ee90457d78a9b393dde91d8781 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Thu, 1 Aug 2013 18:21:47 -0700 Subject: Initial commit of the final draft of attoconf --- README | 7 +++++++ attoconf/__init__.py | 0 setup.py | 22 ++++++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 README create mode 100644 attoconf/__init__.py create mode 100755 setup.py diff --git a/README b/README new file mode 100644 index 0000000..2497de8 --- /dev/null +++ b/README @@ -0,0 +1,7 @@ +Attoconf is A small and sensible replacement for GNU autoconf. + +Principles: +* Assume most build environments are sane, and ignore the rest. +* Never automatically toggle features based on the build environment. +* Written in python2 for easy editing and wide portability. +* GPL, but this does not apply to the program being built. diff --git a/attoconf/__init__.py b/attoconf/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/setup.py b/setup.py new file mode 100755 index 0000000..2086609 --- /dev/null +++ b/setup.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python + +from distutils.core import setup + +setup( + name='attoconf', + version='1.0', + description='A small and sensible replacement for GNU autoconf', + author='Ben Longbons', + author_email='b.r.longbons@gmail.com', + url='http://github.com/o11c/attoconf', + packages=[ + 'attoconf', + ], + classifiers=[ + 'Development Status :: 3 - Alpha', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)', + 'Programming Language :: Python :: 2 :: Only', + 'Topic :: Software Development :: Build Tools', + ], +) -- cgit v1.2.3-70-g09d2 From d53d9bf0e55fddd814ad99ec89134a7228390c65 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Thu, 1 Aug 2013 21:51:50 -0700 Subject: Put some important files in a skeleton --- .gitignore | 1 + COPYING | 11 + attoconf/_version.py | 18 ++ attoconf/core.py | 82 ++++++ attoconf/version.py | 39 +++ demo-project/attoconf | 1 + demo-project/configure | 39 +++ gpl-3.0.txt | 674 +++++++++++++++++++++++++++++++++++++++++++++++++ setup.py | 4 +- 9 files changed, 868 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 COPYING create mode 100644 attoconf/_version.py create mode 100644 attoconf/core.py create mode 100644 attoconf/version.py create mode 120000 demo-project/attoconf create mode 100755 demo-project/configure create mode 100644 gpl-3.0.txt diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0d20b64 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.pyc diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..4778b34 --- /dev/null +++ b/COPYING @@ -0,0 +1,11 @@ +Attoconf itself is released under the GNU General Public License (GPL). + +As a derivative work, this also applies to the 'configure' script shipped +with programs that use the attoconf library. This is a deliberate decision: +while 'configure' is program-specific options, many programs will want +similar options. + +However, the actual programs build using attoconf are not derivative works +and thus may be released under any license. + +The GPL is available in the file gpl-3.0.txt diff --git a/attoconf/_version.py b/attoconf/_version.py new file mode 100644 index 0000000..7721bb4 --- /dev/null +++ b/attoconf/_version.py @@ -0,0 +1,18 @@ +# Implementation of Semantic Versioning +# This file should change in every single commit. + +# Incremented for releases with incompatible API changes. +# 0 is special, for initial releases with no real guarantees. +major = 0 + +# Incremented for releases with compatible API additions. +# This is the number that is usually incremented. +minor = 0 + +# Incremented if there is a bugfix release. +# Might not be contiguous. +patch = 0 + +# Reserved for distributors and forks. +# Contains arbitrary text, but no parentheses or newlines. +distributor = 'Vanilla' diff --git a/attoconf/core.py b/attoconf/core.py new file mode 100644 index 0000000..0c01d5e --- /dev/null +++ b/attoconf/core.py @@ -0,0 +1,82 @@ +# Copyright 2013 Ben Longbons +# +# This file is part of attoconf. +# +# attoconf is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# attoconf is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with attoconf. If not, see . + +from __future__ import print_function, division, absolute_import + +class Project(object): + ''' A Project is a directory and the list of options that can be set. + ''' + __slots__ = ( + 'aliases', + 'options', + 'help', + ) + def __init__(self, srcdir): + ''' A Project is initially constructed from just the source directory + ''' + + def add_help(self, text, hidden): + ''' Directly add a line of text to the help. + ''' + + def add_alias(self, key, expansion, help, hidden): + ''' Add an alias. + + This is necessary for anything to appear without an =. + + The expansion is a list of other options, which may be aliases. + ''' + + def add_option(self, name, init, type, check, help, hidden): + ''' Add an actual option. + + This must be passed with a =. + + In the builder, the var will first be set to init. + + If the argument is passed, the type hook is called immediately + to validate the argument. + + The check hooks will be called at final time, + in the order they were added. + + Additionally, a line of help is added, with additional formatting. + ''' + +class Build(object): + ''' A Build is a directory and set of options applied to a Project. + ''' + __slots__ = ( + 'project', + 'vars', + ) + def __init__(self, project, bindir): + ''' A Build is initially constructed from + ''' + + def apply_arg(self, arg): + ''' Parse a single argument, expanding aliases. + ''' + + def finish(self): + ''' With the current set of variables, run all the checks + and presumably produce some sort of output. + ''' + + def configure(self, args, env): + ''' Automatically call apply_arg() a bunch of times, then finish(). + ''' diff --git a/attoconf/version.py b/attoconf/version.py new file mode 100644 index 0000000..231a3d1 --- /dev/null +++ b/attoconf/version.py @@ -0,0 +1,39 @@ +# Copyright 2013 Ben Longbons +# +# This file is part of attoconf. +# +# attoconf is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# attoconf is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with attoconf. If not, see . + +from __future__ import print_function, division, absolute_import + +import sys + +from . import _version + +if sys.version_info[0] != 2 or sys.version_info[1] < 7: + sys.exit('Unsupported Python version: %s\nRequire Python 2.7' % sys.version) + +def require_version(major, minor, patch=0): + ''' Check that this is the right version of attoconf, or die trying. + ''' + + actual = 'Current version: ' + string + if major != _version.major: + sys.exit('Unsupported major version: %d\n' % major + actual) + if minor > _version.minor: + sys.exit('Unsupported minor version: %d.%d\n' % (major, minor) + actual) + if minor == _version.minor and patch > _version.patch: + sys.exit('Unsupported patch version: %d.%d.%d\n' % (major, minor, patch) + actual) + +string = 'attoconf %d.%d.%d (%s)' % (_version.major, _version.minor, _version.patch, _version.distributor) diff --git a/demo-project/attoconf b/demo-project/attoconf new file mode 120000 index 0000000..a0b3fcf --- /dev/null +++ b/demo-project/attoconf @@ -0,0 +1 @@ +../attoconf/ \ No newline at end of file diff --git a/demo-project/configure b/demo-project/configure new file mode 100755 index 0000000..8f09a35 --- /dev/null +++ b/demo-project/configure @@ -0,0 +1,39 @@ +#!/usr/bin/env python + +# Copyright 2013 Ben Longbons +# +# This file is part of attoconf. +# +# attoconf is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# attoconf is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with attoconf. If not, see . + +from __future__ import print_function, division, absolute_import + +import os +import sys + +from attoconf.version import require_version, string as version_string +require_version(0, 0) + +from attoconf.core import Project, Build + +def main(): + print('Using', version_string) + src = Project(os.path.dirname(sys.argv[0])) + # customizations go here + + # the rest shouldn't change + build = Build(src, '.') + build.configure(sys.argv[1:], os.environ) + +main() diff --git a/gpl-3.0.txt b/gpl-3.0.txt new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/gpl-3.0.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/setup.py b/setup.py index 2086609..5e27239 100755 --- a/setup.py +++ b/setup.py @@ -2,9 +2,11 @@ from distutils.core import setup +from attoconf.version import version_string + setup( name='attoconf', - version='1.0', + version=version_string, description='A small and sensible replacement for GNU autoconf', author='Ben Longbons', author_email='b.r.longbons@gmail.com', -- cgit v1.2.3-70-g09d2 From e2540283a9e25748c20bde296919040c93a927db Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Thu, 1 Aug 2013 23:00:53 -0700 Subject: Add flesh to the skeleton --- attoconf/_version.py | 2 +- attoconf/core.py | 116 +++++++++++++++++++++++- attoconf/help.py | 171 ++++++++++++++++++++++++++++++++++++ attoconf/tests/__init__.py | 0 attoconf/tests/test_core.py | 129 +++++++++++++++++++++++++++ attoconf/tests/test_help.py | 195 +++++++++++++++++++++++++++++++++++++++++ attoconf/tests/test_version.py | 94 ++++++++++++++++++++ demo-project/configure | 2 +- test-everything.sh | 2 + 9 files changed, 705 insertions(+), 6 deletions(-) create mode 100644 attoconf/help.py create mode 100644 attoconf/tests/__init__.py create mode 100644 attoconf/tests/test_core.py create mode 100644 attoconf/tests/test_help.py create mode 100644 attoconf/tests/test_version.py create mode 100755 test-everything.sh diff --git a/attoconf/_version.py b/attoconf/_version.py index 7721bb4..8d9820c 100644 --- a/attoconf/_version.py +++ b/attoconf/_version.py @@ -7,7 +7,7 @@ major = 0 # Incremented for releases with compatible API additions. # This is the number that is usually incremented. -minor = 0 +minor = 1 # Incremented if there is a bugfix release. # Might not be contiguous. diff --git a/attoconf/core.py b/attoconf/core.py index 0c01d5e..8b53209 100644 --- a/attoconf/core.py +++ b/attoconf/core.py @@ -17,21 +17,48 @@ from __future__ import print_function, division, absolute_import +from collections import namedtuple +import os +import sys + +from .help import Help + +# Nothing to see here. Move along. +Option = namedtuple('Option', ['type', 'init']) +class ArgumentError(Exception): pass + +def as_var(name): + return name.lstrip('-').upper() + +def trim_trailing_slashes(path): + p, s = os.path.split(path) + if not s: + return p + return path + class Project(object): ''' A Project is a directory and the list of options that can be set. ''' __slots__ = ( + 'srcdir', 'aliases', 'options', 'help', + 'checks', ) def __init__(self, srcdir): ''' A Project is initially constructed from just the source directory ''' + self.srcdir = trim_trailing_slashes(srcdir) + self.aliases = {} + self.options = {} + self.help = Help() + self.checks = [] def add_help(self, text, hidden): ''' Directly add a line of text to the help. ''' + self.help.add_text(text, hidden) def add_alias(self, key, expansion, help, hidden): ''' Add an alias. @@ -40,8 +67,17 @@ class Project(object): The expansion is a list of other options, which may be aliases. ''' - - def add_option(self, name, init, type, check, help, hidden): + if key in self.aliases: + raise KeyError(key) + expansion = list(expansion) + self.aliases[key] = expansion + if help is None: + help = 'alias for ' + ' '.join(expansion) + self.help.add_option(key, help, hidden) + + def add_option(self, name, init, type, check, + help, hidden, + help_var=None, help_def=None): ''' Add an actual option. This must be passed with a =. @@ -56,27 +92,99 @@ class Project(object): Additionally, a line of help is added, with additional formatting. ''' + if name in self.options: + raise KeyError(name) + self.options[name] = Option(init=init, type=type) + self.checks.append(lambda bld: check(bld, bld.vars[as_var(name)][0])) + if help_var is None: + help_var = as_var(name) + if help_def is None: + help_def = init + if help_def is not None: + help = '%s [%s]' % (help, help_def) + + if help_var != name: + help_opt = '%s=%s' % (name, help_var) + else: + help_opt = name + self.help.add_option(help_opt, help, hidden) + + def do_help(self, opt): + ''' Pseudo type-hook to be registered for --help (calls sys.exit). + ''' + if opt == 'default': + hidden = False + elif opt == 'hidden': + hidden = True + else: + raise ValueError + self.help.print(sys.stdout, hidden) + sys.exit() class Build(object): ''' A Build is a directory and set of options applied to a Project. ''' __slots__ = ( + 'bindir', 'project', 'vars', ) def __init__(self, project, bindir): - ''' A Build is initially constructed from + ''' A Build is initially constructed from a project and a build dir. ''' + self.project = project + self.bindir = trim_trailing_slashes(bindir) + self.vars = {as_var(k): (o.init, 'default') + for k, o in project.options.iteritems()} def apply_arg(self, arg): ''' Parse a single argument, expanding aliases. ''' + alias = self.project.aliases.get(arg) + if alias is not None: + for e in alias: + # TODO: catch recursive aliases + # or should they be caught earlier? + self.apply_arg(e) + return + + if '=' not in arg: + if arg in self.project.options: + raise ArgumentError('Option %s requires an argument' % arg) + elif arg.startswith('-'): + raise ArgumentError('Unknown option %s' % arg) + else: + raise ArgumentError('Unknown environment variable %s' % arg) + + k, a = arg.split('=', 1) + opt = self.project.options.get(k) + if opt is None: + raise sys.exit('Unknown option %s' % k) + self.vars[as_var(k)] = (opt.type(a), 'command-line') def finish(self): ''' With the current set of variables, run all the checks and presumably produce some sort of output. ''' + for check in self.project.checks: + check(self) def configure(self, args, env): - ''' Automatically call apply_arg() a bunch of times, then finish(). + ''' First apply variables from the environment, + then call apply_arg() a bunch of times, then finish(). + ''' + for k in self.vars: + val = env.get(k) + if val is not None: + self.vars[k] = (self.project.options[k].type(val), 'environment') + + for arg in args: + self.apply_arg(arg) + + self.finish() + + def relative_source(self): + ''' Return a relative path from the build tree to the source tree. ''' + return os.path.relpath(os.path.realpath(self.project.srcdir), + os.path.realpath(self.bindir)) diff --git a/attoconf/help.py b/attoconf/help.py new file mode 100644 index 0000000..610efde --- /dev/null +++ b/attoconf/help.py @@ -0,0 +1,171 @@ +# Copyright 2013 Ben Longbons +# +# This file is part of attoconf. +# +# attoconf is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# attoconf is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with attoconf. If not, see . + +from __future__ import print_function, division, absolute_import + +def put_line_in_width(file, line, width, indent): + ''' Print a line with wrapping. + ''' + line = line.rstrip(' ') + if len(line) <= width or ' ' not in line.lstrip(' '): + # this is not just an optimization + file.writelines([line, '\n']) + return + line += ' ' + indents = indent * ' ' + + initial_spaces = len(line) - len(line.lstrip(' ')) + while line.lstrip(): + space = line.rfind(' ', initial_spaces, width + 1) + if space == -1: + space = line.find(' ', initial_spaces) + if space == -1: + space = len(line) + file.writelines([line[:space], '\n']) + line = indents + line[space+1:].lstrip(' ') + initial_spaces = indent + + +class HelpSection(object): + ''' A help section contains some header lines and some related options. + ''' + __slots__ = ( + 'headers', + 'options', + ) + def __init__(self): + ''' Create an empty help section. + ''' + self.headers = [] + self.options = [] + + def add_text(self, text, hidden): + ''' Add a header line. + ''' + self.headers.append((hidden, text)) + + def add_option(self, name, text, hidden): + ''' Add an option with its description. + ''' + self.options.append((hidden, name, text)) + + def print(self, file, hidden, width): + ''' Format (some of) the help text prettily. + ''' + if self.options: + for oh, name, ht in self.options: + if oh <= hidden: + break + else: + return False + + # options longer than this will be split into multiple lines + split_width = width / 4 - 2 + # longest option + longest_opt = 0 + for oh, name, ht in self.options: + if oh > hidden: + continue + l = len(name) + 2 + if l > split_width: + continue + if l > longest_opt: + longest_opt = l + if longest_opt == 0: + longest_opt = int(split_width) + + for oh, ht in self.headers: + if oh > hidden: + continue + put_line_in_width(file, ht, width, 0) + + for oh, name, ht in self.options: + if oh > hidden: + continue + # no, it's not really that simple + if len(name) > longest_opt: + file.writelines([' ', name, '\n']) + name = '' + line = ' %-*s%s' % (longest_opt, name, ht) + put_line_in_width(file, line, width, longest_opt + 2) + + return True + + +def detect_terminal_width(fd, DEFAULT_WIDTH=float('inf')): + ''' Detect the width of a terminal. + ''' + if not isinstance(fd, int): + fd = getattr(fd, 'fileno', lambda: -1)() + if fd == -1: + return DEFAULT_WIDTH + + import fcntl + import termios + try: + buf = fcntl.ioctl(fd, termios.TIOCGWINSZ, b'xx' * 4) + except IOError as e: + import errno + if e.errno != errno.ENOTTY: + raise + return DEFAULT_WIDTH + import struct + ws_row, ws_col, ws_xpixel, ws_ypixel = struct.unpack('HHHH', buf) + return ws_col + + +class Help(object): + ''' Help collects the set of flavor text and option descriptions + related to arguments. + ''' + __slots__ = ( + 'sections', + ) + def __init__(self): + ''' Help does not take any arguments during construction. + ''' + self.sections = [] + + def add_text(self, text, hidden): + ''' Add a header line. + + This creates a new section if the last line wasn't a header. + ''' + if not self.sections or self.sections[-1].options: + self.sections.append(HelpSection()) + self.sections[-1].add_text(text, hidden) + + def add_option(self, name, text, hidden): + ''' Add an option with its description to the current section. + + This creates a new section only if it is first. + ''' + if not self.sections: + self.sections.append(HelpSection()) + self.sections[-1].add_option(name, text, hidden) + + def print(self, file, hidden, width=0): + ''' Print all the help at the given level of hidden-ness. + ''' + if width == 0: + width = detect_terminal_width(file) + if width < 20: + width = 80 + + for s in self.sections: + if s.print(file, hidden, width): + file.write('\n') diff --git a/attoconf/tests/__init__.py b/attoconf/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/attoconf/tests/test_core.py b/attoconf/tests/test_core.py new file mode 100644 index 0000000..88bf616 --- /dev/null +++ b/attoconf/tests/test_core.py @@ -0,0 +1,129 @@ +# Copyright 2013 Ben Longbons +# +# This file is part of attoconf. +# +# attoconf is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# attoconf is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with attoconf. If not, see . + +from __future__ import print_function, division, absolute_import + +import unittest + +from attoconf.core import Project, Build + +from cStringIO import StringIO +import sys + +class ReplacingStdout(object): + __slots__ = ('old', 'new') + def __init__(self, new): + self.old = None + self.new = new + def __enter__(self): + self.old = sys.stdout + sys.stdout = self.new + def __exit__(self, type, value, traceback): + sys.stdout = self.old + del self.old + +class TestProject(unittest.TestCase): + def test_help(self): + proj = Project('foo') + proj.add_help('General:', False) + proj.add_alias('--help', ['--help=default'], + help='display standard help, then exit', hidden=False) + proj.add_option('--help', init=None, + type=proj.do_help, check=None, + help='display some subset of help', hidden=False, + help_var='TYPE') + proj.help.add_option('--help=hidden', + 'display help you should never ever ever care about', True) + proj.add_option('--foo', init='asdf', + type=str, check=None, + help='set frob target', hidden=False) + proj.add_option('--bar', init=None, + type=str, check=None, + help='set frob source', hidden=False, + help_def='FOO') + + build = Build(proj, 'bar') + + out = StringIO() + with ReplacingStdout(out): + with self.assertRaises(SystemExit): + build.apply_arg('--help') + self.assertEqual(out.getvalue(), ''' +General: + --help display standard help, then exit + --help=TYPE display some subset of help + --foo=FOO set frob target [asdf] + --bar=BAR set frob source [FOO] + +'''[1:]) + + out = StringIO() + with ReplacingStdout(out): + with self.assertRaises(SystemExit): + build.apply_arg('--help=hidden') + self.assertEqual(out.getvalue(), ''' +General: + --help display standard help, then exit + --help=TYPE display some subset of help + --help=hidden display help you should never ever ever care about + --foo=FOO set frob target [asdf] + --bar=BAR set frob source [FOO] + +'''[1:]) + + def test_path(self): + proj = Project('foo/') + build = Build(proj, 'bar/') + self.assertEquals(build.project.srcdir, 'foo') + self.assertEquals(build.bindir, 'bar') + self.assertEquals(build.relative_source(), '../foo') + + def test_configure(self): + def check_foo(bld, foo): + self.assertEqual(foo, 'B') + def check_bar(bld, bar): + self.assertEqual(bar, 1) + def check_qux(bld, qux): + self.assertEqual(qux, None) + def check_var(bld, var): + self.assertEqual(var, 'value') + + proj = Project('.') + proj.add_alias('--alias', ['--foo=A', '--bar=1', '--foo=B'], + help=None, hidden=False) + proj.add_option('--foo', init=None, + type=str, check=check_foo, + help='help for string foo', hidden=False) + proj.add_option('--bar', init=0, + type=int, check=check_bar, + help='help for int bar', hidden=False) + proj.add_option('--qux', init=None, + type=int, check=check_qux, + help='help for int qux', hidden=False) + proj.add_option('VAR', init='', + type=str, check=check_var, + help='help for string VAR', hidden=False) + + build = Build(proj, '.') + build.configure(['--alias'], {'VAR': 'value'}) + self.assertEqual(build.vars, + { + 'FOO': ('B', 'command-line'), + 'BAR': (1, 'command-line'), + 'QUX': (None, 'default'), + 'VAR': ('value', 'environment'), + }) diff --git a/attoconf/tests/test_help.py b/attoconf/tests/test_help.py new file mode 100644 index 0000000..ea42c28 --- /dev/null +++ b/attoconf/tests/test_help.py @@ -0,0 +1,195 @@ +# Copyright 2013 Ben Longbons +# +# This file is part of attoconf. +# +# attoconf is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# attoconf is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with attoconf. If not, see . + +from __future__ import print_function, division, absolute_import + +import unittest + +from attoconf.help import Help, HelpSection, put_line_in_width + +from cStringIO import StringIO + +class TestHelpSection(unittest.TestCase): + def test_basic(self): + sec = HelpSection() + sec.add_text('foo', False) + sec.add_option('--foo', 'FOO', True) + sec.add_text('bar', True) + sec.add_option('--bar', 'BAR', False) + self.assertEqual(sec.headers, [(False, 'foo'), (True, 'bar')]) + self.assertEqual(sec.options, [(True, '--foo', 'FOO'), (False, '--bar', 'BAR')]) + + out = StringIO() + sec.print(out, False, float('inf')) + self.assertEqual(out.getvalue(), '''foo + --bar BAR +''') + + out = StringIO() + sec.print(out, True, float('inf')) + self.assertEqual(out.getvalue(), '''foo +bar + --foo FOO + --bar BAR +''') + + def test_width(self): + out = StringIO() + put_line_in_width(out, 'foo bar baz', float('inf'), 0) + self.assertEqual(out.getvalue(), 'foo bar baz\n') + + out = StringIO() + put_line_in_width(out, 'foo bar baz', 10, 0) + self.assertEqual(out.getvalue(), 'foo bar\nbaz\n') + + out = StringIO() + put_line_in_width(out, 'foo bar baz', 10, 2) + self.assertEqual(out.getvalue(), 'foo bar\n baz\n') + + out = StringIO() + put_line_in_width(out, ' foo bar baz', 10, 0) + self.assertEqual(out.getvalue(), ' foo bar\nbaz\n') + + out = StringIO() + put_line_in_width(out, ' foo bar baz', 10, 0) + self.assertEqual(out.getvalue(), ' foo\nbar baz\n') + + out = StringIO() + put_line_in_width(out, ' foo bar baz', 10, 3) + self.assertEqual(out.getvalue(), ' foo\n bar baz\n') + + out = StringIO() + put_line_in_width(out, ' foo bar baz', 10, 4) + self.assertEqual(out.getvalue(), ' foo\n bar\n baz\n') + + out = StringIO() + put_line_in_width(out, 'really-long-string', float('inf'), 0) + self.assertEqual(out.getvalue(), 'really-long-string\n') + + out = StringIO() + put_line_in_width(out, ' really-long-string', float('inf'), 0) + self.assertEqual(out.getvalue(), ' really-long-string\n') + + out = StringIO() + put_line_in_width(out, 'really-long-string', 10, 0) + self.assertEqual(out.getvalue(), 'really-long-string\n') + + out = StringIO() + put_line_in_width(out, ' really-long-string', 10, 0) + self.assertEqual(out.getvalue(), ' really-long-string\n') + + out = StringIO() + put_line_in_width(out, 'short really-long-string', float('inf'), 0) + self.assertEqual(out.getvalue(), 'short really-long-string\n') + + out = StringIO() + put_line_in_width(out, ' short really-long-string', float('inf'), 0) + self.assertEqual(out.getvalue(), ' short really-long-string\n') + + out = StringIO() + put_line_in_width(out, 'short really-long-string', 10, 0) + self.assertEqual(out.getvalue(), 'short\nreally-long-string\n') + + out = StringIO() + put_line_in_width(out, ' short really-long-string', 10, 0) + self.assertEqual(out.getvalue(), ' short\nreally-long-string\n') + + out = StringIO() + put_line_in_width(out, 'short really-long-string', 10, 1) + self.assertEqual(out.getvalue(), 'short\n really-long-string\n') + + out = StringIO() + put_line_in_width(out, ' short really-long-string', 10, 1) + self.assertEqual(out.getvalue(), ' short\n really-long-string\n') + + def test_print(self): + sec = HelpSection() + sec.add_option('--abcdefghijklmnopqrstuvwxyz', + 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', False) + + out = StringIO() + sec.print(out, False, 80) + self.assertEqual(out.getvalue(), ''' + --abcdefghijklmnopqrstuvwxyz + ABCDEFGHIJKLMNOPQRSTUVWXYZ +'''[1:]) + + sec.add_option('--foo', 'FOO', False) + sec.add_option('--frob', 'FROB', False) + + out = StringIO() + sec.print(out, False, 80) + self.assertEqual(out.getvalue(), ''' + --abcdefghijklmnopqrstuvwxyz + ABCDEFGHIJKLMNOPQRSTUVWXYZ + --foo FOO + --frob FROB +'''[1:]) + + out = StringIO() + sec.print(out, False, float('inf')) + self.assertEqual(out.getvalue(), ''' + --abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ + --foo FOO + --frob FROB +'''[1:]) + + +class TestHelp(unittest.TestCase): + def test_print(self): + help = Help() + help.add_option('--invisible', 'You can\'t see this', True) + help.add_text('General:', False) + help.add_option('--help', 'show this', False) + help.add_option('--version', 'show that', True) + help.add_text('Other stuff:', False) + help.add_text('with long header:', True) + help.add_option('--foo-lets-make-it-long-just-because', 'I\'m bored', False) + help.add_text('Visibility:', False) + help.add_option('--sneaky', 'This may be surprising. It also works as a demonstration of multi-line wrapping, just because.', True) + + out = StringIO() + help.print(out, True, 80) + self.assertEqual(out.getvalue(), ''' + --invisible You can't see this + +General: + --help show this + --version show that + +Other stuff: +with long header: + --foo-lets-make-it-long-just-because + I'm bored + +Visibility: + --sneaky This may be surprising. It also works as a demonstration of + multi-line wrapping, just because. + +'''[1:]) + + out = StringIO() + help.print(out, False, 80) + self.assertEqual(out.getvalue(), ''' +General: + --help show this + +Other stuff: + --foo-lets-make-it-long-just-because + I'm bored + +'''[1:]) diff --git a/attoconf/tests/test_version.py b/attoconf/tests/test_version.py new file mode 100644 index 0000000..1ce855d --- /dev/null +++ b/attoconf/tests/test_version.py @@ -0,0 +1,94 @@ +# Copyright 2013 Ben Longbons +# +# This file is part of attoconf. +# +# attoconf is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# attoconf is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with attoconf. If not, see . + +from __future__ import print_function, division, absolute_import + +import unittest + +from attoconf.version import require_version, string as version_string + +class TestVersion(unittest.TestCase): + def test_parse(self): + # don't do this + name, version, dist = version_string.split(' ', 2) + self.assertEqual(name, 'attoconf') + major, minor, patch = [int(x) for x in version.split('.')] + assert dist.startswith('(') + assert dist.endswith(')') + dist = dist[1:-1] + assert '(' not in dist + assert ')' not in dist + assert '\n' not in dist + from attoconf._version import distributor + self.assertEqual(dist, distributor) + + def test_check(self): + from attoconf._version import major, minor, patch + with self.assertRaises(SystemExit): + require_version(major - 1, minor - 1, patch - 1) + with self.assertRaises(SystemExit): + require_version(major - 1, minor - 1, patch + 0) + with self.assertRaises(SystemExit): + require_version(major - 1, minor - 1, patch + 1) + with self.assertRaises(SystemExit): + require_version(major - 1, minor + 0, patch - 1) + with self.assertRaises(SystemExit): + require_version(major - 1, minor + 0, patch + 0) + with self.assertRaises(SystemExit): + require_version(major - 1, minor + 0, patch + 1) + with self.assertRaises(SystemExit): + require_version(major - 1, minor + 1, patch - 1) + with self.assertRaises(SystemExit): + require_version(major - 1, minor + 1, patch + 0) + with self.assertRaises(SystemExit): + require_version(major - 1, minor + 1, patch + 1) + if 1: + require_version(major + 0, minor - 1, patch - 1) + if 1: + require_version(major + 0, minor - 1, patch + 0) + if 1: + require_version(major + 0, minor - 1, patch + 1) + if 1: + require_version(major + 0, minor + 0, patch - 1) + if 1: + require_version(major + 0, minor + 0, patch + 0) + with self.assertRaises(SystemExit): + require_version(major + 0, minor + 0, patch + 1) + with self.assertRaises(SystemExit): + require_version(major + 0, minor + 1, patch - 1) + with self.assertRaises(SystemExit): + require_version(major + 0, minor + 1, patch + 0) + with self.assertRaises(SystemExit): + require_version(major + 0, minor + 1, patch + 1) + with self.assertRaises(SystemExit): + require_version(major + 1, minor - 1, patch - 1) + with self.assertRaises(SystemExit): + require_version(major + 1, minor - 1, patch + 0) + with self.assertRaises(SystemExit): + require_version(major + 1, minor - 1, patch + 1) + with self.assertRaises(SystemExit): + require_version(major + 1, minor + 0, patch - 1) + with self.assertRaises(SystemExit): + require_version(major + 1, minor + 0, patch + 0) + with self.assertRaises(SystemExit): + require_version(major + 1, minor + 0, patch + 1) + with self.assertRaises(SystemExit): + require_version(major + 1, minor + 1, patch - 1) + with self.assertRaises(SystemExit): + require_version(major + 1, minor + 1, patch + 0) + with self.assertRaises(SystemExit): + require_version(major + 1, minor + 1, patch + 1) diff --git a/demo-project/configure b/demo-project/configure index 8f09a35..dc29870 100755 --- a/demo-project/configure +++ b/demo-project/configure @@ -23,7 +23,7 @@ import os import sys from attoconf.version import require_version, string as version_string -require_version(0, 0) +require_version(0, 1) from attoconf.core import Project, Build diff --git a/test-everything.sh b/test-everything.sh new file mode 100755 index 0000000..e16866b --- /dev/null +++ b/test-everything.sh @@ -0,0 +1,2 @@ +#!/bin/sh +python -m unittest discover "$@" -- cgit v1.2.3-70-g09d2 From 3a475005ce9f48b6bbf45a18660dbed6c4921269 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Sun, 4 Aug 2013 19:39:49 -0700 Subject: Add travis info --- .travis.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..f1aeb7f --- /dev/null +++ b/.travis.yml @@ -0,0 +1,16 @@ +language: python +python: + - "2.7" + - "pypy" +install: ":" +script: ./test-everything.sh + +notifications: + email: + on_success: changed + on_failure: always + irc: + channels: "chat.freenode.net#tmwa" + on_success: always + on_failure: always + use_notice: true -- cgit v1.2.3-70-g09d2 From d7bb91cd264300351e94e37a84b1de45f2312745 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Mon, 5 Aug 2013 15:41:04 -0700 Subject: Add a classy API, and use it to implement all the common options --- .gitignore | 1 + attoconf/_version.py | 2 +- attoconf/classy.py | 112 ++++++++++++++++ attoconf/core.py | 26 ++-- attoconf/help.py | 8 +- attoconf/lib/__init__.py | 0 attoconf/lib/arches.py | 68 ++++++++++ attoconf/lib/c.py | 268 +++++++++++++++++++++++++++++++++++++ attoconf/lib/install.py | 320 ++++++++++++++++++++++++++++++++++++++++++++ attoconf/lib/make.py | 94 +++++++++++++ attoconf/tests/test_core.py | 12 +- demo-project/Makefile.in | 9 ++ demo-project/configure | 54 ++++++-- demo-project/header.c | 16 +++ demo-project/hello.c | 25 ++++ demo-project/hello.h | 22 +++ demo-project/main.c | 24 ++++ test-everything.sh | 9 +- 18 files changed, 1044 insertions(+), 26 deletions(-) create mode 100644 attoconf/classy.py create mode 100644 attoconf/lib/__init__.py create mode 100644 attoconf/lib/arches.py create mode 100644 attoconf/lib/c.py create mode 100644 attoconf/lib/install.py create mode 100644 attoconf/lib/make.py create mode 100644 demo-project/Makefile.in create mode 100644 demo-project/header.c create mode 100644 demo-project/hello.c create mode 100644 demo-project/hello.h create mode 100644 demo-project/main.c diff --git a/.gitignore b/.gitignore index 0d20b64..926df93 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.pyc +/demo-build/ diff --git a/attoconf/_version.py b/attoconf/_version.py index 8d9820c..1b6e204 100644 --- a/attoconf/_version.py +++ b/attoconf/_version.py @@ -7,7 +7,7 @@ major = 0 # Incremented for releases with compatible API additions. # This is the number that is usually incremented. -minor = 1 +minor = 2 # Incremented if there is a bugfix release. # Might not be contiguous. diff --git a/attoconf/classy.py b/attoconf/classy.py new file mode 100644 index 0000000..f390ebc --- /dev/null +++ b/attoconf/classy.py @@ -0,0 +1,112 @@ +# Copyright 2013 Ben Longbons +# +# This file is part of attoconf. +# +# attoconf is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# attoconf is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with attoconf. If not, see . + +from __future__ import print_function, division, absolute_import + +from .core import Project, Build + +# TODO: put this in a metaclass +# some of the init/jiggle logic would also be simplified by a metaclass +def add_slots(cls): + ''' A decorator that fixes __slots__ after multiple inheritance. + ''' + return type(cls.__name__, cls.__bases__, + dict(cls.__dict__, __slots__=cls.slots())) + +class ClassyProject(Project): + ''' A more convenient, objectish, way of setting up a project. + ''' + __slots__ = () + @classmethod + def slots(self): + ''' slots don't work too well with multiple inheritance, + so make the most-derived class create all the slots + ''' + return () + + def __init__(self, srcdir): + super(ClassyProject, self).__init__(srcdir) + + def jiggle(self): + self.general() + self.paths() + self.arches() + self.vars() + self.features() + self.packages() + + if 0: + self.tests() + self.post() + + def general(self): + ''' Registration hook for general options (usually unneeded). + ''' + self.add_help('General:', hidden=False) + self.add_alias('--help', ['--help=default'], + help='display standard help, then exit', hidden=False) + self.add_option('--help', init=None, + type=self.do_help, check=None, + help='display some kind of help', hidden=False, + help_var='KIND') + self.help.add_option('--help=hidden', + help='display help you should never ever ever care about', + hidden=False) + + def paths(self): + ''' Registration hook for path-related options. + (--prefix, --bindir, etc) + + Probably only used by attoconf.lib.install. + ''' + + def arches(self): + ''' Registration hook for arch-related options. + (--build, --host, and sometimes --target) + + Typically this changes the prefix of the compiler. + ''' + + def vars(self): + ''' Environment variables (usually capital, don't start with a --). + + Usually there is one or two of these for every program needed. + ''' + + def features(self): + ''' Customizations for this package (--enable-*). + ''' + + def packages(self): + ''' Settings related to dependencies (--with-*). + ''' + + if 0: # not sure if really needed + def tests(self): + ''' Late tests, but still before post. + + ''' + + def post(self): + ''' Special hook for things that need to be done at the very end. + + attoconf.post.make + ''' + + # okay, no more registration hooks + def build(self, bindir): + return Build(self, bindir) diff --git a/attoconf/core.py b/attoconf/core.py index 8b53209..38ba485 100644 --- a/attoconf/core.py +++ b/attoconf/core.py @@ -28,7 +28,7 @@ Option = namedtuple('Option', ['type', 'init']) class ArgumentError(Exception): pass def as_var(name): - return name.lstrip('-').upper() + return name.lstrip('-').replace('-', '_').upper() def trim_trailing_slashes(path): p, s = os.path.split(path) @@ -95,7 +95,9 @@ class Project(object): if name in self.options: raise KeyError(name) self.options[name] = Option(init=init, type=type) - self.checks.append(lambda bld: check(bld, bld.vars[as_var(name)][0])) + if check is not None: + self.checks.append( + lambda bld: check(bld, bld.vars[as_var(name)][0]) ) if help_var is None: help_var = as_var(name) if help_def is None: @@ -125,15 +127,15 @@ class Build(object): ''' A Build is a directory and set of options applied to a Project. ''' __slots__ = ( - 'bindir', + 'builddir', 'project', 'vars', ) - def __init__(self, project, bindir): + def __init__(self, project, builddir): ''' A Build is initially constructed from a project and a build dir. ''' self.project = project - self.bindir = trim_trailing_slashes(bindir) + self.builddir = trim_trailing_slashes(builddir) self.vars = {as_var(k): (o.init, 'default') for k, o in project.options.iteritems()} @@ -173,7 +175,9 @@ class Build(object): ''' First apply variables from the environment, then call apply_arg() a bunch of times, then finish(). ''' - for k in self.vars: + for k in self.project.options: + if k != as_var(k): + continue val = env.get(k) if val is not None: self.vars[k] = (self.project.options[k].type(val), 'environment') @@ -186,5 +190,11 @@ class Build(object): def relative_source(self): ''' Return a relative path from the build tree to the source tree. ''' - return os.path.relpath(os.path.realpath(self.project.srcdir), - os.path.realpath(self.bindir)) + srcdir = self.project.srcdir + builddir = self.builddir + if os.path.isabs(srcdir): + return srcdir + if os.path.isabs(builddir): + return os.path.realpath(srcdir) + return os.path.relpath(os.path.realpath(srcdir), + os.path.realpath(builddir)) diff --git a/attoconf/help.py b/attoconf/help.py index 610efde..0fbc0a3 100644 --- a/attoconf/help.py +++ b/attoconf/help.py @@ -140,23 +140,23 @@ class Help(object): ''' self.sections = [] - def add_text(self, text, hidden): + def add_text(self, help, hidden): ''' Add a header line. This creates a new section if the last line wasn't a header. ''' if not self.sections or self.sections[-1].options: self.sections.append(HelpSection()) - self.sections[-1].add_text(text, hidden) + self.sections[-1].add_text(help, hidden) - def add_option(self, name, text, hidden): + def add_option(self, name, help, hidden): ''' Add an option with its description to the current section. This creates a new section only if it is first. ''' if not self.sections: self.sections.append(HelpSection()) - self.sections[-1].add_option(name, text, hidden) + self.sections[-1].add_option(name, help, hidden) def print(self, file, hidden, width=0): ''' Print all the help at the given level of hidden-ness. diff --git a/attoconf/lib/__init__.py b/attoconf/lib/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/attoconf/lib/arches.py b/attoconf/lib/arches.py new file mode 100644 index 0000000..bafef38 --- /dev/null +++ b/attoconf/lib/arches.py @@ -0,0 +1,68 @@ +# Copyright 2013 Ben Longbons +# +# This file is part of attoconf. +# +# attoconf is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# attoconf is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with attoconf. If not, see . + +from __future__ import print_function, division, absolute_import + +from ..classy import ClassyProject + +def triple(s): + # Triples do not, in fact, follow a regular pattern. + # Some have only two segments, some appear to have four ... + # Also, sometimes a wrong thing is used as a triple. + # All we *really* care about is generating the tool names. + if s.startswith('-') or s.endswith('-') or '-' not in s[1:-1]: + raise ValueError('Probably not a triple') + return s + +def host(build, HOST): + if HOST is None: + BUILD, origin = build.vars['BUILD'] + if origin != 'default': + origin = 'derived from BUILD' + build.vars['HOST'] = (BUILD, origin) + +def target(build, TARGET): + if TARGET is None: + HOST, origin = build.vars['HOST'] + if origin != 'default': + origin = 'derived from HOST' + build.vars['TARGET'] = (HOST, origin) + +class Arches2(ClassyProject): + __slots__ = () + + def arches(self): + super(Arches2, self).arches() + self.add_help('System types:', hidden=False) + self.add_option('--build', init=None, + type=triple, check=None, + help='configure for building on BUILD', hidden=False, + help_def='native') + self.add_option('--host', init=None, + type=triple, check=host, + help='cross-compile to build programs to run on HOST', + hidden=False, help_def='BUILD') + +# TODO figure out the mro implications when I use this +class Arches3(Arches2): + __slots__ = () + def arches(self): + super(Arches3, self).arches() + self.add_option('--target', init=None, + type=triple, check=target, + help='configure for building compilers for TARGET', + hidden=False, help_def='HOST') diff --git a/attoconf/lib/c.py b/attoconf/lib/c.py new file mode 100644 index 0000000..4d3f252 --- /dev/null +++ b/attoconf/lib/c.py @@ -0,0 +1,268 @@ +# Copyright 2013 Ben Longbons +# +# This file is part of attoconf. +# +# attoconf is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# attoconf is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with attoconf. If not, see . + +from __future__ import print_function, division, absolute_import + +import errno +import os +from shlex import split as shell +import subprocess + +from .arches import Arches2 + +class TestError(Exception): + pass + +def do_exec(build, args): + p = subprocess.Popen(args, cwd=build.builddir, + stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT) + out, _ = p.communicate() + retcode = p.wait() + return retcode, out + + +class TempFile: + ''' context manager that optionally creates and then removes a file + ''' + __slots__ = ('filename') + + def __init__(self, filename, content): + self.filename = filename + if content is not None: + with open(filename, 'wx') as of: + of.write(content) + else: + # TODO: raise OSError(errno.EEXIST) if file already exists + pass + + def __enter__(self): + pass + + def __exit__(self, type, value, traceback): + try: + os.remove(self.filename) + except OSError as e: + if e.errno != errno.ENOENT: + raise + + +def try_compile_c(build, body, CFLAGS=[], CPPFLAGS=[]): + CC = build.vars['CC'][0] + CFLAGS = build.vars['CFLAGS'][0] + CFLAGS + CPPFLAGS = build.vars['CPPFLAGS'][0] + CPPFLAGS + in_ = 'atto-test.c' + ins = [in_] + out = 'atto-test.o' + + args = CC + CFLAGS + CPPFLAGS + ['-c', '-o', out, in_] + with TempFile(in_, body), TempFile(out, None): + status, error = do_exec(build, args) + if status: + raise TestError(error) + +def try_compile_link_c(build, body, CFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LDLIBS=[]): + CC = build.vars['CC'][0] + CFLAGS = build.vars['CFLAGS'][0] + CFLAGS + CPPFLAGS = build.vars['CPPFLAGS'][0] + CPPFLAGS + LDFLAGS = build.vars['LDFLAGS'][0] + LDFLAGS + LDLIBS = build.vars['LDLIBS'][0] + LDLIBS + in_ = 'atto-test.c' + ins = [in_] + out = 'atto-test' + + args = CC + CFLAGS + CPPFLAGS + LDFLAGS + ins + LDLIBS + ['-o', out] + with TempFile(in_, body), TempFile(out, None): + status, error = do_exec(build, args) + if status: + raise TestError(error) + +def try_compile_cxx(build, body, CXXFLAGS=[], CPPFLAGS=[]): + CXX = build.vars['CXX'][0] + CXXFLAGS = build.vars['CXXFLAGS'][0] + CXXFLAGS + CPPFLAGS = build.vars['CPPFLAGS'][0] + CPPFLAGS + in_ = 'atto-test.cxx' + out = 'atto-test.o' + + args = CXX + CXXFLAGS + CPPFLAGS + ['-c', '-o', out, in_] + with TempFile(in_, body), TempFile(out, None): + status, error = do_exec(build, args) + if status: + raise TestError(error) + +def try_compile_link_cxx(build, body, CXXFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LDLIBS=[]): + CXX = build.vars['CXX'][0] + CXXFLAGS = build.vars['CXXFLAGS'][0] + CXXFLAGS + CPPFLAGS = build.vars['CPPFLAGS'][0] + CPPFLAGS + LDFLAGS = build.vars['LDFLAGS'][0] + LDFLAGS + LDLIBS = build.vars['LDLIBS'][0] + LDLIBS + in_ = 'atto-test.cxx' + out = 'atto-test' + + args = CXX + CXXFLAGS + CPPFLAGS + LDFLAGS + ins + LDLIBS + ['-o', out] + with TempFile(in_, body), TempFile(out, None): + status, error = do_exec(build, args) + if status: + raise TestError(error) + +if 0: + def try_linkonly_c(build, ins, LDFLAGS=[], LDLIBS=[]): + CC = build.vars['CC'][0] + LDFLAGS = build.vars['LDFLAGS'][0] + LDFLAGS + LDLIBS = build.vars['LDLIBS'][0] + LDLIBS + out = 'atto-test' + + args = CC + LDFLAGS + ins + LDLIBS + ['-o', out] + with TempFile(out, None): + status, error = do_exec(build, args) + if status: + raise TestError(error) + +def try_compile_link2_c(build, body, CFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LDLIBS=[]): + CC = build.vars['CC'][0] + CFLAGS = build.vars['CFLAGS'][0] + CFLAGS + CPPFLAGS = build.vars['CPPFLAGS'][0] + CPPFLAGS + LDFLAGS = build.vars['LDFLAGS'][0] + LDFLAGS + LDLIBS = build.vars['LDLIBS'][0] + LDLIBS + in_ = 'atto-test.c' + ins = [in_] + mid = 'atto-test.o' + mids = [mid] + out = 'atto-test' + + args1 = CC + CFLAGS + CPPFLAGS + ['-c', '-o', mid, in_] + args2 = CC + LDFLAGS + mids + LDLIBS + ['-o', out] + with TempFile(mid, None): + with TempFile(in_, body): + status, error = do_exec(build, args1) + if status: + raise TestError(error) + + with TempFile(out, None): + status, error = do_exec(build, args2) + if status: + raise TestError(error) + +if 0: + def try_linkonly_cxx(build, ins, LDFLAGS=[], LDLIBS=[]): + CXX = build.vars['CXX'][0] + LDFLAGS = build.vars['LDFLAGS'][0] + LDFLAGS + LDLIBS = build.vars['LDLIBS'][0] + LDLIBS + out = 'atto-test' + + args = CXX + LDFLAGS + ins + LDLIBS + ['-o', out] + with TempFile(out, None): + status, error = do_exec(build, args) + if status: + raise TestError(error) + +def try_compile_link2_cxx(build, body, CXXFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LDLIBS=[]): + CXX = build.vars['CXX'][0] + CXXFLAGS = build.vars['CXXFLAGS'][0] + CXXFLAGS + CPPFLAGS = build.vars['CPPFLAGS'][0] + CPPFLAGS + LDFLAGS = build.vars['LDFLAGS'][0] + LDFLAGS + LDLIBS = build.vars['LDLIBS'][0] + LDLIBS + in_ = 'atto-test.cxx' + ins = [in_] + mid = 'atto-test.o' + mids = [mid] + out = 'atto-test' + + args1 = CXX + CXXFLAGS + CPPFLAGS + ['-c', '-o', mid, in_] + args2 = CXX + LDFLAGS + mids + LDLIBS + ['-o', out] + with TempFile(mid, None): + with TempFile(in_, body): + status, error = do_exec(build, args1) + if status: + raise TestError(error) + + with TempFile(out, None): + status, error = do_exec(build, args2) + if status: + raise TestError(error) + + +def ldflags(build, LDFLAGS): + pass + +def libs(build, LIBS): + # Make expects something different + build.vars['LDLIBS'] = build.vars['LIBS'] + del build.vars['LIBS'] + +def cppflags(build, CPPFLAGS): + pass + +def cc(build, CC): + pass + +def cflags(build, CFLAGS): + try_compile_c(build, 'int main() {}\n') + try_compile_link_c(build, 'int main() {}\n') + try_compile_link2_c(build, 'int main() {}\n') + +def cxx(build, CXX): + pass + +def cxxflags(build, CXXFLAGS): + try_compile_cxx(build, 'int main() {}\n') + try_compile_link_cxx(build, 'int main() {}\n') + try_compile_link2_cxx(build, 'int main() {}\n') + +class Link(Arches2): + __slots__ = () + def vars(self): + super(Link, self).vars() + self.add_option('LDFLAGS', init=[], + type=shell, check=ldflags, + help='linker flags, e.g. -L if you have libraries in a nonstandard directory ', + hidden=False) + self.add_option('LIBS', init=[], + type=shell, check=libs, + help='libraries to pass to the linker, e.g. -l', + hidden=False) + +class Preprocess(Arches2): + __slots__ = () + def vars(self): + super(Preprocess, self).vars() + self.add_option('CPPFLAGS', init=[], + type=shell, check=cppflags, + help='C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory ', + hidden=False) + +class C(Link, Preprocess): + __slots__ = () + def vars(self): + super(C, self).vars() + self.add_option('CC', init=['gcc'], + type=shell, check=cc, + help='C compiler command', hidden=False) + self.add_option('CFLAGS', init=[], + type=shell, check=cflags, + help='C compiler flags', hidden=False) + +class Cxx(Link, Preprocess): + __slots__ = () + def vars(self): + super(Cxx, self).vars() + self.add_option('CXX', init=['g++'], + type=shell, check=cxx, + help='C++ compiler command', hidden=False) + self.add_option('CXXFLAGS', init=[], + type=shell, check=cxxflags, + help='C++ compiler flags', hidden=False) diff --git a/attoconf/lib/install.py b/attoconf/lib/install.py new file mode 100644 index 0000000..3e135e8 --- /dev/null +++ b/attoconf/lib/install.py @@ -0,0 +1,320 @@ +# Copyright 2013 Ben Longbons +# +# This file is part of attoconf. +# +# attoconf is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# attoconf is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with attoconf. If not, see . + +from __future__ import print_function, division, absolute_import + +import os + +from ..classy import ClassyProject +from ..core import trim_trailing_slashes + + +def word(s): + if ' ' in s: + raise ValueError('not a word: %s' % s) + return s + + +def version(s): + if s.startswith('v'): + s = s[1:] + [int(b) for b in s.split('.')] + return s + + +def filepath(s): + s = trim_trailing_slashes(s) + # must be absolute *and* canonical + if s != os.path.abspath(s): + raise ValueError('Not an absolute, canonical pathname: %s' % s) + return s + + +def exec_prefix(build, EPREFIX): + if EPREFIX is None: + PREFIX, origin = build.vars['PREFIX'] + if origin != 'default': + origin = 'derived from PREFIX' + build.vars['EXEC_PREFIX'] = (PREFIX, origin) + # is this a good idea? is there a better way? + # how will this interfere with hashing? + # at least we don't have to worry about the environment ... + build.vars['EPREFIX'] = build.vars['EXEC_PREFIX'] + del build.vars['EXEC_PREFIX'] + +def bindir(build, DIR): + if DIR is None: + EPREFIX, origin = build.vars['EPREFIX'] + if origin != 'default': + origin = 'derived from EPREFIX' + build.vars['BINDIR'] = (os.path.join(EPREFIX, 'bin'), origin) + +def sbindir(build, DIR): + if DIR is None: + EPREFIX, origin = build.vars['EPREFIX'] + if origin != 'default': + origin = 'derived from EPREFIX' + build.vars['SBINDIR'] = (os.path.join(EPREFIX, 'sbin'), origin) + +def libexecdir(build, DIR): + if DIR is None: + EPREFIX, origin = build.vars['EPREFIX'] + if origin != 'default': + origin = 'derived from EPREFIX' + build.vars['LIBEXECDIR'] = (os.path.join(EPREFIX, 'libexec'), origin) + +def sysconfdir(build, DIR): + if DIR is None: + PREFIX, origin = build.vars['PREFIX'] + if origin != 'default': + origin = 'derived from PREFIX' + build.vars['SYSCONFDIR'] = (os.path.join(PREFIX, 'etc'), origin) + +def sharedstatedir(build, DIR): + if DIR is None: + PREFIX, origin = build.vars['PREFIX'] + if origin != 'default': + origin = 'derived from PREFIX' + build.vars['SHAREDSTATEDIR'] = (os.path.join(PREFIX, 'com'), origin) + +def localstatedir(build, DIR): + if DIR is None: + PREFIX, origin = build.vars['PREFIX'] + if origin != 'default': + origin = 'derived from PREFIX' + build.vars['LOCALSTATEDIR'] = (os.path.join(PREFIX, 'var'), origin) + +def libdir(build, DIR): + if DIR is None: + EPREFIX, origin = build.vars['EPREFIX'] + if origin != 'default': + origin = 'derived from EPREFIX' + build.vars['LIBDIR'] = (os.path.join(EPREFIX, 'lib'), origin) + +def includedir(build, DIR): + if DIR is None: + PREFIX, origin = build.vars['PREFIX'] + if origin != 'default': + origin = 'derived from PREFIX' + build.vars['INCLUDEDIR'] = (os.path.join(PREFIX, 'include'), origin) + +def datarootdir(build, DIR): + if DIR is None: + PREFIX, origin = build.vars['PREFIX'] + if origin != 'default': + origin = 'derived from PREFIX' + build.vars['DATAROOTDIR'] = (os.path.join(PREFIX, 'share'), origin) + +def datadir(build, DIR): + if DIR is None: + DATAROOTDIR, origin = build.vars['DATAROOTDIR'] + if origin != 'default': + origin = 'derived from DATAROOTDIR' + build.vars['DATADIR'] = (DATAROOTDIR, origin) + +def packagedatadir(build, DIR): + if DIR is None: + DATADIR, origin = build.vars['DATADIR'] + PACKAGE, prigin = build.vars['PACKAGE'] + if origin != 'default' or prigin != 'default': + origin = 'derived from DATADIR and PACKAGE' + build.vars['DATADIR'] = (os.path.join(DATADIR, PACKAGE), origin) + +def infodir(build, DIR): + if DIR is None: + DATAROOTDIR, origin = build.vars['DATAROOTDIR'] + if origin != 'default': + origin = 'derived from DATAROOTDIR' + build.vars['INFODIR'] = (os.path.join(DATAROOTDIR, 'info'), origin) + +def localedir(build, DIR): + if DIR is None: + DATAROOTDIR, origin = build.vars['DATAROOTDIR'] + if origin != 'default': + origin = 'derived from DATAROOTDIR' + build.vars['LOCALEDIR'] = (os.path.join(DATAROOTDIR, 'locale'), origin) + +def mandir(build, DIR): + if DIR is None: + DATAROOTDIR, origin = build.vars['DATAROOTDIR'] + if origin != 'default': + origin = 'derived from DATAROOTDIR' + build.vars['MANDIR'] = (os.path.join(DATAROOTDIR, 'man'), origin) + +def docdir(build, DIR): + if DIR is None: + DATAROOTDIR, origin = build.vars['DATAROOTDIR'] + PACKAGE, origin2 = build.vars['PACKAGE'] + if origin != 'default' or origin2 != 'default': + origin = 'derived from DATAROOTDIR and PACKAGE' + build.vars['DOCDIR'] = (os.path.join(DATAROOTDIR, 'doc', PACKAGE), origin) + +def htmldir(build, DIR): + if DIR is None: + DOCDIR, origin = build.vars['DOCDIR'] + if origin != 'default': + origin = 'derived from DOCDIR' + build.vars['HTMLDIR'] = (DOCDIR, origin) + +def dvidir(build, DIR): + if DIR is None: + DOCDIR, origin = build.vars['DOCDIR'] + if origin != 'default': + origin = 'derived from DOCDIR' + build.vars['DVIDIR'] = (DOCDIR, origin) + +def pdfdir(build, DIR): + if DIR is None: + DOCDIR, origin = build.vars['DOCDIR'] + if origin != 'default': + origin = 'derived from DOCDIR' + build.vars['PDFDIR'] = (DOCDIR, origin) + +def psdir(build, DIR): + if DIR is None: + DOCDIR, origin = build.vars['DOCDIR'] + if origin != 'default': + origin = 'derived from DOCDIR' + build.vars['PSDIR'] = (DOCDIR, origin) + + +class Install(ClassyProject): + __slots__ = () + + @classmethod + def slots(cls): + return super(Install, cls).slots() + ( + 'package', 'package_version', 'package_name') + + def set_package(self, package, version, name): + self.package = package + self.package_version = version + self.package_name = name + + def general(self): + super(Install, self).general() + self.add_option('--package', init=self.package, + type=word, check=None, + help='Short name of this package (don\'t change!)', + hidden=True) + self.add_option('--package-version', init=self.package_version, + type=version, check=None, + help='Version of this package (change in configure)', + hidden=True, + help_var='VERSION') + self.add_option('--package-name', init=self.package_name, + type=version, check=None, + help='Long name of this package (don\'t change)', + hidden=True, + help_var='NAME') + + def paths(self): + super(Install, self).paths() + + self.add_help('Installation directories:', hidden=False) + self.add_option('--prefix', init='/usr/local', + type=filepath, check=None, + help='install architecture-independent files in PREFIX', + hidden=False) + self.add_option('--exec-prefix', init=None, + type=filepath, check=exec_prefix, + help='install architecture-dependent files in EPREFIX', + hidden=False, + help_var='EPREFIX', help_def='PREFIX') + + self.add_help('Fine tuning of the installation directories:', + hidden=False) + self.add_option('--bindir', init=None, + type=filepath, check=bindir, + help='user executables', hidden=False, + help_var='DIR', help_def='EPREFIX/bin') + self.add_option('--sbindir', init=None, + type=filepath, check=sbindir, + help='system admin executables', hidden=False, + help_var='DIR', help_def='EPREFIX/sbin') + self.add_option('--libexecdir', init=None, + type=filepath, check=libexecdir, + help='program executables', hidden=False, + help_var='DIR', help_def='EPREFIX/libexec') + self.add_option('--sysconfdir', init=None, + type=filepath, check=sysconfdir, + help='read-only single-machine data', hidden=False, + help_var='DIR', help_def='PREFIX/etc') + self.add_option('--sharedstatedir', init=None, + type=filepath, check=sharedstatedir, + help='modifiable architecture-independent data', hidden=False, + help_var='DIR', help_def='PREFIX/com') + self.add_option('--localstatedir', init=None, + type=filepath, check=localstatedir, + help='modifiable single-machine data', hidden=False, + help_var='DIR', help_def='PREFIX/var') + self.add_option('--libdir', init=None, + type=filepath, check=libdir, + help='object code libraries', hidden=False, + help_var='DIR', help_def='EPREFIX/lib') + self.add_option('--includedir', init=None, + type=filepath, check=includedir, + help='C header files', hidden=False, + help_var='DIR', help_def='PREFIX/include') + self.add_option('--oldincludedir', init='/usr/include', + type=filepath, check=None, + help='C header files for non-gcc', hidden=False, + help_var='DIR') + self.add_option('--datarootdir', init=None, + type=filepath, check=datarootdir, + help='read-only arch.-independent data root', hidden=False, + help_var='DIR', help_def='PREFIX/share') + self.add_option('--datadir', init=None, + type=filepath, check=datadir, + help='read-only architecture-independent data', hidden=False, + help_var='DIR', help_def='DATAROOTDIR') + self.add_option('--packagedatadir', init=None, + type=filepath, check=packagedatadir, + help='data specific to this package (please set datadir instead)', hidden=False, + help_var='DIR', help_def='DATADIR/PACKAGE') + self.add_option('--infodir', init=None, + type=filepath, check=infodir, + help='info documentation', hidden=False, + help_var='DIR', help_def='DATAROOTDIR/info') + self.add_option('--localedir', init=None, + type=filepath, check=localedir, + help='locale-dependent data', hidden=False, + help_var='DIR', help_def='DATAROOTDIR/locale') + self.add_option('--mandir', init=None, + type=filepath, check=mandir, + help='man documentation', hidden=False, + help_var='DIR', help_def='DATAROOTDIR/man') + self.add_option('--docdir', init=None, + type=filepath, check=docdir, + help='documentation root', hidden=False, + help_var='DIR', help_def='DATAROOTDIR/doc/PACKAGE') + self.add_option('--htmldir', init=None, + type=filepath, check=htmldir, + help='html documentation', hidden=False, + help_var='DIR', help_def='DOCDIR') + self.add_option('--dvidir', init=None, + type=filepath, check=dvidir, + help='dvi documentation', hidden=False, + help_var='DIR', help_def='DOCDIR') + self.add_option('--pdfdir', init=None, + type=filepath, check=pdfdir, + help='pdf documentation', hidden=False, + help_var='DIR', help_def='DOCDIR') + self.add_option('--psdir', init=None, + type=filepath, check=psdir, + help='ps documentation', hidden=False, + help_var='DIR', help_def='DOCDIR') diff --git a/attoconf/lib/make.py b/attoconf/lib/make.py new file mode 100644 index 0000000..e54224d --- /dev/null +++ b/attoconf/lib/make.py @@ -0,0 +1,94 @@ +# Copyright 2013 Ben Longbons +# +# This file is part of attoconf. +# +# attoconf is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# attoconf is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with attoconf. If not, see . + +from __future__ import print_function, division, absolute_import + +import os +from pipes import quote + +from ..classy import ClassyProject +from ..version import string as version_string + +blacklist = frozenset(''.join(chr(i) for i in range(0x20)) + '#$') +def validate(s): + return s == s.strip() and not frozenset(s) & blacklist + + +class MakeHook(object): + __slots__ = ('infile', 'outfile') + def __init__(self, infile, outfile): + self.infile = infile + self.outfile = outfile + + def __call__(self, build): + if self.outfile is None: + # if there are multiple backends + print('Skipping generation of a makefile') + return + with open(os.path.join(build.builddir, self.outfile), 'w') as out: + print('Generating a makefile ...') + out.write('# This part was generated by %s\n' % version_string) + out.write('SRC_DIR = %s\n' % build.relative_source()) + out.write('\n') + # TODO preserve *original* order? + for var, (val, origin) in sorted(build.vars.iteritems()): + if val is None: + if origin == 'default': + continue + # is it a good idea for Nones to survive this long? + # especially conditional ones ... + var = '# ' + var + val = 'not defined' + elif isinstance(val, list): + val = ' '.join(quote(a) for a in val) + elif isinstance(val, str): + val = quote(val) + else: + print('Assuming it\'s safe to print an instance of', + type(val).__name__, '...') + out.write('%s = %s # %s\n' % (var, val, origin)) + if self.infile is not None: + out.write('\n# The rest was copied from %s\n' % self.infile) + infile = os.path.join(build.project.srcdir, self.infile) + with open(infile) as in_: + for line in in_: + assert line.endswith('\n') + out.write(line) + + +class Make(ClassyProject): + ''' Post hook to generate a Makefile from Makefile.in + ''' + __slots__ = () + @classmethod + def slots(cls): + return super(Make, cls).slots() + ('make_in', 'make_out') + + def __init__(self, srcdir): + super(Make, self).__init__(srcdir) + self.set_make_infile('Makefile.in') + self.set_make_outfile('Makefile') # relative to build dir + + def set_make_infile(self, ipath): + self.make_in = ipath + + def set_make_outfile(self, opath): + self.make_out = opath + + def post(self): + super(Make, self).post() + self.checks.append(MakeHook(self.make_in, self.make_out)) diff --git a/attoconf/tests/test_core.py b/attoconf/tests/test_core.py index 88bf616..f9854e8 100644 --- a/attoconf/tests/test_core.py +++ b/attoconf/tests/test_core.py @@ -47,7 +47,8 @@ class TestProject(unittest.TestCase): help='display some subset of help', hidden=False, help_var='TYPE') proj.help.add_option('--help=hidden', - 'display help you should never ever ever care about', True) + help='display help you should never ever ever care about', + hidden=True) proj.add_option('--foo', init='asdf', type=str, check=None, help='set frob target', hidden=False) @@ -89,7 +90,7 @@ General: proj = Project('foo/') build = Build(proj, 'bar/') self.assertEquals(build.project.srcdir, 'foo') - self.assertEquals(build.bindir, 'bar') + self.assertEquals(build.builddir, 'bar') self.assertEquals(build.relative_source(), '../foo') def test_configure(self): @@ -119,7 +120,12 @@ General: help='help for string VAR', hidden=False) build = Build(proj, '.') - build.configure(['--alias'], {'VAR': 'value'}) + build.configure(['--alias'], + { + 'VAR': 'value', + 'QUX': 'a', + '--qux': 'b', + }) self.assertEqual(build.vars, { 'FOO': ('B', 'command-line'), diff --git a/demo-project/Makefile.in b/demo-project/Makefile.in new file mode 100644 index 0000000..8f3f4f0 --- /dev/null +++ b/demo-project/Makefile.in @@ -0,0 +1,9 @@ +vpath %.c ${SRC_DIR} +vpath %.h ${SRC_DIR} + +hello: main.o hello.o +main.o: main.c hello.h +hello.o: hello.c hello.h + +clean: + rm -f hello main.o hello.o diff --git a/demo-project/configure b/demo-project/configure index dc29870..a3e49ee 100755 --- a/demo-project/configure +++ b/demo-project/configure @@ -23,17 +23,53 @@ import os import sys from attoconf.version import require_version, string as version_string -require_version(0, 1) +require_version(0, 2) -from attoconf.core import Project, Build +from attoconf.classy import add_slots +from attoconf.lib.c import C +from attoconf.lib.install import Install +from attoconf.lib.make import Make -def main(): - print('Using', version_string) - src = Project(os.path.dirname(sys.argv[0])) - # customizations go here +@add_slots +class Configuration(C, Install, Make): + # usually you'll only have vars, features, and packages + # the rest should only be inherited + def __init__(self, srcdir): + super(Configuration, self).__init__(srcdir) + + def general(self): + super(Configuration, self).general() + + def paths(self): + super(Configuration, self).paths() + + def arches(self): + super(Configuration, self).arches() + + def vars(self): + super(Configuration, self).vars() + + def features(self): + super(Configuration, self).features() - # the rest shouldn't change - build = Build(src, '.') + def packages(self): + super(Configuration, self).packages() + + if 0: + def tests(self): + super(Configuration, self).tests() + + def post(self): + super(Configuration, self).post() + + +def main(): + proj = Configuration(os.path.dirname(sys.argv[0])) + proj.set_package('attoconf-demo', version_string.split(' ')[1], 'Demo project for attoconf') + proj.jiggle() + build = proj.build('.') build.configure(sys.argv[1:], os.environ) -main() + +if __name__ == '__main__': + main() diff --git a/demo-project/header.c b/demo-project/header.c new file mode 100644 index 0000000..f231086 --- /dev/null +++ b/demo-project/header.c @@ -0,0 +1,16 @@ +// Copyright 2013 Ben Longbons +// +// This file is part of attoconf. +// +// attoconf is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// attoconf is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with attoconf. If not, see . diff --git a/demo-project/hello.c b/demo-project/hello.c new file mode 100644 index 0000000..b018dc3 --- /dev/null +++ b/demo-project/hello.c @@ -0,0 +1,25 @@ +// Copyright 2013 Ben Longbons +// +// This file is part of attoconf. +// +// attoconf is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// attoconf is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with attoconf. If not, see . + +#include "hello.h" + +#include + +void hello(void) +{ + puts("Hello, World!"); +} diff --git a/demo-project/hello.h b/demo-project/hello.h new file mode 100644 index 0000000..899b9cc --- /dev/null +++ b/demo-project/hello.h @@ -0,0 +1,22 @@ +#ifndef HELLO_H +#define HELLO_H +// Copyright 2013 Ben Longbons +// +// This file is part of attoconf. +// +// attoconf is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// attoconf is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with attoconf. If not, see . + +void hello(void); + +#endif // HELLO_H diff --git a/demo-project/main.c b/demo-project/main.c new file mode 100644 index 0000000..2d363e2 --- /dev/null +++ b/demo-project/main.c @@ -0,0 +1,24 @@ +// Copyright 2013 Ben Longbons +// +// This file is part of attoconf. +// +// attoconf is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// attoconf is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with attoconf. If not, see . + +#include "hello.h" + +int main() +{ + hello(); + return 0; +} diff --git a/test-everything.sh b/test-everything.sh index e16866b..64fc89d 100755 --- a/test-everything.sh +++ b/test-everything.sh @@ -1,2 +1,9 @@ -#!/bin/sh +#!/bin/sh -e python -m unittest discover "$@" +mkdir -p demo-build +cd demo-build +../demo-project/configure +make +./hello +cd .. +rm -r demo-build -- cgit v1.2.3-70-g09d2 From 46e9b987ff689c1acfe29c7b980298408d1b95a6 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Mon, 5 Aug 2013 17:27:31 -0700 Subject: Add some stuff whose need became obvious when I tried to use it --- attoconf/_version.py | 2 +- attoconf/classy.py | 15 +++++++++++++++ attoconf/core.py | 3 +++ attoconf/lib/c.py | 5 +++-- attoconf/lib/lex.py | 34 ++++++++++++++++++++++++++++++++++ attoconf/lib/yacc.py | 34 ++++++++++++++++++++++++++++++++++ attoconf/types.py | 25 +++++++++++++++++++++++++ 7 files changed, 115 insertions(+), 3 deletions(-) create mode 100644 attoconf/lib/lex.py create mode 100644 attoconf/lib/yacc.py create mode 100644 attoconf/types.py diff --git a/attoconf/_version.py b/attoconf/_version.py index 1b6e204..46ab4ff 100644 --- a/attoconf/_version.py +++ b/attoconf/_version.py @@ -7,7 +7,7 @@ major = 0 # Incremented for releases with compatible API additions. # This is the number that is usually incremented. -minor = 2 +minor = 3 # Incremented if there is a bugfix release. # Might not be contiguous. diff --git a/attoconf/classy.py b/attoconf/classy.py index f390ebc..c7ecf5e 100644 --- a/attoconf/classy.py +++ b/attoconf/classy.py @@ -90,10 +90,25 @@ class ClassyProject(Project): def features(self): ''' Customizations for this package (--enable-*). ''' + self.add_help('Optional Features:', hidden=False) + # TODO add '--disable-option-checking' + self.help.add_option('--disable-FEATURE', + help='do not include FEATURE (same as --enable-FEATURE=no)', + hidden=False) + self.help.add_option('--enable-FEATURE', + help='include FEATURE (same as --enable-FEATURE=yes)', + hidden=False) def packages(self): ''' Settings related to dependencies (--with-*). ''' + self.add_help('Optional Packages:', hidden=False) + self.help.add_option('--with-PACKAGE', + help='use PACKAGE (same as --with-PACKAGE=yes)', + hidden=False) + self.help.add_option('--without-PACKAGE', + help='do not use PACKAGE (same as --with-PACKAGE=no)', + hidden=False) if 0: # not sure if really needed def tests(self): diff --git a/attoconf/core.py b/attoconf/core.py index 38ba485..0134474 100644 --- a/attoconf/core.py +++ b/attoconf/core.py @@ -19,6 +19,7 @@ from __future__ import print_function, division, absolute_import from collections import namedtuple import os +import pipes import sys from .help import Help @@ -102,6 +103,8 @@ class Project(object): help_var = as_var(name) if help_def is None: help_def = init + if isinstance(help_def, list): + help_def = ' '.join(pipes.quote(a) for a in help_def) if help_def is not None: help = '%s [%s]' % (help, help_def) diff --git a/attoconf/lib/c.py b/attoconf/lib/c.py index 4d3f252..75bf931 100644 --- a/attoconf/lib/c.py +++ b/attoconf/lib/c.py @@ -111,6 +111,7 @@ def try_compile_link_cxx(build, body, CXXFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LDLI LDFLAGS = build.vars['LDFLAGS'][0] + LDFLAGS LDLIBS = build.vars['LDLIBS'][0] + LDLIBS in_ = 'atto-test.cxx' + ins = [in_] out = 'atto-test' args = CXX + CXXFLAGS + CPPFLAGS + LDFLAGS + ins + LDLIBS + ['-o', out] @@ -252,7 +253,7 @@ class C(Link, Preprocess): self.add_option('CC', init=['gcc'], type=shell, check=cc, help='C compiler command', hidden=False) - self.add_option('CFLAGS', init=[], + self.add_option('CFLAGS', init=['-O2', '-g'], type=shell, check=cflags, help='C compiler flags', hidden=False) @@ -263,6 +264,6 @@ class Cxx(Link, Preprocess): self.add_option('CXX', init=['g++'], type=shell, check=cxx, help='C++ compiler command', hidden=False) - self.add_option('CXXFLAGS', init=[], + self.add_option('CXXFLAGS', init=['-O2', '-g'], type=shell, check=cxxflags, help='C++ compiler flags', hidden=False) diff --git a/attoconf/lib/lex.py b/attoconf/lib/lex.py new file mode 100644 index 0000000..d25455b --- /dev/null +++ b/attoconf/lib/lex.py @@ -0,0 +1,34 @@ +# Copyright 2013 Ben Longbons +# +# This file is part of attoconf. +# +# attoconf is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# attoconf is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with attoconf. If not, see . + +from __future__ import print_function, division, absolute_import + +from ..classy import ClassyProject +from .c import shell + +def flex(build, FLEX): + # TODO actually test it + pass + +class Flex(ClassyProject): + __slots__ = () + def vars(self): + super(Flex, self).vars() + self.add_option('FLEX', init=['flex'], + type=shell, check=flex, + help='Lexical analyzer command', + hidden=False) diff --git a/attoconf/lib/yacc.py b/attoconf/lib/yacc.py new file mode 100644 index 0000000..c8ddb03 --- /dev/null +++ b/attoconf/lib/yacc.py @@ -0,0 +1,34 @@ +# Copyright 2013 Ben Longbons +# +# This file is part of attoconf. +# +# attoconf is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# attoconf is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with attoconf. If not, see . + +from __future__ import print_function, division, absolute_import + +from ..classy import ClassyProject +from .c import shell + +def bison(build, BISON): + # TODO actually test it + pass + +class Bison(ClassyProject): + __slots__ = () + def vars(self): + super(Bison, self).vars() + self.add_option('BISON', init=['bison'], + type=shell, check=bison, + help='Lexical analyzer command', + hidden=False) diff --git a/attoconf/types.py b/attoconf/types.py new file mode 100644 index 0000000..6ddd37f --- /dev/null +++ b/attoconf/types.py @@ -0,0 +1,25 @@ +# Copyright 2013 Ben Longbons +# +# This file is part of attoconf. +# +# attoconf is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# attoconf is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with attoconf. If not, see . + +from __future__ import print_function, division, absolute_import + +def enum(*args): + def enum_type(s): + if s in args: + return s + raise ValueError('%r not in {%s}' % (s, ', '.join(args))) + return enum_type -- cgit v1.2.3-70-g09d2 From b26aadbf16f4873411f77f08ebdd228528c5723b Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Tue, 6 Aug 2013 14:44:13 -0700 Subject: Move all types to their own module --- attoconf/_version.py | 2 +- attoconf/core.py | 3 ++ attoconf/lib/arches.py | 10 +---- attoconf/lib/c.py | 16 ++++---- attoconf/lib/install.py | 25 +----------- attoconf/lib/lex.py | 4 +- attoconf/lib/yacc.py | 4 +- attoconf/tests/test_core.py | 13 +++--- attoconf/tests/test_types.py | 62 +++++++++++++++++++++++++++++ attoconf/types.py | 95 +++++++++++++++++++++++++++++++++++++++++--- 10 files changed, 178 insertions(+), 56 deletions(-) create mode 100644 attoconf/tests/test_types.py diff --git a/attoconf/_version.py b/attoconf/_version.py index 46ab4ff..cf56cb9 100644 --- a/attoconf/_version.py +++ b/attoconf/_version.py @@ -11,7 +11,7 @@ minor = 3 # Incremented if there is a bugfix release. # Might not be contiguous. -patch = 0 +patch = 1 # Reserved for distributors and forks. # Contains arbitrary text, but no parentheses or newlines. diff --git a/attoconf/core.py b/attoconf/core.py index 0134474..39a3298 100644 --- a/attoconf/core.py +++ b/attoconf/core.py @@ -95,6 +95,7 @@ class Project(object): ''' if name in self.options: raise KeyError(name) + assert type.__module__ == 'attoconf.types', '%s.%s' % (type.__module__, type.__name__) self.options[name] = Option(init=init, type=type) if check is not None: self.checks.append( @@ -125,6 +126,8 @@ class Project(object): raise ValueError self.help.print(sys.stdout, hidden) sys.exit() +# sneaky +Project.do_help.im_func.__module__ = 'attoconf.types' class Build(object): ''' A Build is a directory and set of options applied to a Project. diff --git a/attoconf/lib/arches.py b/attoconf/lib/arches.py index bafef38..c168292 100644 --- a/attoconf/lib/arches.py +++ b/attoconf/lib/arches.py @@ -18,15 +18,7 @@ from __future__ import print_function, division, absolute_import from ..classy import ClassyProject - -def triple(s): - # Triples do not, in fact, follow a regular pattern. - # Some have only two segments, some appear to have four ... - # Also, sometimes a wrong thing is used as a triple. - # All we *really* care about is generating the tool names. - if s.startswith('-') or s.endswith('-') or '-' not in s[1:-1]: - raise ValueError('Probably not a triple') - return s +from ..types import triple def host(build, HOST): if HOST is None: diff --git a/attoconf/lib/c.py b/attoconf/lib/c.py index 75bf931..c4eefdb 100644 --- a/attoconf/lib/c.py +++ b/attoconf/lib/c.py @@ -19,10 +19,10 @@ from __future__ import print_function, division, absolute_import import errno import os -from shlex import split as shell import subprocess from .arches import Arches2 +from ..types import ShellList class TestError(Exception): pass @@ -229,11 +229,11 @@ class Link(Arches2): def vars(self): super(Link, self).vars() self.add_option('LDFLAGS', init=[], - type=shell, check=ldflags, + type=ShellList, check=ldflags, help='linker flags, e.g. -L if you have libraries in a nonstandard directory ', hidden=False) self.add_option('LIBS', init=[], - type=shell, check=libs, + type=ShellList, check=libs, help='libraries to pass to the linker, e.g. -l', hidden=False) @@ -242,7 +242,7 @@ class Preprocess(Arches2): def vars(self): super(Preprocess, self).vars() self.add_option('CPPFLAGS', init=[], - type=shell, check=cppflags, + type=ShellList, check=cppflags, help='C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory ', hidden=False) @@ -251,10 +251,10 @@ class C(Link, Preprocess): def vars(self): super(C, self).vars() self.add_option('CC', init=['gcc'], - type=shell, check=cc, + type=ShellList, check=cc, help='C compiler command', hidden=False) self.add_option('CFLAGS', init=['-O2', '-g'], - type=shell, check=cflags, + type=ShellList, check=cflags, help='C compiler flags', hidden=False) class Cxx(Link, Preprocess): @@ -262,8 +262,8 @@ class Cxx(Link, Preprocess): def vars(self): super(Cxx, self).vars() self.add_option('CXX', init=['g++'], - type=shell, check=cxx, + type=ShellList, check=cxx, help='C++ compiler command', hidden=False) self.add_option('CXXFLAGS', init=['-O2', '-g'], - type=shell, check=cxxflags, + type=ShellList, check=cxxflags, help='C++ compiler flags', hidden=False) diff --git a/attoconf/lib/install.py b/attoconf/lib/install.py index 3e135e8..d8d6cf5 100644 --- a/attoconf/lib/install.py +++ b/attoconf/lib/install.py @@ -20,28 +20,7 @@ from __future__ import print_function, division, absolute_import import os from ..classy import ClassyProject -from ..core import trim_trailing_slashes - - -def word(s): - if ' ' in s: - raise ValueError('not a word: %s' % s) - return s - - -def version(s): - if s.startswith('v'): - s = s[1:] - [int(b) for b in s.split('.')] - return s - - -def filepath(s): - s = trim_trailing_slashes(s) - # must be absolute *and* canonical - if s != os.path.abspath(s): - raise ValueError('Not an absolute, canonical pathname: %s' % s) - return s +from ..types import shell_word, version, filepath def exec_prefix(build, EPREFIX): @@ -208,7 +187,7 @@ class Install(ClassyProject): def general(self): super(Install, self).general() self.add_option('--package', init=self.package, - type=word, check=None, + type=shell_word, check=None, help='Short name of this package (don\'t change!)', hidden=True) self.add_option('--package-version', init=self.package_version, diff --git a/attoconf/lib/lex.py b/attoconf/lib/lex.py index d25455b..5f8ff43 100644 --- a/attoconf/lib/lex.py +++ b/attoconf/lib/lex.py @@ -18,7 +18,7 @@ from __future__ import print_function, division, absolute_import from ..classy import ClassyProject -from .c import shell +from ..types import ShellList def flex(build, FLEX): # TODO actually test it @@ -29,6 +29,6 @@ class Flex(ClassyProject): def vars(self): super(Flex, self).vars() self.add_option('FLEX', init=['flex'], - type=shell, check=flex, + type=ShellList, check=flex, help='Lexical analyzer command', hidden=False) diff --git a/attoconf/lib/yacc.py b/attoconf/lib/yacc.py index c8ddb03..885bbd3 100644 --- a/attoconf/lib/yacc.py +++ b/attoconf/lib/yacc.py @@ -18,7 +18,7 @@ from __future__ import print_function, division, absolute_import from ..classy import ClassyProject -from .c import shell +from ..types import ShellList def bison(build, BISON): # TODO actually test it @@ -29,6 +29,6 @@ class Bison(ClassyProject): def vars(self): super(Bison, self).vars() self.add_option('BISON', init=['bison'], - type=shell, check=bison, + type=ShellList, check=bison, help='Lexical analyzer command', hidden=False) diff --git a/attoconf/tests/test_core.py b/attoconf/tests/test_core.py index f9854e8..c10e8c7 100644 --- a/attoconf/tests/test_core.py +++ b/attoconf/tests/test_core.py @@ -20,6 +20,7 @@ from __future__ import print_function, division, absolute_import import unittest from attoconf.core import Project, Build +from attoconf.types import uint, shell_word from cStringIO import StringIO import sys @@ -50,10 +51,10 @@ class TestProject(unittest.TestCase): help='display help you should never ever ever care about', hidden=True) proj.add_option('--foo', init='asdf', - type=str, check=None, + type=shell_word, check=None, help='set frob target', hidden=False) proj.add_option('--bar', init=None, - type=str, check=None, + type=shell_word, check=None, help='set frob source', hidden=False, help_def='FOO') @@ -107,16 +108,16 @@ General: proj.add_alias('--alias', ['--foo=A', '--bar=1', '--foo=B'], help=None, hidden=False) proj.add_option('--foo', init=None, - type=str, check=check_foo, + type=shell_word, check=check_foo, help='help for string foo', hidden=False) proj.add_option('--bar', init=0, - type=int, check=check_bar, + type=uint, check=check_bar, help='help for int bar', hidden=False) proj.add_option('--qux', init=None, - type=int, check=check_qux, + type=uint, check=check_qux, help='help for int qux', hidden=False) proj.add_option('VAR', init='', - type=str, check=check_var, + type=shell_word, check=check_var, help='help for string VAR', hidden=False) build = Build(proj, '.') diff --git a/attoconf/tests/test_types.py b/attoconf/tests/test_types.py new file mode 100644 index 0000000..662c0a3 --- /dev/null +++ b/attoconf/tests/test_types.py @@ -0,0 +1,62 @@ +# Copyright 2013 Ben Longbons +# +# This file is part of attoconf. +# +# attoconf is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# attoconf is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with attoconf. If not, see . + +from __future__ import print_function, division, absolute_import + +import unittest + +from attoconf.types import enum, ShellList + +class TestEnum(unittest.TestCase): + def test_stuff(self): + foobar = enum('foo', 'bar') + foobar('foo') + foobar('bar') + with self.assertRaisesRegexp(ValueError, "'baz' not in {foo, bar}"): + foobar('baz') + +class TestShell(unittest.TestCase): + def test_str(self): + sh0 = ShellList('\\ ') + self.assertEqual("' '", str(sh0)) + self.assertEqual([' '], sh0.list) + sh1 = ShellList(' foo ') + self.assertEqual('foo', str(sh1)) + self.assertEqual(['foo'], sh1.list) + sh2 = ShellList(' "foo bar " baz') + self.assertEqual("'foo bar ' baz", str(sh2)) + self.assertEqual(['foo bar ', 'baz'], sh2.list) + sh3 = ShellList(""" "foo\\ bar\\"" 'baz\\ qux' ''\\''' frob\\ it """) + self.assertEqual("""'foo\\ bar"' 'baz\\ qux' ''"'"'' 'frob it'""", str(sh3)) + self.assertEqual(['foo\\ bar"', 'baz\\ qux', "'", 'frob it'], sh3.list) + + def test_list(self): + sh1 = ShellList(['foo']) + self.assertEqual('foo', str(sh1)) + sh2 = ShellList(['foo bar ', 'baz']) + self.assertEqual("'foo bar ' baz", str(sh2)) + sh3 = ShellList(['foo\\ bar"', 'baz\\ qux', "'", 'frob it']) + self.assertEqual('\'foo\\ bar"\' \'baz\\ qux\' \'\'"\'"\'\' \'frob it\'', str(sh3)) + + def test_add(self): + sh0 = ShellList('') + self.assertEqual(str(sh0 + sh0), '') + self.assertEqual((sh0 + sh0).list, []) + sh1 = ShellList(['foo bar', 'baz']) + self.assertEqual(str(sh0 + sh1), "'foo bar' baz") + self.assertEqual((sh0 + sh1).list, sh1.list) + self.assertEqual(str(sh1 + sh1), "'foo bar' baz 'foo bar' baz") diff --git a/attoconf/types.py b/attoconf/types.py index 6ddd37f..f4cd178 100644 --- a/attoconf/types.py +++ b/attoconf/types.py @@ -17,9 +17,94 @@ from __future__ import print_function, division, absolute_import -def enum(*args): - def enum_type(s): - if s in args: +import os +from pipes import quote as shell_quote +from shlex import split as shell_split + +from .core import trim_trailing_slashes + + +class IntRange(object): + def __init__(self, min, max): + self.min = min + self.max = max + + def __call__(self, s): + i = int(s) + if self.min <= i <= self.max: + return i + raise ValueError('%d is out of range' % i) + +sint = IntRange(float('-inf'), float('inf')) +uint = IntRange(0, float('inf')) + + +class enum(object): + __slots__ = ('args',) + + def __init__(self, *args): + self.args = args + + def __call__(self, s): + if s in self.args: return s - raise ValueError('%r not in {%s}' % (s, ', '.join(args))) - return enum_type + raise ValueError('%r not in {%s}' % (s, ', '.join(self.args))) + + +class ShellList(object): + ''' An argument type representing a sequence of 0 or more arguments + ''' + __slots__ = ('list',) + def __init__(self, arg): + if isinstance(arg, str): + self.list = shell_split(arg) + elif isinstance(arg, list): + self.list = arg[:] + elif isinstance(arg, ShellList): + self.list = arg.list[:] + else: + raise TypeError('arg is an instance of %s' % type(arg).__name__) + + def __str__(self): + return ' '.join(shell_quote(a) for a in self.list) + + def __add__(self, other): + if isinstance(other, str): + other = shell_split(other) + elif isinstance(other, ShellList): + other = other.list + elif not isinstance(other, list): + raise TypeError('arg is an instance of %s' % type(arg).__name__) + return ShellList(self.list + other) + + +def shell_word(s): + if s != shell_quote(s): + raise ValueError('not a word: %r' % s) + return s + + +def version(s): + if s.startswith('v'): + s = s[1:] + for b in s.split('.'): + int(b) + return s + + +def filepath(s): + s = trim_trailing_slashes(s) + # must be absolute *and* canonical + if s != os.path.abspath(s): + raise ValueError('Not an absolute, canonical pathname: %s' % s) + return s + + +def triple(s): + # Triples do not, in fact, follow a regular pattern. + # Some have only two segments, some appear to have four ... + # Also, sometimes a wrong thing is used as a triple. + # All we *really* care about is generating the tool names. + if s.startswith('-') or s.endswith('-') or '-' not in s[1:-1]: + raise ValueError('Probably not a triple') + return s -- cgit v1.2.3-70-g09d2 From 9532822afccc8db328e07992313d458192f2a367 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Tue, 6 Aug 2013 15:13:03 -0700 Subject: All specifying varname, and fix bugs --- attoconf/_version.py | 2 +- attoconf/core.py | 26 ++++++++++++++------------ attoconf/lib/c.py | 10 ++++------ attoconf/lib/install.py | 13 ++++--------- attoconf/lib/make.py | 8 -------- attoconf/types.py | 6 ++++++ 6 files changed, 29 insertions(+), 36 deletions(-) diff --git a/attoconf/_version.py b/attoconf/_version.py index cf56cb9..d7460a2 100644 --- a/attoconf/_version.py +++ b/attoconf/_version.py @@ -11,7 +11,7 @@ minor = 3 # Incremented if there is a bugfix release. # Might not be contiguous. -patch = 1 +patch = 2 # Reserved for distributors and forks. # Contains arbitrary text, but no parentheses or newlines. diff --git a/attoconf/core.py b/attoconf/core.py index 39a3298..b200cc1 100644 --- a/attoconf/core.py +++ b/attoconf/core.py @@ -19,13 +19,12 @@ from __future__ import print_function, division, absolute_import from collections import namedtuple import os -import pipes import sys from .help import Help # Nothing to see here. Move along. -Option = namedtuple('Option', ['type', 'init']) +Option = namedtuple('Option', ['type', 'init', 'var']) class ArgumentError(Exception): pass def as_var(name): @@ -77,7 +76,7 @@ class Project(object): self.help.add_option(key, help, hidden) def add_option(self, name, init, type, check, - help, hidden, + help, hidden, var=None, help_var=None, help_def=None): ''' Add an actual option. @@ -96,16 +95,18 @@ class Project(object): if name in self.options: raise KeyError(name) assert type.__module__ == 'attoconf.types', '%s.%s' % (type.__module__, type.__name__) - self.options[name] = Option(init=init, type=type) + if var is None: + var = as_var(name) + if init is not None: + init = type(init) + self.options[name] = Option(init=init, type=type, var=var) if check is not None: self.checks.append( - lambda bld: check(bld, bld.vars[as_var(name)][0]) ) + lambda bld: check(bld, bld.vars[var][0]) ) if help_var is None: - help_var = as_var(name) + help_var = var if help_def is None: help_def = init - if isinstance(help_def, list): - help_def = ' '.join(pipes.quote(a) for a in help_def) if help_def is not None: help = '%s [%s]' % (help, help_def) @@ -142,8 +143,8 @@ class Build(object): ''' self.project = project self.builddir = trim_trailing_slashes(builddir) - self.vars = {as_var(k): (o.init, 'default') - for k, o in project.options.iteritems()} + self.vars = {o.var: (o.init, 'default') + for o in project.options.itervalues()} def apply_arg(self, arg): ''' Parse a single argument, expanding aliases. @@ -168,7 +169,7 @@ class Build(object): opt = self.project.options.get(k) if opt is None: raise sys.exit('Unknown option %s' % k) - self.vars[as_var(k)] = (opt.type(a), 'command-line') + self.vars[opt.var] = (opt.type(a), 'command-line') def finish(self): ''' With the current set of variables, run all the checks @@ -186,7 +187,8 @@ class Build(object): continue val = env.get(k) if val is not None: - self.vars[k] = (self.project.options[k].type(val), 'environment') + opt = self.project.options[k] + self.vars[opt.var] = (opt.type(val), 'environment') for arg in args: self.apply_arg(arg) diff --git a/attoconf/lib/c.py b/attoconf/lib/c.py index c4eefdb..13dd3c1 100644 --- a/attoconf/lib/c.py +++ b/attoconf/lib/c.py @@ -28,7 +28,7 @@ class TestError(Exception): pass def do_exec(build, args): - p = subprocess.Popen(args, cwd=build.builddir, + p = subprocess.Popen(args.list, cwd=build.builddir, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) out, _ = p.communicate() @@ -200,10 +200,8 @@ def try_compile_link2_cxx(build, body, CXXFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LDL def ldflags(build, LDFLAGS): pass -def libs(build, LIBS): - # Make expects something different - build.vars['LDLIBS'] = build.vars['LIBS'] - del build.vars['LIBS'] +def libs(build, LDLIBS): + pass def cppflags(build, CPPFLAGS): pass @@ -235,7 +233,7 @@ class Link(Arches2): self.add_option('LIBS', init=[], type=ShellList, check=libs, help='libraries to pass to the linker, e.g. -l', - hidden=False) + hidden=False, var='LDLIBS') class Preprocess(Arches2): __slots__ = () diff --git a/attoconf/lib/install.py b/attoconf/lib/install.py index d8d6cf5..444c167 100644 --- a/attoconf/lib/install.py +++ b/attoconf/lib/install.py @@ -20,7 +20,7 @@ from __future__ import print_function, division, absolute_import import os from ..classy import ClassyProject -from ..types import shell_word, version, filepath +from ..types import shell_word, version, filepath, quoted_string def exec_prefix(build, EPREFIX): @@ -28,12 +28,7 @@ def exec_prefix(build, EPREFIX): PREFIX, origin = build.vars['PREFIX'] if origin != 'default': origin = 'derived from PREFIX' - build.vars['EXEC_PREFIX'] = (PREFIX, origin) - # is this a good idea? is there a better way? - # how will this interfere with hashing? - # at least we don't have to worry about the environment ... - build.vars['EPREFIX'] = build.vars['EXEC_PREFIX'] - del build.vars['EXEC_PREFIX'] + build.vars['EPREFIX'] = (PREFIX, origin) def bindir(build, DIR): if DIR is None: @@ -196,7 +191,7 @@ class Install(ClassyProject): hidden=True, help_var='VERSION') self.add_option('--package-name', init=self.package_name, - type=version, check=None, + type=quoted_string, check=None, help='Long name of this package (don\'t change)', hidden=True, help_var='NAME') @@ -213,7 +208,7 @@ class Install(ClassyProject): type=filepath, check=exec_prefix, help='install architecture-dependent files in EPREFIX', hidden=False, - help_var='EPREFIX', help_def='PREFIX') + var='EPREFIX', help_def='PREFIX') self.add_help('Fine tuning of the installation directories:', hidden=False) diff --git a/attoconf/lib/make.py b/attoconf/lib/make.py index e54224d..890361a 100644 --- a/attoconf/lib/make.py +++ b/attoconf/lib/make.py @@ -18,7 +18,6 @@ from __future__ import print_function, division, absolute_import import os -from pipes import quote from ..classy import ClassyProject from ..version import string as version_string @@ -53,13 +52,6 @@ class MakeHook(object): # especially conditional ones ... var = '# ' + var val = 'not defined' - elif isinstance(val, list): - val = ' '.join(quote(a) for a in val) - elif isinstance(val, str): - val = quote(val) - else: - print('Assuming it\'s safe to print an instance of', - type(val).__name__, '...') out.write('%s = %s # %s\n' % (var, val, origin)) if self.infile is not None: out.write('\n# The rest was copied from %s\n' % self.infile) diff --git a/attoconf/types.py b/attoconf/types.py index f4cd178..ae0ca44 100644 --- a/attoconf/types.py +++ b/attoconf/types.py @@ -80,10 +80,16 @@ class ShellList(object): def shell_word(s): if s != shell_quote(s): + if s == '': + return "''" raise ValueError('not a word: %r' % s) return s +def quoted_string(s): + return shell_quote(s) + + def version(s): if s.startswith('v'): s = s[1:] -- cgit v1.2.3-70-g09d2 From 7b5f69de3f7b52b718507fe16c2560901e48a70c Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Tue, 6 Aug 2013 15:39:13 -0700 Subject: Refactor checks and vars --- attoconf/_version.py | 2 +- attoconf/core.py | 17 ++++++++++++----- attoconf/lib/arches.py | 5 ++++- attoconf/lib/install.py | 25 ++++++++++++++++++++----- attoconf/lib/make.py | 7 ------- attoconf/tests/test_core.py | 20 ++++++++++---------- attoconf/types.py | 8 ++++++-- 7 files changed, 53 insertions(+), 31 deletions(-) diff --git a/attoconf/_version.py b/attoconf/_version.py index d7460a2..41d536a 100644 --- a/attoconf/_version.py +++ b/attoconf/_version.py @@ -11,7 +11,7 @@ minor = 3 # Incremented if there is a bugfix release. # Might not be contiguous. -patch = 2 +patch = 3 # Reserved for distributors and forks. # Contains arbitrary text, but no parentheses or newlines. diff --git a/attoconf/core.py b/attoconf/core.py index b200cc1..0fb780a 100644 --- a/attoconf/core.py +++ b/attoconf/core.py @@ -94,15 +94,21 @@ class Project(object): ''' if name in self.options: raise KeyError(name) - assert type.__module__ == 'attoconf.types', '%s.%s' % (type.__module__, type.__name__) - if var is None: - var = as_var(name) + if check is not None: + assert type.__module__ == 'attoconf.types' + if var is None: + var = as_var(name) + else: + # used by some tests ... should this be fixed there instead? + if help_var is None: + help_var = as_var(name) if init is not None: init = type(init) self.options[name] = Option(init=init, type=type, var=var) if check is not None: self.checks.append( - lambda bld: check(bld, bld.vars[var][0]) ) + lambda bld: check(bld, **{help_var: bld.vars[var][0]}) ) + if help_var is None: help_var = var if help_def is None: @@ -144,7 +150,8 @@ class Build(object): self.project = project self.builddir = trim_trailing_slashes(builddir) self.vars = {o.var: (o.init, 'default') - for o in project.options.itervalues()} + for o in project.options.itervalues() + if o.var is not None} def apply_arg(self, arg): ''' Parse a single argument, expanding aliases. diff --git a/attoconf/lib/arches.py b/attoconf/lib/arches.py index c168292..595b396 100644 --- a/attoconf/lib/arches.py +++ b/attoconf/lib/arches.py @@ -20,6 +20,9 @@ from __future__ import print_function, division, absolute_import from ..classy import ClassyProject from ..types import triple +def build(build, BUILD): + pass + def host(build, HOST): if HOST is None: BUILD, origin = build.vars['BUILD'] @@ -41,7 +44,7 @@ class Arches2(ClassyProject): super(Arches2, self).arches() self.add_help('System types:', hidden=False) self.add_option('--build', init=None, - type=triple, check=None, + type=triple, check=build, help='configure for building on BUILD', hidden=False, help_def='native') self.add_option('--host', init=None, diff --git a/attoconf/lib/install.py b/attoconf/lib/install.py index 444c167..a807666 100644 --- a/attoconf/lib/install.py +++ b/attoconf/lib/install.py @@ -23,6 +23,18 @@ from ..classy import ClassyProject from ..types import shell_word, version, filepath, quoted_string +def package(build, PACKAGE): + pass + +def package_version(build, VERSION): + pass + +def package_name(build, NAME): + pass + +def prefix(build, PREFIX): + pass + def exec_prefix(build, EPREFIX): if EPREFIX is None: PREFIX, origin = build.vars['PREFIX'] @@ -86,6 +98,9 @@ def includedir(build, DIR): origin = 'derived from PREFIX' build.vars['INCLUDEDIR'] = (os.path.join(PREFIX, 'include'), origin) +def oldincludedir(build, DIR): + pass + def datarootdir(build, DIR): if DIR is None: PREFIX, origin = build.vars['PREFIX'] @@ -182,16 +197,16 @@ class Install(ClassyProject): def general(self): super(Install, self).general() self.add_option('--package', init=self.package, - type=shell_word, check=None, + 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=None, + 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=None, + type=quoted_string, check=package_name, help='Long name of this package (don\'t change)', hidden=True, help_var='NAME') @@ -201,7 +216,7 @@ class Install(ClassyProject): self.add_help('Installation directories:', hidden=False) self.add_option('--prefix', init='/usr/local', - type=filepath, check=None, + type=filepath, check=prefix, help='install architecture-independent files in PREFIX', hidden=False) self.add_option('--exec-prefix', init=None, @@ -245,7 +260,7 @@ class Install(ClassyProject): help='C header files', hidden=False, help_var='DIR', help_def='PREFIX/include') self.add_option('--oldincludedir', init='/usr/include', - type=filepath, check=None, + type=filepath, check=oldincludedir, help='C header files for non-gcc', hidden=False, help_var='DIR') self.add_option('--datarootdir', init=None, diff --git a/attoconf/lib/make.py b/attoconf/lib/make.py index 890361a..816c444 100644 --- a/attoconf/lib/make.py +++ b/attoconf/lib/make.py @@ -45,13 +45,6 @@ class MakeHook(object): out.write('\n') # TODO preserve *original* order? for var, (val, origin) in sorted(build.vars.iteritems()): - if val is None: - if origin == 'default': - continue - # is it a good idea for Nones to survive this long? - # especially conditional ones ... - var = '# ' + var - val = 'not defined' out.write('%s = %s # %s\n' % (var, val, origin)) if self.infile is not None: out.write('\n# The rest was copied from %s\n' % self.infile) diff --git a/attoconf/tests/test_core.py b/attoconf/tests/test_core.py index c10e8c7..fbbe622 100644 --- a/attoconf/tests/test_core.py +++ b/attoconf/tests/test_core.py @@ -20,7 +20,7 @@ from __future__ import print_function, division, absolute_import import unittest from attoconf.core import Project, Build -from attoconf.types import uint, shell_word +from attoconf.types import uint, shell_word, shell_partial_word from cStringIO import StringIO import sys @@ -95,14 +95,14 @@ General: self.assertEquals(build.relative_source(), '../foo') def test_configure(self): - def check_foo(bld, foo): - self.assertEqual(foo, 'B') - def check_bar(bld, bar): - self.assertEqual(bar, 1) - def check_qux(bld, qux): - self.assertEqual(qux, None) - def check_var(bld, var): - self.assertEqual(var, 'value') + def check_foo(bld, FOO): + self.assertEqual(FOO, 'B') + def check_bar(bld, BAR): + self.assertEqual(BAR, 1) + def check_qux(bld, QUX): + self.assertEqual(QUX, None) + def check_var(bld, VAR): + self.assertEqual(VAR, 'value') proj = Project('.') proj.add_alias('--alias', ['--foo=A', '--bar=1', '--foo=B'], @@ -117,7 +117,7 @@ General: type=uint, check=check_qux, help='help for int qux', hidden=False) proj.add_option('VAR', init='', - type=shell_word, check=check_var, + type=shell_partial_word, check=check_var, help='help for string VAR', hidden=False) build = Build(proj, '.') diff --git a/attoconf/types.py b/attoconf/types.py index ae0ca44..b2b5745 100644 --- a/attoconf/types.py +++ b/attoconf/types.py @@ -80,12 +80,16 @@ class ShellList(object): def shell_word(s): if s != shell_quote(s): - if s == '': - return "''" raise ValueError('not a word: %r' % s) return s +def shell_partial_word(s): + if s == '': + return s + return shell_word(s) + + def quoted_string(s): return shell_quote(s) -- cgit v1.2.3-70-g09d2 From 93215a82b4ebda6d322f75023cfea4cc7d4904d2 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Tue, 6 Aug 2013 16:29:24 -0700 Subject: Add config hash --- attoconf/_version.py | 2 +- attoconf/lib/arches.py | 4 ++-- attoconf/lib/config_hash.py | 48 +++++++++++++++++++++++++++++++++++++++++++++ attoconf/lib/install.py | 40 ++++++++++++++++++------------------- demo-project/configure | 3 ++- 5 files changed, 73 insertions(+), 24 deletions(-) create mode 100644 attoconf/lib/config_hash.py diff --git a/attoconf/_version.py b/attoconf/_version.py index 41d536a..2f23d77 100644 --- a/attoconf/_version.py +++ b/attoconf/_version.py @@ -11,7 +11,7 @@ minor = 3 # Incremented if there is a bugfix release. # Might not be contiguous. -patch = 3 +patch = 4 # Reserved for distributors and forks. # Contains arbitrary text, but no parentheses or newlines. diff --git a/attoconf/lib/arches.py b/attoconf/lib/arches.py index 595b396..007f879 100644 --- a/attoconf/lib/arches.py +++ b/attoconf/lib/arches.py @@ -27,14 +27,14 @@ def host(build, HOST): if HOST is None: BUILD, origin = build.vars['BUILD'] if origin != 'default': - origin = 'derived from BUILD' + origin = 'derived' build.vars['HOST'] = (BUILD, origin) def target(build, TARGET): if TARGET is None: HOST, origin = build.vars['HOST'] if origin != 'default': - origin = 'derived from HOST' + origin = 'derived' build.vars['TARGET'] = (HOST, origin) class Arches2(ClassyProject): diff --git a/attoconf/lib/config_hash.py b/attoconf/lib/config_hash.py new file mode 100644 index 0000000..5641558 --- /dev/null +++ b/attoconf/lib/config_hash.py @@ -0,0 +1,48 @@ +# Copyright 2013 Ben Longbons +# +# This file is part of attoconf. +# +# attoconf is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# attoconf is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with attoconf. If not, see . + +from __future__ import print_function, division, absolute_import + +from hashlib import md5 +import os + +from ..classy import ClassyProject + + +def calc_hash(build): + hash = md5() + for var, (val, origin), in sorted(build.vars.iteritems()): + # origin is not included in the hash + hash.update('%s = %s\n' % (var, val)) + return hash.hexdigest() + + +def add_config_hash(build): + print('Generating a hash of config options ...') + build.vars['CONFIG_HASH'] = (calc_hash(build), 'special') + + +class ConfigHash(ClassyProject): + ''' Post hook add the build hash. + + This should be run before any other post hooks. + ''' + __slots__ = () + + def post(self): + self.checks.append(add_config_hash) + super(ConfigHash, self).post() diff --git a/attoconf/lib/install.py b/attoconf/lib/install.py index a807666..498b13b 100644 --- a/attoconf/lib/install.py +++ b/attoconf/lib/install.py @@ -39,63 +39,63 @@ def exec_prefix(build, EPREFIX): if EPREFIX is None: PREFIX, origin = build.vars['PREFIX'] if origin != 'default': - origin = 'derived from PREFIX' + origin = 'derived' build.vars['EPREFIX'] = (PREFIX, origin) def bindir(build, DIR): if DIR is None: EPREFIX, origin = build.vars['EPREFIX'] if origin != 'default': - origin = 'derived from EPREFIX' + origin = 'derived' build.vars['BINDIR'] = (os.path.join(EPREFIX, 'bin'), origin) def sbindir(build, DIR): if DIR is None: EPREFIX, origin = build.vars['EPREFIX'] if origin != 'default': - origin = 'derived from EPREFIX' + origin = 'derived' build.vars['SBINDIR'] = (os.path.join(EPREFIX, 'sbin'), origin) def libexecdir(build, DIR): if DIR is None: EPREFIX, origin = build.vars['EPREFIX'] if origin != 'default': - origin = 'derived from EPREFIX' + origin = 'derived' build.vars['LIBEXECDIR'] = (os.path.join(EPREFIX, 'libexec'), origin) def sysconfdir(build, DIR): if DIR is None: PREFIX, origin = build.vars['PREFIX'] if origin != 'default': - origin = 'derived from PREFIX' + origin = 'derived' build.vars['SYSCONFDIR'] = (os.path.join(PREFIX, 'etc'), origin) def sharedstatedir(build, DIR): if DIR is None: PREFIX, origin = build.vars['PREFIX'] if origin != 'default': - origin = 'derived from PREFIX' + origin = 'derived' build.vars['SHAREDSTATEDIR'] = (os.path.join(PREFIX, 'com'), origin) def localstatedir(build, DIR): if DIR is None: PREFIX, origin = build.vars['PREFIX'] if origin != 'default': - origin = 'derived from PREFIX' + origin = 'derived' build.vars['LOCALSTATEDIR'] = (os.path.join(PREFIX, 'var'), origin) def libdir(build, DIR): if DIR is None: EPREFIX, origin = build.vars['EPREFIX'] if origin != 'default': - origin = 'derived from EPREFIX' + origin = 'derived' build.vars['LIBDIR'] = (os.path.join(EPREFIX, 'lib'), origin) def includedir(build, DIR): if DIR is None: PREFIX, origin = build.vars['PREFIX'] if origin != 'default': - origin = 'derived from PREFIX' + origin = 'derived' build.vars['INCLUDEDIR'] = (os.path.join(PREFIX, 'include'), origin) def oldincludedir(build, DIR): @@ -105,14 +105,14 @@ def datarootdir(build, DIR): if DIR is None: PREFIX, origin = build.vars['PREFIX'] if origin != 'default': - origin = 'derived from PREFIX' + origin = 'derived' build.vars['DATAROOTDIR'] = (os.path.join(PREFIX, 'share'), origin) def datadir(build, DIR): if DIR is None: DATAROOTDIR, origin = build.vars['DATAROOTDIR'] if origin != 'default': - origin = 'derived from DATAROOTDIR' + origin = 'derived' build.vars['DATADIR'] = (DATAROOTDIR, origin) def packagedatadir(build, DIR): @@ -120,28 +120,28 @@ def packagedatadir(build, DIR): DATADIR, origin = build.vars['DATADIR'] PACKAGE, prigin = build.vars['PACKAGE'] if origin != 'default' or prigin != 'default': - origin = 'derived from DATADIR and PACKAGE' + origin = 'derived' build.vars['DATADIR'] = (os.path.join(DATADIR, PACKAGE), origin) def infodir(build, DIR): if DIR is None: DATAROOTDIR, origin = build.vars['DATAROOTDIR'] if origin != 'default': - origin = 'derived from DATAROOTDIR' + origin = 'derived' build.vars['INFODIR'] = (os.path.join(DATAROOTDIR, 'info'), origin) def localedir(build, DIR): if DIR is None: DATAROOTDIR, origin = build.vars['DATAROOTDIR'] if origin != 'default': - origin = 'derived from DATAROOTDIR' + origin = 'derived' build.vars['LOCALEDIR'] = (os.path.join(DATAROOTDIR, 'locale'), origin) def mandir(build, DIR): if DIR is None: DATAROOTDIR, origin = build.vars['DATAROOTDIR'] if origin != 'default': - origin = 'derived from DATAROOTDIR' + origin = 'derived' build.vars['MANDIR'] = (os.path.join(DATAROOTDIR, 'man'), origin) def docdir(build, DIR): @@ -149,35 +149,35 @@ def docdir(build, DIR): DATAROOTDIR, origin = build.vars['DATAROOTDIR'] PACKAGE, origin2 = build.vars['PACKAGE'] if origin != 'default' or origin2 != 'default': - origin = 'derived from DATAROOTDIR and PACKAGE' + origin = 'derived' build.vars['DOCDIR'] = (os.path.join(DATAROOTDIR, 'doc', PACKAGE), origin) def htmldir(build, DIR): if DIR is None: DOCDIR, origin = build.vars['DOCDIR'] if origin != 'default': - origin = 'derived from DOCDIR' + origin = 'derived' build.vars['HTMLDIR'] = (DOCDIR, origin) def dvidir(build, DIR): if DIR is None: DOCDIR, origin = build.vars['DOCDIR'] if origin != 'default': - origin = 'derived from DOCDIR' + origin = 'derived' build.vars['DVIDIR'] = (DOCDIR, origin) def pdfdir(build, DIR): if DIR is None: DOCDIR, origin = build.vars['DOCDIR'] if origin != 'default': - origin = 'derived from DOCDIR' + origin = 'derived' build.vars['PDFDIR'] = (DOCDIR, origin) def psdir(build, DIR): if DIR is None: DOCDIR, origin = build.vars['DOCDIR'] if origin != 'default': - origin = 'derived from DOCDIR' + origin = 'derived' build.vars['PSDIR'] = (DOCDIR, origin) diff --git a/demo-project/configure b/demo-project/configure index a3e49ee..c26e557 100755 --- a/demo-project/configure +++ b/demo-project/configure @@ -28,10 +28,11 @@ require_version(0, 2) from attoconf.classy import add_slots from attoconf.lib.c import C from attoconf.lib.install import Install +from attoconf.lib.config_hash import ConfigHash from attoconf.lib.make import Make @add_slots -class Configuration(C, Install, Make): +class Configuration(C, Install, ConfigHash, Make): # usually you'll only have vars, features, and packages # the rest should only be inherited def __init__(self, srcdir): -- cgit v1.2.3-70-g09d2 From 9fb3d2759f920bb6714ec6471a5c932720c6903a Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Tue, 6 Aug 2013 17:37:04 -0700 Subject: Write vars to makefile in order --- attoconf/_version.py | 4 ++-- attoconf/classy.py | 9 +++++++++ attoconf/core.py | 5 ++++- attoconf/lib/arches.py | 6 ++++++ attoconf/lib/config_hash.py | 1 + attoconf/lib/install.py | 3 ++- attoconf/lib/make.py | 13 ++++++++----- 7 files changed, 32 insertions(+), 9 deletions(-) diff --git a/attoconf/_version.py b/attoconf/_version.py index 2f23d77..74a4f45 100644 --- a/attoconf/_version.py +++ b/attoconf/_version.py @@ -7,11 +7,11 @@ major = 0 # Incremented for releases with compatible API additions. # This is the number that is usually incremented. -minor = 3 +minor = 4 # Incremented if there is a bugfix release. # Might not be contiguous. -patch = 4 +patch = 0 # Reserved for distributors and forks. # Contains arbitrary text, but no parentheses or newlines. diff --git a/attoconf/classy.py b/attoconf/classy.py index c7ecf5e..7a16372 100644 --- a/attoconf/classy.py +++ b/attoconf/classy.py @@ -42,16 +42,25 @@ class ClassyProject(Project): super(ClassyProject, self).__init__(srcdir) def jiggle(self): + self.order.append(None) self.general() + self.order.append(None) self.paths() + self.order.append(None) self.arches() + self.order.append(None) self.vars() + self.order.append(None) self.features() + self.order.append(None) self.packages() + self.order.append(None) if 0: self.tests() + self.order.append(None) self.post() + self.order.append(None) def general(self): ''' Registration hook for general options (usually unneeded). diff --git a/attoconf/core.py b/attoconf/core.py index 0fb780a..7efd91c 100644 --- a/attoconf/core.py +++ b/attoconf/core.py @@ -44,6 +44,7 @@ class Project(object): 'aliases', 'options', 'help', + 'order', 'checks', ) def __init__(self, srcdir): @@ -53,6 +54,7 @@ class Project(object): self.aliases = {} self.options = {} self.help = Help() + self.order = [] self.checks = [] def add_help(self, text, hidden): @@ -106,8 +108,9 @@ class Project(object): init = type(init) self.options[name] = Option(init=init, type=type, var=var) if check is not None: + self.order.append(var) self.checks.append( - lambda bld: check(bld, **{help_var: bld.vars[var][0]}) ) + lambda bld: check(bld, **{help_var: bld.vars[var][0]})) if help_var is None: help_var = var diff --git a/attoconf/lib/arches.py b/attoconf/lib/arches.py index 007f879..f2172b9 100644 --- a/attoconf/lib/arches.py +++ b/attoconf/lib/arches.py @@ -20,6 +20,9 @@ from __future__ import print_function, division, absolute_import from ..classy import ClassyProject from ..types import triple + +# TODO: see if there's a way to expose them sanely, without using Nones +# (currently I never emit them: instead I pop the order) def build(build, BUILD): pass @@ -47,10 +50,12 @@ class Arches2(ClassyProject): type=triple, check=build, help='configure for building on BUILD', hidden=False, help_def='native') + self.order.pop() self.add_option('--host', init=None, type=triple, check=host, help='cross-compile to build programs to run on HOST', hidden=False, help_def='BUILD') + self.order.pop() # TODO figure out the mro implications when I use this class Arches3(Arches2): @@ -61,3 +66,4 @@ class Arches3(Arches2): type=triple, check=target, help='configure for building compilers for TARGET', hidden=False, help_def='HOST') + self.order.pop() diff --git a/attoconf/lib/config_hash.py b/attoconf/lib/config_hash.py index 5641558..42cdf21 100644 --- a/attoconf/lib/config_hash.py +++ b/attoconf/lib/config_hash.py @@ -44,5 +44,6 @@ class ConfigHash(ClassyProject): __slots__ = () def post(self): + self.order.insert(0, 'CONFIG_HASH') self.checks.append(add_config_hash) super(ConfigHash, self).post() diff --git a/attoconf/lib/install.py b/attoconf/lib/install.py index 498b13b..2bbc7c7 100644 --- a/attoconf/lib/install.py +++ b/attoconf/lib/install.py @@ -121,7 +121,7 @@ def packagedatadir(build, DIR): PACKAGE, prigin = build.vars['PACKAGE'] if origin != 'default' or prigin != 'default': origin = 'derived' - build.vars['DATADIR'] = (os.path.join(DATADIR, PACKAGE), origin) + build.vars['PACKAGEDATADIR'] = (os.path.join(DATADIR, PACKAGE), origin) def infodir(build, DIR): if DIR is None: @@ -224,6 +224,7 @@ class Install(ClassyProject): help='install architecture-dependent files in EPREFIX', hidden=False, var='EPREFIX', help_def='PREFIX') + self.order.append(None) self.add_help('Fine tuning of the installation directories:', hidden=False) diff --git a/attoconf/lib/make.py b/attoconf/lib/make.py index 816c444..7e2c9d3 100644 --- a/attoconf/lib/make.py +++ b/attoconf/lib/make.py @@ -41,13 +41,15 @@ class MakeHook(object): with open(os.path.join(build.builddir, self.outfile), 'w') as out: print('Generating a makefile ...') out.write('# This part was generated by %s\n' % version_string) - out.write('SRC_DIR = %s\n' % build.relative_source()) - out.write('\n') - # TODO preserve *original* order? - for var, (val, origin) in sorted(build.vars.iteritems()): + build.vars['SRC_DIR'] = (build.relative_source(), 'special') + for var in build.project.order: + if var is None: + out.write('\n') + continue + val, origin = build.vars[var] out.write('%s = %s # %s\n' % (var, val, origin)) if self.infile is not None: - out.write('\n# The rest was copied from %s\n' % self.infile) + out.write('# The rest was copied from %s\n' % self.infile) infile = os.path.join(build.project.srcdir, self.infile) with open(infile) as in_: for line in in_: @@ -76,4 +78,5 @@ class Make(ClassyProject): def post(self): super(Make, self).post() + self.order.insert(0, 'SRC_DIR') self.checks.append(MakeHook(self.make_in, self.make_out)) -- cgit v1.2.3-70-g09d2 From d0b375cdb74aaf9b93139621e7587f5fa45dcad8 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Tue, 6 Aug 2013 17:49:53 -0700 Subject: Fix versioning --- attoconf/_version.py | 2 +- attoconf/lib/make.py | 4 ++-- attoconf/tests/test_version.py | 5 +++-- attoconf/version.py | 5 +++-- demo-project/configure | 6 +++--- setup.py | 5 +++-- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/attoconf/_version.py b/attoconf/_version.py index 74a4f45..074f773 100644 --- a/attoconf/_version.py +++ b/attoconf/_version.py @@ -7,7 +7,7 @@ major = 0 # Incremented for releases with compatible API additions. # This is the number that is usually incremented. -minor = 4 +minor = 5 # Incremented if there is a bugfix release. # Might not be contiguous. diff --git a/attoconf/lib/make.py b/attoconf/lib/make.py index 7e2c9d3..ec03d1d 100644 --- a/attoconf/lib/make.py +++ b/attoconf/lib/make.py @@ -20,7 +20,7 @@ from __future__ import print_function, division, absolute_import import os from ..classy import ClassyProject -from ..version import string as version_string +from ..version import full_version blacklist = frozenset(''.join(chr(i) for i in range(0x20)) + '#$') def validate(s): @@ -40,7 +40,7 @@ class MakeHook(object): return with open(os.path.join(build.builddir, self.outfile), 'w') as out: print('Generating a makefile ...') - out.write('# This part was generated by %s\n' % version_string) + out.write('# This part was generated by %s\n' % full_version) build.vars['SRC_DIR'] = (build.relative_source(), 'special') for var in build.project.order: if var is None: diff --git a/attoconf/tests/test_version.py b/attoconf/tests/test_version.py index 1ce855d..4325fba 100644 --- a/attoconf/tests/test_version.py +++ b/attoconf/tests/test_version.py @@ -19,13 +19,14 @@ from __future__ import print_function, division, absolute_import import unittest -from attoconf.version import require_version, string as version_string +from attoconf.version import require_version, full_version, part_version class TestVersion(unittest.TestCase): def test_parse(self): # don't do this - name, version, dist = version_string.split(' ', 2) + name, version, dist = full_version.split(' ', 2) self.assertEqual(name, 'attoconf') + self.assertEqual(version, part_version) major, minor, patch = [int(x) for x in version.split('.')] assert dist.startswith('(') assert dist.endswith(')') diff --git a/attoconf/version.py b/attoconf/version.py index 231a3d1..3194aec 100644 --- a/attoconf/version.py +++ b/attoconf/version.py @@ -28,7 +28,7 @@ def require_version(major, minor, patch=0): ''' Check that this is the right version of attoconf, or die trying. ''' - actual = 'Current version: ' + string + actual = 'Current version: ' + full_version if major != _version.major: sys.exit('Unsupported major version: %d\n' % major + actual) if minor > _version.minor: @@ -36,4 +36,5 @@ def require_version(major, minor, patch=0): if minor == _version.minor and patch > _version.patch: sys.exit('Unsupported patch version: %d.%d.%d\n' % (major, minor, patch) + actual) -string = 'attoconf %d.%d.%d (%s)' % (_version.major, _version.minor, _version.patch, _version.distributor) +part_version = '%d.%d.%d' % (_version.major, _version.minor, _version.patch) +full_version = 'attoconf %s (%s)' % (part_version, _version.distributor) diff --git a/demo-project/configure b/demo-project/configure index c26e557..ce2cc45 100755 --- a/demo-project/configure +++ b/demo-project/configure @@ -22,8 +22,8 @@ from __future__ import print_function, division, absolute_import import os import sys -from attoconf.version import require_version, string as version_string -require_version(0, 2) +from attoconf.version import require_version, part_version +require_version(0, 5) from attoconf.classy import add_slots from attoconf.lib.c import C @@ -66,7 +66,7 @@ class Configuration(C, Install, ConfigHash, Make): def main(): proj = Configuration(os.path.dirname(sys.argv[0])) - proj.set_package('attoconf-demo', version_string.split(' ')[1], 'Demo project for attoconf') + proj.set_package('attoconf-demo', part_version, 'Demo project for attoconf') proj.jiggle() build = proj.build('.') build.configure(sys.argv[1:], os.environ) diff --git a/setup.py b/setup.py index 5e27239..2357bce 100755 --- a/setup.py +++ b/setup.py @@ -2,17 +2,18 @@ from distutils.core import setup -from attoconf.version import version_string +from attoconf.version import part_version setup( name='attoconf', - version=version_string, + version=part_version, description='A small and sensible replacement for GNU autoconf', author='Ben Longbons', author_email='b.r.longbons@gmail.com', url='http://github.com/o11c/attoconf', packages=[ 'attoconf', + 'attoconf.lib', ], classifiers=[ 'Development Status :: 3 - Alpha', -- cgit v1.2.3-70-g09d2 From 74db20592869396232ca35456f4e2c63c7d937b3 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 7 Aug 2013 13:32:22 -0700 Subject: Remove inferior package version, fix makefile format The problem with version is that it breaks remake without reconf. Version should instead be handled by the makefile. --- attoconf/_version.py | 2 +- attoconf/lib/install.py | 15 +++------------ attoconf/lib/make.py | 2 +- attoconf/types.py | 8 -------- demo-project/configure | 6 +++--- 5 files changed, 8 insertions(+), 25 deletions(-) diff --git a/attoconf/_version.py b/attoconf/_version.py index 074f773..68a4244 100644 --- a/attoconf/_version.py +++ b/attoconf/_version.py @@ -7,7 +7,7 @@ major = 0 # Incremented for releases with compatible API additions. # This is the number that is usually incremented. -minor = 5 +minor = 6 # Incremented if there is a bugfix release. # Might not be contiguous. 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) diff --git a/attoconf/types.py b/attoconf/types.py index b2b5745..3e73d86 100644 --- a/attoconf/types.py +++ b/attoconf/types.py @@ -94,14 +94,6 @@ def quoted_string(s): return shell_quote(s) -def version(s): - if s.startswith('v'): - s = s[1:] - for b in s.split('.'): - int(b) - return s - - def filepath(s): s = trim_trailing_slashes(s) # must be absolute *and* canonical diff --git a/demo-project/configure b/demo-project/configure index ce2cc45..47022c2 100755 --- a/demo-project/configure +++ b/demo-project/configure @@ -22,8 +22,8 @@ from __future__ import print_function, division, absolute_import import os import sys -from attoconf.version import require_version, part_version -require_version(0, 5) +from attoconf.version import require_version +require_version(0, 6) from attoconf.classy import add_slots from attoconf.lib.c import C @@ -66,7 +66,7 @@ class Configuration(C, Install, ConfigHash, Make): def main(): proj = Configuration(os.path.dirname(sys.argv[0])) - proj.set_package('attoconf-demo', part_version, 'Demo project for attoconf') + proj.set_package('attoconf-demo', 'Demo project for attoconf') proj.jiggle() build = proj.build('.') build.configure(sys.argv[1:], os.environ) -- cgit v1.2.3-70-g09d2 From cd3e62f10f4cd85fe74199349c96e7f2f27c4f60 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Sun, 22 Sep 2013 09:28:35 -0700 Subject: Implement config.status --- README | 3 ++- attoconf/_version.py | 2 +- attoconf/core.py | 19 ++++++++++++++++--- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/README b/README index 2497de8..c76a0ce 100644 --- a/README +++ b/README @@ -1,7 +1,8 @@ -Attoconf is A small and sensible replacement for GNU autoconf. +Attoconf is a small and sensible replacement for GNU autoconf. Principles: * Assume most build environments are sane, and ignore the rest. +* In the face of ambiguity, refuse the temptation to guess. * Never automatically toggle features based on the build environment. * Written in python2 for easy editing and wide portability. * GPL, but this does not apply to the program being built. diff --git a/attoconf/_version.py b/attoconf/_version.py index 68a4244..76c1c3d 100644 --- a/attoconf/_version.py +++ b/attoconf/_version.py @@ -11,7 +11,7 @@ minor = 6 # Incremented if there is a bugfix release. # Might not be contiguous. -patch = 0 +patch = 1 # Reserved for distributors and forks. # Contains arbitrary text, but no parentheses or newlines. diff --git a/attoconf/core.py b/attoconf/core.py index 7efd91c..624d578 100644 --- a/attoconf/core.py +++ b/attoconf/core.py @@ -146,6 +146,7 @@ class Build(object): 'builddir', 'project', 'vars', + '_seen_args', ) def __init__(self, project, builddir): ''' A Build is initially constructed from a project and a build dir. @@ -155,6 +156,7 @@ class Build(object): self.vars = {o.var: (o.init, 'default') for o in project.options.itervalues() if o.var is not None} + self._seen_args = [] def apply_arg(self, arg): ''' Parse a single argument, expanding aliases. @@ -174,6 +176,7 @@ class Build(object): raise ArgumentError('Unknown option %s' % arg) else: raise ArgumentError('Unknown environment variable %s' % arg) + self._seen_args.append(arg) k, a = arg.split('=', 1) opt = self.project.options.get(k) @@ -187,6 +190,18 @@ class Build(object): ''' for check in self.project.checks: check(self) + status_file = os.path.join(self.builddir, 'config.status') + # open fd to control +x mode + status_fd = os.open(status_file, os.O_WRONLY | os.O_CREAT | os.O_TRUNC, 0777) + with os.fdopen(status_fd, 'w') as status: + status.write('#!%s\n' % sys.executable) + status.write('import os\n') + status.write('import sys\n') + status.write('old_build_dir = os.path.dirname(sys.argv[0])\n') + status.write('configure = os.path.join(old_build_dir, %r, "configure")\n' + % self.relative_source()) + status.write('os.execvp(configure, [configure] + %r)\n' + % self._seen_args) def configure(self, args, env): ''' First apply variables from the environment, @@ -210,9 +225,7 @@ class Build(object): ''' srcdir = self.project.srcdir builddir = self.builddir - if os.path.isabs(srcdir): - return srcdir - if os.path.isabs(builddir): + if os.path.isabs(srcdir) or os.path.isabs(builddir): return os.path.realpath(srcdir) return os.path.relpath(os.path.realpath(srcdir), os.path.realpath(builddir)) -- cgit v1.2.3-70-g09d2 From dea8d4eb080d8f04ecd74a29994c5745b6fa146c Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Mon, 23 Sep 2013 21:10:10 -0700 Subject: Allow config.status to take additional arguments --- attoconf/_version.py | 2 +- attoconf/core.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/attoconf/_version.py b/attoconf/_version.py index 76c1c3d..2ecaa7d 100644 --- a/attoconf/_version.py +++ b/attoconf/_version.py @@ -11,7 +11,7 @@ minor = 6 # Incremented if there is a bugfix release. # Might not be contiguous. -patch = 1 +patch = 2 # Reserved for distributors and forks. # Contains arbitrary text, but no parentheses or newlines. diff --git a/attoconf/core.py b/attoconf/core.py index 624d578..82c5d8a 100644 --- a/attoconf/core.py +++ b/attoconf/core.py @@ -200,7 +200,7 @@ class Build(object): status.write('old_build_dir = os.path.dirname(sys.argv[0])\n') status.write('configure = os.path.join(old_build_dir, %r, "configure")\n' % self.relative_source()) - status.write('os.execvp(configure, [configure] + %r)\n' + status.write('os.execvp(configure, [configure] + %r + sys.argv[1:])\n' % self._seen_args) def configure(self, args, env): -- cgit v1.2.3-70-g09d2 From 0aa206266ee2d8d9db7d00f35d766bdf17306e9a Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 25 Sep 2013 21:27:46 -0700 Subject: Remove duplicates from config.status --- attoconf/_version.py | 2 +- attoconf/core.py | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/attoconf/_version.py b/attoconf/_version.py index 2ecaa7d..414ed65 100644 --- a/attoconf/_version.py +++ b/attoconf/_version.py @@ -11,7 +11,7 @@ minor = 6 # Incremented if there is a bugfix release. # Might not be contiguous. -patch = 2 +patch = 3 # Reserved for distributors and forks. # Contains arbitrary text, but no parentheses or newlines. diff --git a/attoconf/core.py b/attoconf/core.py index 82c5d8a..7c6444b 100644 --- a/attoconf/core.py +++ b/attoconf/core.py @@ -17,7 +17,7 @@ from __future__ import print_function, division, absolute_import -from collections import namedtuple +from collections import namedtuple, OrderedDict import os import sys @@ -156,7 +156,7 @@ class Build(object): self.vars = {o.var: (o.init, 'default') for o in project.options.itervalues() if o.var is not None} - self._seen_args = [] + self._seen_args = OrderedDict() def apply_arg(self, arg): ''' Parse a single argument, expanding aliases. @@ -176,9 +176,11 @@ class Build(object): raise ArgumentError('Unknown option %s' % arg) else: raise ArgumentError('Unknown environment variable %s' % arg) - self._seen_args.append(arg) k, a = arg.split('=', 1) + if k in self._seen_args: + del self._seen_args[k] + self._seen_args[k] = a opt = self.project.options.get(k) if opt is None: raise sys.exit('Unknown option %s' % k) @@ -194,14 +196,16 @@ class Build(object): # open fd to control +x mode status_fd = os.open(status_file, os.O_WRONLY | os.O_CREAT | os.O_TRUNC, 0777) with os.fdopen(status_fd, 'w') as status: + print('Generating config.status') status.write('#!%s\n' % sys.executable) status.write('import os\n') status.write('import sys\n') status.write('old_build_dir = os.path.dirname(sys.argv[0])\n') status.write('configure = os.path.join(old_build_dir, %r, "configure")\n' % self.relative_source()) + seen_args = ['='.join(kv) for kv in self._seen_args.iteritems()] status.write('os.execvp(configure, [configure] + %r + sys.argv[1:])\n' - % self._seen_args) + % seen_args) def configure(self, args, env): ''' First apply variables from the environment, -- cgit v1.2.3-70-g09d2 From 4d202efe504c98fa8eab8d122f40214270f63ad2 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 25 Sep 2013 21:42:16 -0700 Subject: Use keyword splats in ctors --- attoconf/_version.py | 4 ++-- attoconf/lib/install.py | 12 ++++++++++-- attoconf/lib/make.py | 12 ++++++++---- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/attoconf/_version.py b/attoconf/_version.py index 414ed65..6aaa0c1 100644 --- a/attoconf/_version.py +++ b/attoconf/_version.py @@ -7,11 +7,11 @@ major = 0 # Incremented for releases with compatible API additions. # This is the number that is usually incremented. -minor = 6 +minor = 7 # Incremented if there is a bugfix release. # Might not be contiguous. -patch = 3 +patch = 0 # Reserved for distributors and forks. # Contains arbitrary text, but no parentheses or newlines. diff --git a/attoconf/lib/install.py b/attoconf/lib/install.py index b32ebe0..85e0de5 100644 --- a/attoconf/lib/install.py +++ b/attoconf/lib/install.py @@ -186,9 +186,17 @@ class Install(ClassyProject): return super(Install, cls).slots() + ( 'package', 'package_name') - def set_package(self, package, name): + # Compatibility with configure written for attoconf < 0.7 + # In attoconf 1.0, the positional srcdir argument will go away, + # the None default and the .set_package function will be removed. + # (Note: when bisecting, always force checkout attoconf!) + def __init__(self, srcdir, package=None, package_name=None, **kwargs): + super(Install, self).__init__(srcdir=srcdir, **kwargs) + self.set_package(package, package_name) + + def set_package(self, package, package_name): self.package = package - self.package_name = name + self.package_name = package_name def general(self): super(Install, self).general() diff --git a/attoconf/lib/make.py b/attoconf/lib/make.py index 8bcd3b5..c63cb61 100644 --- a/attoconf/lib/make.py +++ b/attoconf/lib/make.py @@ -65,10 +65,14 @@ class Make(ClassyProject): def slots(cls): return super(Make, cls).slots() + ('make_in', 'make_out') - def __init__(self, srcdir): - super(Make, self).__init__(srcdir) - self.set_make_infile('Makefile.in') - self.set_make_outfile('Makefile') # relative to build dir + # compatibility with attoconf < 0.7 + def __init__(self, srcdir, + make_infile='Makefile.in', + make_outfile='Makefile', + **kwargs): + super(Make, self).__init__(srcdir=srcdir, **kwargs) + self.set_make_infile(make_infile) + self.set_make_outfile(make_outfile) # relative to build dir def set_make_infile(self, ipath): self.make_in = ipath -- cgit v1.2.3-70-g09d2 From 20f0c059b4ceef520a0bd8580960a9d2f4fceb88 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 25 Sep 2013 23:39:37 -0700 Subject: Add a more flexible converter from Makefile.in to Makefile --- attoconf/_version.py | 2 +- attoconf/lib/make.py | 3 ++ attoconf/lib/templates.py | 80 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 attoconf/lib/templates.py diff --git a/attoconf/_version.py b/attoconf/_version.py index 6aaa0c1..943af03 100644 --- a/attoconf/_version.py +++ b/attoconf/_version.py @@ -7,7 +7,7 @@ major = 0 # Incremented for releases with compatible API additions. # This is the number that is usually incremented. -minor = 7 +minor = 8 # Incremented if there is a bugfix release. # Might not be contiguous. diff --git a/attoconf/lib/make.py b/attoconf/lib/make.py index c63cb61..ee58619 100644 --- a/attoconf/lib/make.py +++ b/attoconf/lib/make.py @@ -18,6 +18,7 @@ from __future__ import print_function, division, absolute_import import os +import sys from ..classy import ClassyProject from ..version import full_version @@ -82,5 +83,7 @@ class Make(ClassyProject): def post(self): super(Make, self).post() + if 'SRC_DIR' in self.order: + sys.exit('ERROR: Incompatible generator hooks!') self.order.insert(0, 'SRC_DIR') self.checks.append(MakeHook(self.make_in, self.make_out)) diff --git a/attoconf/lib/templates.py b/attoconf/lib/templates.py new file mode 100644 index 0000000..791dd62 --- /dev/null +++ b/attoconf/lib/templates.py @@ -0,0 +1,80 @@ +# Copyright 2013 Ben Longbons +# +# This file is part of attoconf. +# +# attoconf is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# attoconf is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with attoconf. If not, see . + +from __future__ import print_function, division, absolute_import + +import os +import sys + +from ..classy import ClassyProject + + +class TemplateHook(object): + __slots__ = ('outfiles') + def __init__(self, outfiles): + self.outfiles = outfiles + + def __call__(self, build): + build.vars['SRC_DIR'] = (build.relative_source(), 'special') + unseen = set(build.project.order) + if None in unseen: + unseen.remove(None) + for outfile in self.outfiles: + infile = outfile + '.in' + print('Generating %s from %s' % (outfile, infile)) + # by replacing all instances of @VARIABLE@ with the value + + slurpee = open(os.path.join(build.project.srcdir, infile)).read() + for var in build.project.order: + if var is None: + continue + val, origin = build.vars[var] + key = '@' + var + '@' + if key not in slurpee: + continue + if var in unseen: + unseen.remove(var) + slurpee = slurpee.replace(key, str(val)) + # origin is not so useful, given config.status + with open(os.path.join(build.builddir, outfile), 'w') as out: + out.write(slurpee) + if unseen: + print('WARNING: variables not used:') + print(' ' + '\n '.join(unseen)) + # lone @s may legitimately appear in the makefile. + # paired @s, which would be a forgotten subst, will be obvious. + + +class Templates(ClassyProject): + ''' Post hook to generate output files from *.in templates + ''' + __slots__ = () + @classmethod + def slots(cls): + return super(Templates, cls).slots() + ('template_files',) + + # this class didn't exist in attoconf < 0.7, no need for compatibility + def __init__(self, template_files, **kwargs): + super(Templates, self).__init__(**kwargs) + self.template_files = template_files + + def post(self): + super(Templates, self).post() + if 'SRC_DIR' in self.order: + sys.exit('ERROR: Incompatible generator hooks!') + self.order.insert(0, 'SRC_DIR') + self.checks.append(TemplateHook(self.template_files)) -- cgit v1.2.3-70-g09d2 From 860ad99d5ac781d1277c0c4e90735e5e3dadd4d7 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Thu, 26 Sep 2013 08:02:27 -0700 Subject: Remove support for origin tracking This has not been very useful since config.status was implemented, and it kind of complicates the code. --- attoconf/_version.py | 2 +- attoconf/core.py | 9 ++-- attoconf/lib/arches.py | 12 ++--- attoconf/lib/c.py | 64 +++++++++++------------ attoconf/lib/config_hash.py | 5 +- attoconf/lib/install.py | 124 +++++++++++++++----------------------------- attoconf/lib/make.py | 6 +-- attoconf/lib/templates.py | 5 +- 8 files changed, 91 insertions(+), 136 deletions(-) diff --git a/attoconf/_version.py b/attoconf/_version.py index 943af03..dd1465e 100644 --- a/attoconf/_version.py +++ b/attoconf/_version.py @@ -11,7 +11,7 @@ minor = 8 # Incremented if there is a bugfix release. # Might not be contiguous. -patch = 0 +patch = 1 # Reserved for distributors and forks. # Contains arbitrary text, but no parentheses or newlines. diff --git a/attoconf/core.py b/attoconf/core.py index 7c6444b..b5cb008 100644 --- a/attoconf/core.py +++ b/attoconf/core.py @@ -110,7 +110,7 @@ class Project(object): if check is not None: self.order.append(var) self.checks.append( - lambda bld: check(bld, **{help_var: bld.vars[var][0]})) + lambda bld: check(bld, **{help_var: bld.vars[var]})) if help_var is None: help_var = var @@ -153,7 +153,7 @@ class Build(object): ''' self.project = project self.builddir = trim_trailing_slashes(builddir) - self.vars = {o.var: (o.init, 'default') + self.vars = {o.var: o.init for o in project.options.itervalues() if o.var is not None} self._seen_args = OrderedDict() @@ -184,7 +184,7 @@ class Build(object): opt = self.project.options.get(k) if opt is None: raise sys.exit('Unknown option %s' % k) - self.vars[opt.var] = (opt.type(a), 'command-line') + self.vars[opt.var] = opt.type(a) def finish(self): ''' With the current set of variables, run all the checks @@ -216,8 +216,9 @@ class Build(object): continue val = env.get(k) if val is not None: + self._seen_args[k] = val opt = self.project.options[k] - self.vars[opt.var] = (opt.type(val), 'environment') + self.vars[opt.var] = opt.type(val) for arg in args: self.apply_arg(arg) diff --git a/attoconf/lib/arches.py b/attoconf/lib/arches.py index f2172b9..cffd8ca 100644 --- a/attoconf/lib/arches.py +++ b/attoconf/lib/arches.py @@ -28,17 +28,13 @@ def build(build, BUILD): def host(build, HOST): if HOST is None: - BUILD, origin = build.vars['BUILD'] - if origin != 'default': - origin = 'derived' - build.vars['HOST'] = (BUILD, origin) + BUILD = build.vars['BUILD'] + build.vars['HOST'] = BUILD def target(build, TARGET): if TARGET is None: - HOST, origin = build.vars['HOST'] - if origin != 'default': - origin = 'derived' - build.vars['TARGET'] = (HOST, origin) + HOST = build.vars['HOST'] + build.vars['TARGET'] = HOST class Arches2(ClassyProject): __slots__ = () diff --git a/attoconf/lib/c.py b/attoconf/lib/c.py index 13dd3c1..062e695 100644 --- a/attoconf/lib/c.py +++ b/attoconf/lib/c.py @@ -62,9 +62,9 @@ class TempFile: def try_compile_c(build, body, CFLAGS=[], CPPFLAGS=[]): - CC = build.vars['CC'][0] - CFLAGS = build.vars['CFLAGS'][0] + CFLAGS - CPPFLAGS = build.vars['CPPFLAGS'][0] + CPPFLAGS + CC = build.vars['CC'] + CFLAGS = build.vars['CFLAGS'] + CFLAGS + CPPFLAGS = build.vars['CPPFLAGS'] + CPPFLAGS in_ = 'atto-test.c' ins = [in_] out = 'atto-test.o' @@ -76,11 +76,11 @@ def try_compile_c(build, body, CFLAGS=[], CPPFLAGS=[]): raise TestError(error) def try_compile_link_c(build, body, CFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LDLIBS=[]): - CC = build.vars['CC'][0] - CFLAGS = build.vars['CFLAGS'][0] + CFLAGS - CPPFLAGS = build.vars['CPPFLAGS'][0] + CPPFLAGS - LDFLAGS = build.vars['LDFLAGS'][0] + LDFLAGS - LDLIBS = build.vars['LDLIBS'][0] + LDLIBS + CC = build.vars['CC'] + CFLAGS = build.vars['CFLAGS'] + CFLAGS + CPPFLAGS = build.vars['CPPFLAGS'] + CPPFLAGS + LDFLAGS = build.vars['LDFLAGS'] + LDFLAGS + LDLIBS = build.vars['LDLIBS'] + LDLIBS in_ = 'atto-test.c' ins = [in_] out = 'atto-test' @@ -92,9 +92,9 @@ def try_compile_link_c(build, body, CFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LDLIBS=[ raise TestError(error) def try_compile_cxx(build, body, CXXFLAGS=[], CPPFLAGS=[]): - CXX = build.vars['CXX'][0] - CXXFLAGS = build.vars['CXXFLAGS'][0] + CXXFLAGS - CPPFLAGS = build.vars['CPPFLAGS'][0] + CPPFLAGS + CXX = build.vars['CXX'] + CXXFLAGS = build.vars['CXXFLAGS'] + CXXFLAGS + CPPFLAGS = build.vars['CPPFLAGS'] + CPPFLAGS in_ = 'atto-test.cxx' out = 'atto-test.o' @@ -105,11 +105,11 @@ def try_compile_cxx(build, body, CXXFLAGS=[], CPPFLAGS=[]): raise TestError(error) def try_compile_link_cxx(build, body, CXXFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LDLIBS=[]): - CXX = build.vars['CXX'][0] - CXXFLAGS = build.vars['CXXFLAGS'][0] + CXXFLAGS - CPPFLAGS = build.vars['CPPFLAGS'][0] + CPPFLAGS - LDFLAGS = build.vars['LDFLAGS'][0] + LDFLAGS - LDLIBS = build.vars['LDLIBS'][0] + LDLIBS + CXX = build.vars['CXX'] + CXXFLAGS = build.vars['CXXFLAGS'] + CXXFLAGS + CPPFLAGS = build.vars['CPPFLAGS'] + CPPFLAGS + LDFLAGS = build.vars['LDFLAGS'] + LDFLAGS + LDLIBS = build.vars['LDLIBS'] + LDLIBS in_ = 'atto-test.cxx' ins = [in_] out = 'atto-test' @@ -122,9 +122,9 @@ def try_compile_link_cxx(build, body, CXXFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LDLI if 0: def try_linkonly_c(build, ins, LDFLAGS=[], LDLIBS=[]): - CC = build.vars['CC'][0] - LDFLAGS = build.vars['LDFLAGS'][0] + LDFLAGS - LDLIBS = build.vars['LDLIBS'][0] + LDLIBS + CC = build.vars['CC'] + LDFLAGS = build.vars['LDFLAGS'] + LDFLAGS + LDLIBS = build.vars['LDLIBS'] + LDLIBS out = 'atto-test' args = CC + LDFLAGS + ins + LDLIBS + ['-o', out] @@ -134,11 +134,11 @@ if 0: raise TestError(error) def try_compile_link2_c(build, body, CFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LDLIBS=[]): - CC = build.vars['CC'][0] - CFLAGS = build.vars['CFLAGS'][0] + CFLAGS - CPPFLAGS = build.vars['CPPFLAGS'][0] + CPPFLAGS - LDFLAGS = build.vars['LDFLAGS'][0] + LDFLAGS - LDLIBS = build.vars['LDLIBS'][0] + LDLIBS + CC = build.vars['CC'] + CFLAGS = build.vars['CFLAGS'] + CFLAGS + CPPFLAGS = build.vars['CPPFLAGS'] + CPPFLAGS + LDFLAGS = build.vars['LDFLAGS'] + LDFLAGS + LDLIBS = build.vars['LDLIBS'] + LDLIBS in_ = 'atto-test.c' ins = [in_] mid = 'atto-test.o' @@ -160,9 +160,9 @@ def try_compile_link2_c(build, body, CFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LDLIBS= if 0: def try_linkonly_cxx(build, ins, LDFLAGS=[], LDLIBS=[]): - CXX = build.vars['CXX'][0] - LDFLAGS = build.vars['LDFLAGS'][0] + LDFLAGS - LDLIBS = build.vars['LDLIBS'][0] + LDLIBS + CXX = build.vars['CXX'] + LDFLAGS = build.vars['LDFLAGS'] + LDFLAGS + LDLIBS = build.vars['LDLIBS'] + LDLIBS out = 'atto-test' args = CXX + LDFLAGS + ins + LDLIBS + ['-o', out] @@ -172,11 +172,11 @@ if 0: raise TestError(error) def try_compile_link2_cxx(build, body, CXXFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LDLIBS=[]): - CXX = build.vars['CXX'][0] - CXXFLAGS = build.vars['CXXFLAGS'][0] + CXXFLAGS - CPPFLAGS = build.vars['CPPFLAGS'][0] + CPPFLAGS - LDFLAGS = build.vars['LDFLAGS'][0] + LDFLAGS - LDLIBS = build.vars['LDLIBS'][0] + LDLIBS + CXX = build.vars['CXX'] + CXXFLAGS = build.vars['CXXFLAGS'] + CXXFLAGS + CPPFLAGS = build.vars['CPPFLAGS'] + CPPFLAGS + LDFLAGS = build.vars['LDFLAGS'] + LDFLAGS + LDLIBS = build.vars['LDLIBS'] + LDLIBS in_ = 'atto-test.cxx' ins = [in_] mid = 'atto-test.o' diff --git a/attoconf/lib/config_hash.py b/attoconf/lib/config_hash.py index 42cdf21..81d4a68 100644 --- a/attoconf/lib/config_hash.py +++ b/attoconf/lib/config_hash.py @@ -25,15 +25,14 @@ from ..classy import ClassyProject def calc_hash(build): hash = md5() - for var, (val, origin), in sorted(build.vars.iteritems()): - # origin is not included in the hash + for var, val in sorted(build.vars.iteritems()): hash.update('%s = %s\n' % (var, val)) return hash.hexdigest() def add_config_hash(build): print('Generating a hash of config options ...') - build.vars['CONFIG_HASH'] = (calc_hash(build), 'special') + build.vars['CONFIG_HASH'] = calc_hash(build) class ConfigHash(ClassyProject): diff --git a/attoconf/lib/install.py b/attoconf/lib/install.py index 85e0de5..b3eb989 100644 --- a/attoconf/lib/install.py +++ b/attoconf/lib/install.py @@ -34,148 +34,108 @@ def prefix(build, PREFIX): def exec_prefix(build, EPREFIX): if EPREFIX is None: - PREFIX, origin = build.vars['PREFIX'] - if origin != 'default': - origin = 'derived' - build.vars['EPREFIX'] = (PREFIX, origin) + PREFIX = build.vars['PREFIX'] + build.vars['EPREFIX'] = PREFIX def bindir(build, DIR): if DIR is None: - EPREFIX, origin = build.vars['EPREFIX'] - if origin != 'default': - origin = 'derived' - build.vars['BINDIR'] = (os.path.join(EPREFIX, 'bin'), origin) + EPREFIX = build.vars['EPREFIX'] + build.vars['BINDIR'] = os.path.join(EPREFIX, 'bin') def sbindir(build, DIR): if DIR is None: - EPREFIX, origin = build.vars['EPREFIX'] - if origin != 'default': - origin = 'derived' - build.vars['SBINDIR'] = (os.path.join(EPREFIX, 'sbin'), origin) + EPREFIX = build.vars['EPREFIX'] + build.vars['SBINDIR'] = os.path.join(EPREFIX, 'sbin') def libexecdir(build, DIR): if DIR is None: - EPREFIX, origin = build.vars['EPREFIX'] - if origin != 'default': - origin = 'derived' - build.vars['LIBEXECDIR'] = (os.path.join(EPREFIX, 'libexec'), origin) + EPREFIX = build.vars['EPREFIX'] + build.vars['LIBEXECDIR'] = os.path.join(EPREFIX, 'libexec') def sysconfdir(build, DIR): if DIR is None: - PREFIX, origin = build.vars['PREFIX'] - if origin != 'default': - origin = 'derived' - build.vars['SYSCONFDIR'] = (os.path.join(PREFIX, 'etc'), origin) + PREFIX = build.vars['PREFIX'] + build.vars['SYSCONFDIR'] = os.path.join(PREFIX, 'etc') def sharedstatedir(build, DIR): if DIR is None: - PREFIX, origin = build.vars['PREFIX'] - if origin != 'default': - origin = 'derived' - build.vars['SHAREDSTATEDIR'] = (os.path.join(PREFIX, 'com'), origin) + PREFIX = build.vars['PREFIX'] + build.vars['SHAREDSTATEDIR'] = os.path.join(PREFIX, 'com') def localstatedir(build, DIR): if DIR is None: - PREFIX, origin = build.vars['PREFIX'] - if origin != 'default': - origin = 'derived' - build.vars['LOCALSTATEDIR'] = (os.path.join(PREFIX, 'var'), origin) + PREFIX = build.vars['PREFIX'] + build.vars['LOCALSTATEDIR'] = os.path.join(PREFIX, 'var') def libdir(build, DIR): if DIR is None: - EPREFIX, origin = build.vars['EPREFIX'] - if origin != 'default': - origin = 'derived' - build.vars['LIBDIR'] = (os.path.join(EPREFIX, 'lib'), origin) + EPREFIX = build.vars['EPREFIX'] + build.vars['LIBDIR'] = os.path.join(EPREFIX, 'lib') def includedir(build, DIR): if DIR is None: - PREFIX, origin = build.vars['PREFIX'] - if origin != 'default': - origin = 'derived' - build.vars['INCLUDEDIR'] = (os.path.join(PREFIX, 'include'), origin) + PREFIX = build.vars['PREFIX'] + build.vars['INCLUDEDIR'] = os.path.join(PREFIX, 'include') def oldincludedir(build, DIR): pass def datarootdir(build, DIR): if DIR is None: - PREFIX, origin = build.vars['PREFIX'] - if origin != 'default': - origin = 'derived' - build.vars['DATAROOTDIR'] = (os.path.join(PREFIX, 'share'), origin) + PREFIX = build.vars['PREFIX'] + build.vars['DATAROOTDIR'] = os.path.join(PREFIX, 'share') def datadir(build, DIR): if DIR is None: - DATAROOTDIR, origin = build.vars['DATAROOTDIR'] - if origin != 'default': - origin = 'derived' - build.vars['DATADIR'] = (DATAROOTDIR, origin) + DATAROOTDIR = build.vars['DATAROOTDIR'] + build.vars['DATADIR'] = DATAROOTDIR def packagedatadir(build, DIR): if DIR is None: - DATADIR, origin = build.vars['DATADIR'] - PACKAGE, prigin = build.vars['PACKAGE'] - if origin != 'default' or prigin != 'default': - origin = 'derived' - build.vars['PACKAGEDATADIR'] = (os.path.join(DATADIR, PACKAGE), origin) + DATADIR = build.vars['DATADIR'] + PACKAGE = build.vars['PACKAGE'] + build.vars['PACKAGEDATADIR'] = os.path.join(DATADIR, PACKAGE) def infodir(build, DIR): if DIR is None: - DATAROOTDIR, origin = build.vars['DATAROOTDIR'] - if origin != 'default': - origin = 'derived' - build.vars['INFODIR'] = (os.path.join(DATAROOTDIR, 'info'), origin) + DATAROOTDIR = build.vars['DATAROOTDIR'] + build.vars['INFODIR'] = os.path.join(DATAROOTDIR, 'info') def localedir(build, DIR): if DIR is None: - DATAROOTDIR, origin = build.vars['DATAROOTDIR'] - if origin != 'default': - origin = 'derived' - build.vars['LOCALEDIR'] = (os.path.join(DATAROOTDIR, 'locale'), origin) + DATAROOTDIR = build.vars['DATAROOTDIR'] + build.vars['LOCALEDIR'] = os.path.join(DATAROOTDIR, 'locale') def mandir(build, DIR): if DIR is None: - DATAROOTDIR, origin = build.vars['DATAROOTDIR'] - if origin != 'default': - origin = 'derived' - build.vars['MANDIR'] = (os.path.join(DATAROOTDIR, 'man'), origin) + DATAROOTDIR = build.vars['DATAROOTDIR'] + build.vars['MANDIR'] = os.path.join(DATAROOTDIR, 'man') def docdir(build, DIR): if DIR is None: - DATAROOTDIR, origin = build.vars['DATAROOTDIR'] - PACKAGE, origin2 = build.vars['PACKAGE'] - if origin != 'default' or origin2 != 'default': - origin = 'derived' - build.vars['DOCDIR'] = (os.path.join(DATAROOTDIR, 'doc', PACKAGE), origin) + DATAROOTDIR = build.vars['DATAROOTDIR'] + PACKAGE = build.vars['PACKAGE'] + build.vars['DOCDIR'] = os.path.join(DATAROOTDIR, 'doc', PACKAGE) def htmldir(build, DIR): if DIR is None: - DOCDIR, origin = build.vars['DOCDIR'] - if origin != 'default': - origin = 'derived' - build.vars['HTMLDIR'] = (DOCDIR, origin) + DOCDIR = build.vars['DOCDIR'] + build.vars['HTMLDIR'] = DOCDIR def dvidir(build, DIR): if DIR is None: - DOCDIR, origin = build.vars['DOCDIR'] - if origin != 'default': - origin = 'derived' - build.vars['DVIDIR'] = (DOCDIR, origin) + DOCDIR = build.vars['DOCDIR'] + build.vars['DVIDIR'] = DOCDIR def pdfdir(build, DIR): if DIR is None: - DOCDIR, origin = build.vars['DOCDIR'] - if origin != 'default': - origin = 'derived' - build.vars['PDFDIR'] = (DOCDIR, origin) + DOCDIR = build.vars['DOCDIR'] + build.vars['PDFDIR'] = DOCDIR def psdir(build, DIR): if DIR is None: - DOCDIR, origin = build.vars['DOCDIR'] - if origin != 'default': - origin = 'derived' - build.vars['PSDIR'] = (DOCDIR, origin) + DOCDIR = build.vars['DOCDIR'] + build.vars['PSDIR'] = DOCDIR class Install(ClassyProject): diff --git a/attoconf/lib/make.py b/attoconf/lib/make.py index ee58619..b965f28 100644 --- a/attoconf/lib/make.py +++ b/attoconf/lib/make.py @@ -42,13 +42,13 @@ class MakeHook(object): with open(os.path.join(build.builddir, self.outfile), 'w') as out: print('Generating a makefile ...') out.write('# This part was generated by %s\n' % full_version) - build.vars['SRC_DIR'] = (build.relative_source(), 'special') + build.vars['SRC_DIR'] = build.relative_source() for var in build.project.order: if var is None: out.write('\n') continue - val, origin = build.vars[var] - out.write('# %s\n%s = %s\n' % (origin, var, val)) + val = build.vars[var] + out.write('%s = %s\n' % (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) diff --git a/attoconf/lib/templates.py b/attoconf/lib/templates.py index 791dd62..d6fc24d 100644 --- a/attoconf/lib/templates.py +++ b/attoconf/lib/templates.py @@ -29,7 +29,7 @@ class TemplateHook(object): self.outfiles = outfiles def __call__(self, build): - build.vars['SRC_DIR'] = (build.relative_source(), 'special') + build.vars['SRC_DIR'] = build.relative_source() unseen = set(build.project.order) if None in unseen: unseen.remove(None) @@ -42,14 +42,13 @@ class TemplateHook(object): for var in build.project.order: if var is None: continue - val, origin = build.vars[var] + val = build.vars[var] key = '@' + var + '@' if key not in slurpee: continue if var in unseen: unseen.remove(var) slurpee = slurpee.replace(key, str(val)) - # origin is not so useful, given config.status with open(os.path.join(build.builddir, outfile), 'w') as out: out.write(slurpee) if unseen: -- cgit v1.2.3-70-g09d2 From 9486d72bcdeaf39156137b24025911407d8a72f8 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Thu, 26 Sep 2013 10:08:03 -0700 Subject: Fix unit test for that last commit --- attoconf/_version.py | 2 +- attoconf/tests/test_core.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/attoconf/_version.py b/attoconf/_version.py index dd1465e..75812fd 100644 --- a/attoconf/_version.py +++ b/attoconf/_version.py @@ -11,7 +11,7 @@ minor = 8 # Incremented if there is a bugfix release. # Might not be contiguous. -patch = 1 +patch = 2 # Reserved for distributors and forks. # Contains arbitrary text, but no parentheses or newlines. diff --git a/attoconf/tests/test_core.py b/attoconf/tests/test_core.py index fbbe622..f394238 100644 --- a/attoconf/tests/test_core.py +++ b/attoconf/tests/test_core.py @@ -129,8 +129,8 @@ General: }) self.assertEqual(build.vars, { - 'FOO': ('B', 'command-line'), - 'BAR': (1, 'command-line'), - 'QUX': (None, 'default'), - 'VAR': ('value', 'environment'), + 'FOO': 'B', + 'BAR': 1, + 'QUX': None, + 'VAR': 'value', }) -- cgit v1.2.3-70-g09d2 From a335010cbe43a661a36437e7653ce5620dd01350 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Sun, 29 Sep 2013 18:33:15 -0700 Subject: Clean up config.status during tests This should probably be handled some better way. --- attoconf/_version.py | 2 +- attoconf/tests/test_core.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/attoconf/_version.py b/attoconf/_version.py index 75812fd..001d223 100644 --- a/attoconf/_version.py +++ b/attoconf/_version.py @@ -11,7 +11,7 @@ minor = 8 # Incremented if there is a bugfix release. # Might not be contiguous. -patch = 2 +patch = 3 # Reserved for distributors and forks. # Contains arbitrary text, but no parentheses or newlines. diff --git a/attoconf/tests/test_core.py b/attoconf/tests/test_core.py index f394238..f60aab6 100644 --- a/attoconf/tests/test_core.py +++ b/attoconf/tests/test_core.py @@ -22,6 +22,7 @@ import unittest from attoconf.core import Project, Build from attoconf.types import uint, shell_word, shell_partial_word +import os from cStringIO import StringIO import sys @@ -127,6 +128,7 @@ General: 'QUX': 'a', '--qux': 'b', }) + os.remove('config.status') self.assertEqual(build.vars, { 'FOO': 'B', -- cgit v1.2.3-70-g09d2 From 2c30aa6572b9c8e455fb0aba5b5ed75361962d6b Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Sun, 29 Sep 2013 18:49:35 -0700 Subject: Improve version messages --- attoconf/_version.py | 2 +- attoconf/version.py | 38 ++++++++++++++++++++++++++++++++------ 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/attoconf/_version.py b/attoconf/_version.py index 001d223..5e27224 100644 --- a/attoconf/_version.py +++ b/attoconf/_version.py @@ -11,7 +11,7 @@ minor = 8 # Incremented if there is a bugfix release. # Might not be contiguous. -patch = 3 +patch = 4 # Reserved for distributors and forks. # Contains arbitrary text, but no parentheses or newlines. diff --git a/attoconf/version.py b/attoconf/version.py index 3194aec..829005c 100644 --- a/attoconf/version.py +++ b/attoconf/version.py @@ -22,19 +22,45 @@ import sys from . import _version if sys.version_info[0] != 2 or sys.version_info[1] < 7: - sys.exit('Unsupported Python version: %s\nRequire Python 2.7' % sys.version) + sys.exit('Unsupported Python version: %s\nattoconf requires Python 2.7' % sys.version) def require_version(major, minor, patch=0): ''' Check that this is the right version of attoconf, or die trying. ''' - - actual = 'Current version: ' + full_version if major != _version.major: - sys.exit('Unsupported major version: %d\n' % major + actual) + # Once I release attoconf 1.0, I *probably* won't ever + # do another major upgrade - that would be difficult to package. + sys.exit( +''' +This configure script requires a different major version of attoconf. +Major version changes are rare, and software written against the one +version is likely to need changes to work with the other version. + +Current version: %s +Minimum required version: %d.%d.%d +''' % (full_version, major, minor, patch)) if minor > _version.minor: - sys.exit('Unsupported minor version: %d.%d\n' % (major, minor) + actual) + # In the interest of good style, it sometimes *should* be rewritten. + sys.exit( +''' +This configure script requires a newer minor version of attoconf. +Minor version changes are common, and software written against the one +minor version will work with all later minor versions. + +Current version: %s +Minimum required version: %d.%d.%d +''' % (full_version, major, minor, patch)) if minor == _version.minor and patch > _version.patch: - sys.exit('Unsupported patch version: %d.%d.%d\n' % (major, minor, patch) + actual) + sys.exit( +''' +This configure script requires a newer patch version of attoconf. +Patch versions are usually not released unless there is a bug in a minor +version, but it is possible that someone is using experimental features. +If there is one, upgrade to the latest minor version instead. + +Current version: %s +Minimum required version: %d.%d.%d +''' % (full_version, major, minor, patch)) part_version = '%d.%d.%d' % (_version.major, _version.minor, _version.patch) full_version = 'attoconf %s (%s)' % (part_version, _version.distributor) -- cgit v1.2.3-70-g09d2 From 0f0e6300534b8b847f139c04b9e6ed1cc1100d90 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Tue, 15 Oct 2013 14:10:22 -0700 Subject: Print help header for env section --- attoconf/_version.py | 2 +- attoconf/classy.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/attoconf/_version.py b/attoconf/_version.py index 5e27224..4199a0e 100644 --- a/attoconf/_version.py +++ b/attoconf/_version.py @@ -11,7 +11,7 @@ minor = 8 # Incremented if there is a bugfix release. # Might not be contiguous. -patch = 4 +patch = 5 # Reserved for distributors and forks. # Contains arbitrary text, but no parentheses or newlines. diff --git a/attoconf/classy.py b/attoconf/classy.py index 7a16372..a2891dc 100644 --- a/attoconf/classy.py +++ b/attoconf/classy.py @@ -95,6 +95,7 @@ class ClassyProject(Project): Usually there is one or two of these for every program needed. ''' + self.add_help('Environment Variables:', hidden=False) def features(self): ''' Customizations for this package (--enable-*). -- cgit v1.2.3-70-g09d2 From d6052fda42c8d59486bd95b025b6d6b436e00424 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 16 Jul 2014 17:39:52 -0700 Subject: Remove possibility of custom vars Retained temporary backward-compatibility vars until 1.0 --- attoconf/_version.py | 2 +- attoconf/core.py | 20 +++++++++----------- attoconf/lib/c.py | 44 +++++++++++++++++++++++--------------------- attoconf/lib/install.py | 6 ++++-- 4 files changed, 37 insertions(+), 35 deletions(-) diff --git a/attoconf/_version.py b/attoconf/_version.py index 4199a0e..28024a6 100644 --- a/attoconf/_version.py +++ b/attoconf/_version.py @@ -11,7 +11,7 @@ minor = 8 # Incremented if there is a bugfix release. # Might not be contiguous. -patch = 5 +patch = 6 # Reserved for distributors and forks. # Contains arbitrary text, but no parentheses or newlines. diff --git a/attoconf/core.py b/attoconf/core.py index b5cb008..bb9d2ba 100644 --- a/attoconf/core.py +++ b/attoconf/core.py @@ -24,7 +24,7 @@ import sys from .help import Help # Nothing to see here. Move along. -Option = namedtuple('Option', ['type', 'init', 'var']) +Option = namedtuple('Option', ['type', 'init']) class ArgumentError(Exception): pass def as_var(name): @@ -78,7 +78,7 @@ class Project(object): self.help.add_option(key, help, hidden) def add_option(self, name, init, type, check, - help, hidden, var=None, + help, hidden, help_var=None, help_def=None): ''' Add an actual option. @@ -96,17 +96,16 @@ class Project(object): ''' if name in self.options: raise KeyError(name) + var = as_var(name) if check is not None: assert type.__module__ == 'attoconf.types' - if var is None: - var = as_var(name) else: # used by some tests ... should this be fixed there instead? if help_var is None: - help_var = as_var(name) + help_var = var if init is not None: init = type(init) - self.options[name] = Option(init=init, type=type, var=var) + self.options[name] = Option(init=init, type=type) if check is not None: self.order.append(var) self.checks.append( @@ -153,9 +152,8 @@ class Build(object): ''' self.project = project self.builddir = trim_trailing_slashes(builddir) - self.vars = {o.var: o.init - for o in project.options.itervalues() - if o.var is not None} + self.vars = {as_var(k): o.init + for (k, o) in project.options.iteritems()} self._seen_args = OrderedDict() def apply_arg(self, arg): @@ -184,7 +182,7 @@ class Build(object): opt = self.project.options.get(k) if opt is None: raise sys.exit('Unknown option %s' % k) - self.vars[opt.var] = opt.type(a) + self.vars[as_var(k)] = opt.type(a) def finish(self): ''' With the current set of variables, run all the checks @@ -218,7 +216,7 @@ class Build(object): if val is not None: self._seen_args[k] = val opt = self.project.options[k] - self.vars[opt.var] = opt.type(val) + self.vars[as_var(k)] = opt.type(val) for arg in args: self.apply_arg(arg) diff --git a/attoconf/lib/c.py b/attoconf/lib/c.py index 062e695..3b6f05f 100644 --- a/attoconf/lib/c.py +++ b/attoconf/lib/c.py @@ -75,17 +75,17 @@ def try_compile_c(build, body, CFLAGS=[], CPPFLAGS=[]): if status: raise TestError(error) -def try_compile_link_c(build, body, CFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LDLIBS=[]): +def try_compile_link_c(build, body, CFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LIBS=[]): CC = build.vars['CC'] CFLAGS = build.vars['CFLAGS'] + CFLAGS CPPFLAGS = build.vars['CPPFLAGS'] + CPPFLAGS LDFLAGS = build.vars['LDFLAGS'] + LDFLAGS - LDLIBS = build.vars['LDLIBS'] + LDLIBS + LIBS = build.vars['LIBS'] + LIBS in_ = 'atto-test.c' ins = [in_] out = 'atto-test' - args = CC + CFLAGS + CPPFLAGS + LDFLAGS + ins + LDLIBS + ['-o', out] + args = CC + CFLAGS + CPPFLAGS + LDFLAGS + ins + LIBS + ['-o', out] with TempFile(in_, body), TempFile(out, None): status, error = do_exec(build, args) if status: @@ -104,41 +104,41 @@ def try_compile_cxx(build, body, CXXFLAGS=[], CPPFLAGS=[]): if status: raise TestError(error) -def try_compile_link_cxx(build, body, CXXFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LDLIBS=[]): +def try_compile_link_cxx(build, body, CXXFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LIBS=[]): CXX = build.vars['CXX'] CXXFLAGS = build.vars['CXXFLAGS'] + CXXFLAGS CPPFLAGS = build.vars['CPPFLAGS'] + CPPFLAGS LDFLAGS = build.vars['LDFLAGS'] + LDFLAGS - LDLIBS = build.vars['LDLIBS'] + LDLIBS + LIBS = build.vars['LIBS'] + LIBS in_ = 'atto-test.cxx' ins = [in_] out = 'atto-test' - args = CXX + CXXFLAGS + CPPFLAGS + LDFLAGS + ins + LDLIBS + ['-o', out] + args = CXX + CXXFLAGS + CPPFLAGS + LDFLAGS + ins + LIBS + ['-o', out] with TempFile(in_, body), TempFile(out, None): status, error = do_exec(build, args) if status: raise TestError(error) if 0: - def try_linkonly_c(build, ins, LDFLAGS=[], LDLIBS=[]): + def try_linkonly_c(build, ins, LDFLAGS=[], LIBS=[]): CC = build.vars['CC'] LDFLAGS = build.vars['LDFLAGS'] + LDFLAGS - LDLIBS = build.vars['LDLIBS'] + LDLIBS + LIBS = build.vars['LIBS'] + LIBS out = 'atto-test' - args = CC + LDFLAGS + ins + LDLIBS + ['-o', out] + args = CC + LDFLAGS + ins + LIBS + ['-o', out] with TempFile(out, None): status, error = do_exec(build, args) if status: raise TestError(error) -def try_compile_link2_c(build, body, CFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LDLIBS=[]): +def try_compile_link2_c(build, body, CFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LIBS=[]): CC = build.vars['CC'] CFLAGS = build.vars['CFLAGS'] + CFLAGS CPPFLAGS = build.vars['CPPFLAGS'] + CPPFLAGS LDFLAGS = build.vars['LDFLAGS'] + LDFLAGS - LDLIBS = build.vars['LDLIBS'] + LDLIBS + LIBS = build.vars['LIBS'] + LIBS in_ = 'atto-test.c' ins = [in_] mid = 'atto-test.o' @@ -146,7 +146,7 @@ def try_compile_link2_c(build, body, CFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LDLIBS= out = 'atto-test' args1 = CC + CFLAGS + CPPFLAGS + ['-c', '-o', mid, in_] - args2 = CC + LDFLAGS + mids + LDLIBS + ['-o', out] + args2 = CC + LDFLAGS + mids + LIBS + ['-o', out] with TempFile(mid, None): with TempFile(in_, body): status, error = do_exec(build, args1) @@ -159,24 +159,24 @@ def try_compile_link2_c(build, body, CFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LDLIBS= raise TestError(error) if 0: - def try_linkonly_cxx(build, ins, LDFLAGS=[], LDLIBS=[]): + def try_linkonly_cxx(build, ins, LDFLAGS=[], LIBS=[]): CXX = build.vars['CXX'] LDFLAGS = build.vars['LDFLAGS'] + LDFLAGS - LDLIBS = build.vars['LDLIBS'] + LDLIBS + LIBS = build.vars['LIBS'] + LIBS out = 'atto-test' - args = CXX + LDFLAGS + ins + LDLIBS + ['-o', out] + args = CXX + LDFLAGS + ins + LIBS + ['-o', out] with TempFile(out, None): status, error = do_exec(build, args) if status: raise TestError(error) -def try_compile_link2_cxx(build, body, CXXFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LDLIBS=[]): +def try_compile_link2_cxx(build, body, CXXFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LIBS=[]): CXX = build.vars['CXX'] CXXFLAGS = build.vars['CXXFLAGS'] + CXXFLAGS CPPFLAGS = build.vars['CPPFLAGS'] + CPPFLAGS LDFLAGS = build.vars['LDFLAGS'] + LDFLAGS - LDLIBS = build.vars['LDLIBS'] + LDLIBS + LIBS = build.vars['LIBS'] + LIBS in_ = 'atto-test.cxx' ins = [in_] mid = 'atto-test.o' @@ -184,7 +184,7 @@ def try_compile_link2_cxx(build, body, CXXFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LDL out = 'atto-test' args1 = CXX + CXXFLAGS + CPPFLAGS + ['-c', '-o', mid, in_] - args2 = CXX + LDFLAGS + mids + LDLIBS + ['-o', out] + args2 = CXX + LDFLAGS + mids + LIBS + ['-o', out] with TempFile(mid, None): with TempFile(in_, body): status, error = do_exec(build, args1) @@ -200,8 +200,9 @@ def try_compile_link2_cxx(build, body, CXXFLAGS=[], CPPFLAGS=[], LDFLAGS=[], LDL def ldflags(build, LDFLAGS): pass -def libs(build, LDLIBS): - pass +def libs(build, LIBS): + # compatibility + build.vars['LDLIBS'] = LIBS def cppflags(build, CPPFLAGS): pass @@ -233,7 +234,8 @@ class Link(Arches2): self.add_option('LIBS', init=[], type=ShellList, check=libs, help='libraries to pass to the linker, e.g. -l', - hidden=False, var='LDLIBS') + hidden=False) + self.order.append('LDLIBS') class Preprocess(Arches2): __slots__ = () diff --git a/attoconf/lib/install.py b/attoconf/lib/install.py index b3eb989..1a55c29 100644 --- a/attoconf/lib/install.py +++ b/attoconf/lib/install.py @@ -35,7 +35,8 @@ def prefix(build, PREFIX): def exec_prefix(build, EPREFIX): if EPREFIX is None: PREFIX = build.vars['PREFIX'] - build.vars['EPREFIX'] = PREFIX + build.vars['EXEC_PREFIX'] = PREFIX + build.vars['EPREFIX'] = build.vars['EXEC_PREFIX'] def bindir(build, DIR): if DIR is None: @@ -182,7 +183,8 @@ class Install(ClassyProject): type=filepath, check=exec_prefix, help='install architecture-dependent files in EPREFIX', hidden=False, - var='EPREFIX', help_def='PREFIX') + help_var='EPREFIX', help_def='PREFIX') + self.order.append('EPREFIX') self.order.append(None) self.add_help('Fine tuning of the installation directories:', -- cgit v1.2.3-70-g09d2 From 9d681429a3c78520614be1f4852de8ffb1bfcd8a Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Thu, 17 Jul 2014 00:10:58 -0700 Subject: Ditch the special treatment of None --- attoconf/_version.py | 4 +- attoconf/classy.py | 4 +- attoconf/core.py | 14 +++-- attoconf/lib/arches.py | 23 ++++---- attoconf/lib/c.py | 26 +++++++--- attoconf/lib/install.py | 124 ++++++++++++++++++++++---------------------- attoconf/tests/test_core.py | 25 ++++----- attoconf/types.py | 23 ++++++-- 8 files changed, 136 insertions(+), 107 deletions(-) diff --git a/attoconf/_version.py b/attoconf/_version.py index 28024a6..18e1fb6 100644 --- a/attoconf/_version.py +++ b/attoconf/_version.py @@ -7,11 +7,11 @@ major = 0 # Incremented for releases with compatible API additions. # This is the number that is usually incremented. -minor = 8 +minor = 9 # Incremented if there is a bugfix release. # Might not be contiguous. -patch = 6 +patch = 0 # Reserved for distributors and forks. # Contains arbitrary text, but no parentheses or newlines. diff --git a/attoconf/classy.py b/attoconf/classy.py index a2891dc..a27230d 100644 --- a/attoconf/classy.py +++ b/attoconf/classy.py @@ -68,9 +68,9 @@ class ClassyProject(Project): self.add_help('General:', hidden=False) self.add_alias('--help', ['--help=default'], help='display standard help, then exit', hidden=False) - self.add_option('--help', init=None, + self.add_option('--help', init='none', type=self.do_help, check=None, - help='display some kind of help', hidden=False, + help='just display some kind of help instead of configuring', hidden=False, help_var='KIND') self.help.add_option('--help=hidden', help='display help you should never ever ever care about', diff --git a/attoconf/core.py b/attoconf/core.py index bb9d2ba..0d196e9 100644 --- a/attoconf/core.py +++ b/attoconf/core.py @@ -103,8 +103,9 @@ class Project(object): # used by some tests ... should this be fixed there instead? if help_var is None: help_var = var - if init is not None: - init = type(init) + assert init is not None + init = type(init) + assert init is not None self.options[name] = Option(init=init, type=type) if check is not None: self.order.append(var) @@ -113,10 +114,11 @@ class Project(object): if help_var is None: help_var = var + if help_def is None: help_def = init - if help_def is not None: - help = '%s [%s]' % (help, help_def) + assert help_def is not None + help = '%s [%s]' % (help, help_def) if help_var != name: help_opt = '%s=%s' % (name, help_var) @@ -127,12 +129,14 @@ class Project(object): def do_help(self, opt): ''' Pseudo type-hook to be registered for --help (calls sys.exit). ''' + if opt == 'none': + return opt if opt == 'default': hidden = False elif opt == 'hidden': hidden = True else: - raise ValueError + raise ValueError('Unknown value for opt: %r' % opt) self.help.print(sys.stdout, hidden) sys.exit() # sneaky diff --git a/attoconf/lib/arches.py b/attoconf/lib/arches.py index cffd8ca..8c70f0b 100644 --- a/attoconf/lib/arches.py +++ b/attoconf/lib/arches.py @@ -18,21 +18,19 @@ from __future__ import print_function, division, absolute_import from ..classy import ClassyProject -from ..types import triple +from ..types import triple, maybe -# TODO: see if there's a way to expose them sanely, without using Nones -# (currently I never emit them: instead I pop the order) def build(build, BUILD): pass def host(build, HOST): - if HOST is None: + if not HOST: BUILD = build.vars['BUILD'] build.vars['HOST'] = BUILD def target(build, TARGET): - if TARGET is None: + if not TARGET: HOST = build.vars['HOST'] build.vars['TARGET'] = HOST @@ -42,24 +40,21 @@ class Arches2(ClassyProject): def arches(self): super(Arches2, self).arches() self.add_help('System types:', hidden=False) - self.add_option('--build', init=None, - type=triple, check=build, + self.add_option('--build', init='', + type=maybe(triple), check=build, help='configure for building on BUILD', hidden=False, help_def='native') - self.order.pop() - self.add_option('--host', init=None, - type=triple, check=host, + self.add_option('--host', init='', + type=maybe(triple), check=host, help='cross-compile to build programs to run on HOST', hidden=False, help_def='BUILD') - self.order.pop() # TODO figure out the mro implications when I use this class Arches3(Arches2): __slots__ = () def arches(self): super(Arches3, self).arches() - self.add_option('--target', init=None, - type=triple, check=target, + self.add_option('--target', init='', + type=maybe(triple), check=target, help='configure for building compilers for TARGET', hidden=False, help_def='HOST') - self.order.pop() diff --git a/attoconf/lib/c.py b/attoconf/lib/c.py index 3b6f05f..bc32c49 100644 --- a/attoconf/lib/c.py +++ b/attoconf/lib/c.py @@ -208,7 +208,12 @@ def cppflags(build, CPPFLAGS): pass def cc(build, CC): - pass + if CC.list == []: + HOST = build.vars['HOST'] + if HOST: + build.vars['CC'].list = [HOST + '-gcc'] + else: + build.vars['CC'].list = ['gcc'] def cflags(build, CFLAGS): try_compile_c(build, 'int main() {}\n') @@ -216,7 +221,12 @@ def cflags(build, CFLAGS): try_compile_link2_c(build, 'int main() {}\n') def cxx(build, CXX): - pass + if CXX.list == []: + HOST = build.vars['HOST'] + if HOST: + build.vars['CXX'].list = [HOST + '-g++'] + else: + build.vars['CXX'].list = ['g++'] def cxxflags(build, CXXFLAGS): try_compile_cxx(build, 'int main() {}\n') @@ -235,7 +245,7 @@ class Link(Arches2): type=ShellList, check=libs, help='libraries to pass to the linker, e.g. -l', hidden=False) - self.order.append('LDLIBS') + self.order.append('LDLIBS') #TODO remove for 1.0 class Preprocess(Arches2): __slots__ = () @@ -250,9 +260,10 @@ class C(Link, Preprocess): __slots__ = () def vars(self): super(C, self).vars() - self.add_option('CC', init=['gcc'], + self.add_option('CC', init=[], type=ShellList, check=cc, - help='C compiler command', hidden=False) + help='C compiler command', hidden=False, + help_def='HOST-gcc') self.add_option('CFLAGS', init=['-O2', '-g'], type=ShellList, check=cflags, help='C compiler flags', hidden=False) @@ -261,9 +272,10 @@ class Cxx(Link, Preprocess): __slots__ = () def vars(self): super(Cxx, self).vars() - self.add_option('CXX', init=['g++'], + self.add_option('CXX', init=[], type=ShellList, check=cxx, - help='C++ compiler command', hidden=False) + help='C++ compiler command', hidden=False, + help_def='HOST-g++') self.add_option('CXXFLAGS', init=['-O2', '-g'], type=ShellList, check=cxxflags, help='C++ compiler flags', hidden=False) diff --git a/attoconf/lib/install.py b/attoconf/lib/install.py index 1a55c29..f43b2a1 100644 --- a/attoconf/lib/install.py +++ b/attoconf/lib/install.py @@ -20,7 +20,7 @@ from __future__ import print_function, division, absolute_import import os from ..classy import ClassyProject -from ..types import shell_word, filepath, quoted_string +from ..types import shell_word, filepath, quoted_string, maybe def package(build, PACKAGE): @@ -33,48 +33,48 @@ def prefix(build, PREFIX): pass def exec_prefix(build, EPREFIX): - if EPREFIX is None: + if not EPREFIX: PREFIX = build.vars['PREFIX'] build.vars['EXEC_PREFIX'] = PREFIX build.vars['EPREFIX'] = build.vars['EXEC_PREFIX'] def bindir(build, DIR): - if DIR is None: + if not DIR: EPREFIX = build.vars['EPREFIX'] build.vars['BINDIR'] = os.path.join(EPREFIX, 'bin') def sbindir(build, DIR): - if DIR is None: + if not DIR: EPREFIX = build.vars['EPREFIX'] build.vars['SBINDIR'] = os.path.join(EPREFIX, 'sbin') def libexecdir(build, DIR): - if DIR is None: + if not DIR: EPREFIX = build.vars['EPREFIX'] build.vars['LIBEXECDIR'] = os.path.join(EPREFIX, 'libexec') def sysconfdir(build, DIR): - if DIR is None: + if not DIR: PREFIX = build.vars['PREFIX'] build.vars['SYSCONFDIR'] = os.path.join(PREFIX, 'etc') def sharedstatedir(build, DIR): - if DIR is None: + if not DIR: PREFIX = build.vars['PREFIX'] build.vars['SHAREDSTATEDIR'] = os.path.join(PREFIX, 'com') def localstatedir(build, DIR): - if DIR is None: + if not DIR: PREFIX = build.vars['PREFIX'] build.vars['LOCALSTATEDIR'] = os.path.join(PREFIX, 'var') def libdir(build, DIR): - if DIR is None: + if not DIR: EPREFIX = build.vars['EPREFIX'] build.vars['LIBDIR'] = os.path.join(EPREFIX, 'lib') def includedir(build, DIR): - if DIR is None: + if not DIR: PREFIX = build.vars['PREFIX'] build.vars['INCLUDEDIR'] = os.path.join(PREFIX, 'include') @@ -82,59 +82,59 @@ def oldincludedir(build, DIR): pass def datarootdir(build, DIR): - if DIR is None: + if not DIR: PREFIX = build.vars['PREFIX'] build.vars['DATAROOTDIR'] = os.path.join(PREFIX, 'share') def datadir(build, DIR): - if DIR is None: + if not DIR: DATAROOTDIR = build.vars['DATAROOTDIR'] build.vars['DATADIR'] = DATAROOTDIR def packagedatadir(build, DIR): - if DIR is None: + if not DIR: DATADIR = build.vars['DATADIR'] PACKAGE = build.vars['PACKAGE'] build.vars['PACKAGEDATADIR'] = os.path.join(DATADIR, PACKAGE) def infodir(build, DIR): - if DIR is None: + if not DIR: DATAROOTDIR = build.vars['DATAROOTDIR'] build.vars['INFODIR'] = os.path.join(DATAROOTDIR, 'info') def localedir(build, DIR): - if DIR is None: + if not DIR: DATAROOTDIR = build.vars['DATAROOTDIR'] build.vars['LOCALEDIR'] = os.path.join(DATAROOTDIR, 'locale') def mandir(build, DIR): - if DIR is None: + if not DIR: DATAROOTDIR = build.vars['DATAROOTDIR'] build.vars['MANDIR'] = os.path.join(DATAROOTDIR, 'man') def docdir(build, DIR): - if DIR is None: + if not DIR: DATAROOTDIR = build.vars['DATAROOTDIR'] PACKAGE = build.vars['PACKAGE'] build.vars['DOCDIR'] = os.path.join(DATAROOTDIR, 'doc', PACKAGE) def htmldir(build, DIR): - if DIR is None: + if not DIR: DOCDIR = build.vars['DOCDIR'] build.vars['HTMLDIR'] = DOCDIR def dvidir(build, DIR): - if DIR is None: + if not DIR: DOCDIR = build.vars['DOCDIR'] build.vars['DVIDIR'] = DOCDIR def pdfdir(build, DIR): - if DIR is None: + if not DIR: DOCDIR = build.vars['DOCDIR'] build.vars['PDFDIR'] = DOCDIR def psdir(build, DIR): - if DIR is None: + if not DIR: DOCDIR = build.vars['DOCDIR'] build.vars['PSDIR'] = DOCDIR @@ -179,93 +179,93 @@ class Install(ClassyProject): type=filepath, check=prefix, help='install architecture-independent files in PREFIX', hidden=False) - self.add_option('--exec-prefix', init=None, - type=filepath, check=exec_prefix, + self.add_option('--exec-prefix', init='', + type=maybe(filepath), check=exec_prefix, help='install architecture-dependent files in EPREFIX', hidden=False, help_var='EPREFIX', help_def='PREFIX') - self.order.append('EPREFIX') + self.order.append('EPREFIX') # TODO remove for 1.0 self.order.append(None) self.add_help('Fine tuning of the installation directories:', hidden=False) - self.add_option('--bindir', init=None, - type=filepath, check=bindir, + self.add_option('--bindir', init='', + type=maybe(filepath), check=bindir, help='user executables', hidden=False, help_var='DIR', help_def='EPREFIX/bin') - self.add_option('--sbindir', init=None, - type=filepath, check=sbindir, + self.add_option('--sbindir', init='', + type=maybe(filepath), check=sbindir, help='system admin executables', hidden=False, help_var='DIR', help_def='EPREFIX/sbin') - self.add_option('--libexecdir', init=None, - type=filepath, check=libexecdir, + self.add_option('--libexecdir', init='', + type=maybe(filepath), check=libexecdir, help='program executables', hidden=False, help_var='DIR', help_def='EPREFIX/libexec') - self.add_option('--sysconfdir', init=None, - type=filepath, check=sysconfdir, + self.add_option('--sysconfdir', init='', + type=maybe(filepath), check=sysconfdir, help='read-only single-machine data', hidden=False, help_var='DIR', help_def='PREFIX/etc') - self.add_option('--sharedstatedir', init=None, - type=filepath, check=sharedstatedir, + self.add_option('--sharedstatedir', init='', + type=maybe(filepath), check=sharedstatedir, help='modifiable architecture-independent data', hidden=False, help_var='DIR', help_def='PREFIX/com') - self.add_option('--localstatedir', init=None, - type=filepath, check=localstatedir, + self.add_option('--localstatedir', init='', + type=maybe(filepath), check=localstatedir, help='modifiable single-machine data', hidden=False, help_var='DIR', help_def='PREFIX/var') - self.add_option('--libdir', init=None, - type=filepath, check=libdir, + self.add_option('--libdir', init='', + type=maybe(filepath), check=libdir, help='object code libraries', hidden=False, help_var='DIR', help_def='EPREFIX/lib') - self.add_option('--includedir', init=None, - type=filepath, check=includedir, + self.add_option('--includedir', init='', + type=maybe(filepath), check=includedir, help='C header files', hidden=False, help_var='DIR', help_def='PREFIX/include') self.add_option('--oldincludedir', init='/usr/include', type=filepath, check=oldincludedir, help='C header files for non-gcc', hidden=False, help_var='DIR') - self.add_option('--datarootdir', init=None, - type=filepath, check=datarootdir, + self.add_option('--datarootdir', init='', + type=maybe(filepath), check=datarootdir, help='read-only arch.-independent data root', hidden=False, help_var='DIR', help_def='PREFIX/share') - self.add_option('--datadir', init=None, - type=filepath, check=datadir, + self.add_option('--datadir', init='', + type=maybe(filepath), check=datadir, help='read-only architecture-independent data', hidden=False, help_var='DIR', help_def='DATAROOTDIR') - self.add_option('--packagedatadir', init=None, - type=filepath, check=packagedatadir, + self.add_option('--packagedatadir', init='', + type=maybe(filepath), check=packagedatadir, help='data specific to this package (please set datadir instead)', hidden=False, help_var='DIR', help_def='DATADIR/PACKAGE') - self.add_option('--infodir', init=None, - type=filepath, check=infodir, + self.add_option('--infodir', init='', + type=maybe(filepath), check=infodir, help='info documentation', hidden=False, help_var='DIR', help_def='DATAROOTDIR/info') - self.add_option('--localedir', init=None, - type=filepath, check=localedir, + self.add_option('--localedir', init='', + type=maybe(filepath), check=localedir, help='locale-dependent data', hidden=False, help_var='DIR', help_def='DATAROOTDIR/locale') - self.add_option('--mandir', init=None, - type=filepath, check=mandir, + self.add_option('--mandir', init='', + type=maybe(filepath), check=mandir, help='man documentation', hidden=False, help_var='DIR', help_def='DATAROOTDIR/man') - self.add_option('--docdir', init=None, - type=filepath, check=docdir, + self.add_option('--docdir', init='', + type=maybe(filepath), check=docdir, help='documentation root', hidden=False, help_var='DIR', help_def='DATAROOTDIR/doc/PACKAGE') - self.add_option('--htmldir', init=None, - type=filepath, check=htmldir, + self.add_option('--htmldir', init='', + type=maybe(filepath), check=htmldir, help='html documentation', hidden=False, help_var='DIR', help_def='DOCDIR') - self.add_option('--dvidir', init=None, - type=filepath, check=dvidir, + self.add_option('--dvidir', init='', + type=maybe(filepath), check=dvidir, help='dvi documentation', hidden=False, help_var='DIR', help_def='DOCDIR') - self.add_option('--pdfdir', init=None, - type=filepath, check=pdfdir, + self.add_option('--pdfdir', init='', + type=maybe(filepath), check=pdfdir, help='pdf documentation', hidden=False, help_var='DIR', help_def='DOCDIR') - self.add_option('--psdir', init=None, - type=filepath, check=psdir, + self.add_option('--psdir', init='', + type=maybe(filepath), check=psdir, help='ps documentation', hidden=False, help_var='DIR', help_def='DOCDIR') diff --git a/attoconf/tests/test_core.py b/attoconf/tests/test_core.py index f60aab6..09c2c64 100644 --- a/attoconf/tests/test_core.py +++ b/attoconf/tests/test_core.py @@ -20,7 +20,7 @@ from __future__ import print_function, division, absolute_import import unittest from attoconf.core import Project, Build -from attoconf.types import uint, shell_word, shell_partial_word +from attoconf.types import uint, shell_word, shell_partial_word, maybe import os from cStringIO import StringIO @@ -44,7 +44,7 @@ class TestProject(unittest.TestCase): proj.add_help('General:', False) proj.add_alias('--help', ['--help=default'], help='display standard help, then exit', hidden=False) - proj.add_option('--help', init=None, + proj.add_option('--help', init='none', type=proj.do_help, check=None, help='display some subset of help', hidden=False, help_var='TYPE') @@ -54,8 +54,8 @@ class TestProject(unittest.TestCase): proj.add_option('--foo', init='asdf', type=shell_word, check=None, help='set frob target', hidden=False) - proj.add_option('--bar', init=None, - type=shell_word, check=None, + proj.add_option('--bar', init='', + type=maybe(shell_word), check=None, help='set frob source', hidden=False, help_def='FOO') @@ -68,7 +68,7 @@ class TestProject(unittest.TestCase): self.assertEqual(out.getvalue(), ''' General: --help display standard help, then exit - --help=TYPE display some subset of help + --help=TYPE display some subset of help [none] --foo=FOO set frob target [asdf] --bar=BAR set frob source [FOO] @@ -81,7 +81,7 @@ General: self.assertEqual(out.getvalue(), ''' General: --help display standard help, then exit - --help=TYPE display some subset of help + --help=TYPE display some subset of help [none] --help=hidden display help you should never ever ever care about --foo=FOO set frob target [asdf] --bar=BAR set frob source [FOO] @@ -101,22 +101,23 @@ General: def check_bar(bld, BAR): self.assertEqual(BAR, 1) def check_qux(bld, QUX): - self.assertEqual(QUX, None) + self.assertEqual(QUX, '') def check_var(bld, VAR): self.assertEqual(VAR, 'value') proj = Project('.') proj.add_alias('--alias', ['--foo=A', '--bar=1', '--foo=B'], help=None, hidden=False) - proj.add_option('--foo', init=None, + proj.add_option('--foo', init='X', type=shell_word, check=check_foo, help='help for string foo', hidden=False) proj.add_option('--bar', init=0, type=uint, check=check_bar, help='help for int bar', hidden=False) - proj.add_option('--qux', init=None, - type=uint, check=check_qux, - help='help for int qux', hidden=False) + proj.add_option('--qux', init='', + type=maybe(uint), check=check_qux, + help='help for int qux', hidden=False, + help_def='auto') proj.add_option('VAR', init='', type=shell_partial_word, check=check_var, help='help for string VAR', hidden=False) @@ -133,6 +134,6 @@ General: { 'FOO': 'B', 'BAR': 1, - 'QUX': None, + 'QUX': '', 'VAR': 'value', }) diff --git a/attoconf/types.py b/attoconf/types.py index 3e73d86..e7c8465 100644 --- a/attoconf/types.py +++ b/attoconf/types.py @@ -51,6 +51,18 @@ class enum(object): raise ValueError('%r not in {%s}' % (s, ', '.join(self.args))) +class maybe(object): + __slots__ = ('inferior') + + def __init__(self, inferior): + self.inferior = inferior + + def __call__(self, s): + if not s: + return s + return (self.inferior)(s) + + class ShellList(object): ''' An argument type representing a sequence of 0 or more arguments ''' @@ -96,9 +108,14 @@ def quoted_string(s): def filepath(s): s = trim_trailing_slashes(s) - # must be absolute *and* canonical - if s != os.path.abspath(s): - raise ValueError('Not an absolute, canonical pathname: %s' % s) + # must be absolute *and* canonical, except joinable + a = os.path.abspath(s) + if a == '/': + # filepaths often directly cat a subpath + # @me@/whatever is invalid if @me@ == / + a = '/.' + if s != a: + raise ValueError('Not an absolute, canonical (except joinable) pathname: %r != %r' % (s, a)) return s -- cgit v1.2.3-70-g09d2 From d33fcf6cc7380633329fdaf2e7f7543bbdd2490e Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Thu, 17 Jul 2014 11:49:24 -0700 Subject: Use a metaclass instead of @add_slots --- attoconf/_version.py | 2 +- attoconf/classy.py | 35 ++++++++++++++++++++++------------- attoconf/core.py | 2 +- attoconf/lib/arches.py | 2 +- attoconf/lib/c.py | 2 +- attoconf/lib/install.py | 8 ++------ attoconf/lib/make.py | 6 ++---- attoconf/lib/templates.py | 6 ++---- attoconf/tests/test_core.py | 2 +- attoconf/types.py | 2 +- 10 files changed, 34 insertions(+), 33 deletions(-) diff --git a/attoconf/_version.py b/attoconf/_version.py index 18e1fb6..791d3d9 100644 --- a/attoconf/_version.py +++ b/attoconf/_version.py @@ -11,7 +11,7 @@ minor = 9 # Incremented if there is a bugfix release. # Might not be contiguous. -patch = 0 +patch = 1 # Reserved for distributors and forks. # Contains arbitrary text, but no parentheses or newlines. diff --git a/attoconf/classy.py b/attoconf/classy.py index a27230d..98d54aa 100644 --- a/attoconf/classy.py +++ b/attoconf/classy.py @@ -1,4 +1,4 @@ -# Copyright 2013 Ben Longbons +# Copyright 2013-2014 Ben Longbons # # This file is part of attoconf. # @@ -19,24 +19,33 @@ from __future__ import print_function, division, absolute_import from .core import Project, Build -# TODO: put this in a metaclass -# some of the init/jiggle logic would also be simplified by a metaclass +class PolymorphicSlotMergerMetaclass(type): + + def __new__(meta, name, bases, dct): + if '__slots__' not in dct: + s = () + for b in bases: + s2 = b.__dict__.get('_merge_slots_', ()) + if isinstance(s2, basestring): + s2 = (s2,) + s += s2 + s += dct.get('_merge_slots_', ()) + dct['__slots__'] = s + else: + assert dct['__slots__'] == () + return type.__new__(meta, name, bases, dct) + + +# TODO: remove this for 1.0 def add_slots(cls): - ''' A decorator that fixes __slots__ after multiple inheritance. - ''' - return type(cls.__name__, cls.__bases__, - dict(cls.__dict__, __slots__=cls.slots())) + return cls class ClassyProject(Project): ''' A more convenient, objectish, way of setting up a project. ''' __slots__ = () - @classmethod - def slots(self): - ''' slots don't work too well with multiple inheritance, - so make the most-derived class create all the slots - ''' - return () + _merge_slots_ = () + __metaclass__ = PolymorphicSlotMergerMetaclass def __init__(self, srcdir): super(ClassyProject, self).__init__(srcdir) diff --git a/attoconf/core.py b/attoconf/core.py index 0d196e9..8fff40f 100644 --- a/attoconf/core.py +++ b/attoconf/core.py @@ -1,4 +1,4 @@ -# Copyright 2013 Ben Longbons +# Copyright 2013-2014 Ben Longbons # # This file is part of attoconf. # diff --git a/attoconf/lib/arches.py b/attoconf/lib/arches.py index 8c70f0b..63f6244 100644 --- a/attoconf/lib/arches.py +++ b/attoconf/lib/arches.py @@ -1,4 +1,4 @@ -# Copyright 2013 Ben Longbons +# Copyright 2013-2014 Ben Longbons # # This file is part of attoconf. # diff --git a/attoconf/lib/c.py b/attoconf/lib/c.py index bc32c49..03f77da 100644 --- a/attoconf/lib/c.py +++ b/attoconf/lib/c.py @@ -1,4 +1,4 @@ -# Copyright 2013 Ben Longbons +# Copyright 2013-2014 Ben Longbons # # This file is part of attoconf. # diff --git a/attoconf/lib/install.py b/attoconf/lib/install.py index f43b2a1..3dc7f5b 100644 --- a/attoconf/lib/install.py +++ b/attoconf/lib/install.py @@ -1,4 +1,4 @@ -# Copyright 2013 Ben Longbons +# Copyright 2013-2014 Ben Longbons # # This file is part of attoconf. # @@ -141,11 +141,7 @@ def psdir(build, DIR): class Install(ClassyProject): __slots__ = () - - @classmethod - def slots(cls): - return super(Install, cls).slots() + ( - 'package', 'package_name') + _merge_slots_ = ('package', 'package_name') # Compatibility with configure written for attoconf < 0.7 # In attoconf 1.0, the positional srcdir argument will go away, diff --git a/attoconf/lib/make.py b/attoconf/lib/make.py index b965f28..f815cd0 100644 --- a/attoconf/lib/make.py +++ b/attoconf/lib/make.py @@ -1,4 +1,4 @@ -# Copyright 2013 Ben Longbons +# Copyright 2013-2014 Ben Longbons # # This file is part of attoconf. # @@ -62,9 +62,7 @@ class Make(ClassyProject): ''' Post hook to generate a Makefile from Makefile.in ''' __slots__ = () - @classmethod - def slots(cls): - return super(Make, cls).slots() + ('make_in', 'make_out') + _merge_slots_ = ('make_in', 'make_out') # compatibility with attoconf < 0.7 def __init__(self, srcdir, diff --git a/attoconf/lib/templates.py b/attoconf/lib/templates.py index d6fc24d..0ec1a3e 100644 --- a/attoconf/lib/templates.py +++ b/attoconf/lib/templates.py @@ -1,4 +1,4 @@ -# Copyright 2013 Ben Longbons +# Copyright 2013-2014 Ben Longbons # # This file is part of attoconf. # @@ -62,9 +62,7 @@ class Templates(ClassyProject): ''' Post hook to generate output files from *.in templates ''' __slots__ = () - @classmethod - def slots(cls): - return super(Templates, cls).slots() + ('template_files',) + _merge_slots_ = ('template_files') # this class didn't exist in attoconf < 0.7, no need for compatibility def __init__(self, template_files, **kwargs): diff --git a/attoconf/tests/test_core.py b/attoconf/tests/test_core.py index 09c2c64..d8de71f 100644 --- a/attoconf/tests/test_core.py +++ b/attoconf/tests/test_core.py @@ -1,4 +1,4 @@ -# Copyright 2013 Ben Longbons +# Copyright 2013-2014 Ben Longbons # # This file is part of attoconf. # diff --git a/attoconf/types.py b/attoconf/types.py index e7c8465..8a8d56a 100644 --- a/attoconf/types.py +++ b/attoconf/types.py @@ -1,4 +1,4 @@ -# Copyright 2013 Ben Longbons +# Copyright 2013-2014 Ben Longbons # # This file is part of attoconf. # -- cgit v1.2.3-70-g09d2 From 621af313a8dfe46df159766fbe158af5dd8cb6ad Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 30 Sep 2015 23:50:21 -0700 Subject: Add support for finding dependencies via pkg-config --- attoconf/_version.py | 4 +- attoconf/classy.py | 12 +++++- attoconf/lib/pkg_config.py | 97 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 110 insertions(+), 3 deletions(-) create mode 100644 attoconf/lib/pkg_config.py diff --git a/attoconf/_version.py b/attoconf/_version.py index 791d3d9..d4930e4 100644 --- a/attoconf/_version.py +++ b/attoconf/_version.py @@ -7,11 +7,11 @@ major = 0 # Incremented for releases with compatible API additions. # This is the number that is usually incremented. -minor = 9 +minor = 10 # Incremented if there is a bugfix release. # Might not be contiguous. -patch = 1 +patch = 0 # Reserved for distributors and forks. # Contains arbitrary text, but no parentheses or newlines. diff --git a/attoconf/classy.py b/attoconf/classy.py index 98d54aa..ba06fcc 100644 --- a/attoconf/classy.py +++ b/attoconf/classy.py @@ -1,4 +1,4 @@ -# Copyright 2013-2014 Ben Longbons +# Copyright 2013-2015 Ben Longbons # # This file is part of attoconf. # @@ -35,6 +35,12 @@ class PolymorphicSlotMergerMetaclass(type): assert dct['__slots__'] == () return type.__new__(meta, name, bases, dct) + # TODO: remove *args for 1.0 + def __call__(cls, *args, **kwargs): + instance = type.__call__(cls, *args, **kwargs) + instance._do_jiggle() + return instance + # TODO: remove this for 1.0 def add_slots(cls): @@ -50,7 +56,11 @@ class ClassyProject(Project): def __init__(self, srcdir): super(ClassyProject, self).__init__(srcdir) + # TODO: remove this for 1.0 def jiggle(self): + pass + + def _do_jiggle(self): self.order.append(None) self.general() self.order.append(None) diff --git a/attoconf/lib/pkg_config.py b/attoconf/lib/pkg_config.py new file mode 100644 index 0000000..00bfba8 --- /dev/null +++ b/attoconf/lib/pkg_config.py @@ -0,0 +1,97 @@ +# Copyright 2015 Ben Longbons +# +# This file is part of attoconf. +# +# attoconf is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# attoconf is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with attoconf. If not, see . + +from __future__ import print_function, division, absolute_import + +import os +import sys + +from ..classy import ClassyProject +from ..types import enum, ShellList + +from .c import do_exec, TestError, C, Cxx + + +yesno = enum('yes', 'no') + +def run_pkg_config(build, *args): + PKG_CONFIG = build.vars['PKG_CONFIG'] + status, output = do_exec(build, PKG_CONFIG + list(args)) + if status: + raise TestError(output) + return output.strip() + +def check_pkg_config(build, PKG_CONFIG): + version = run_pkg_config(build, '--version') + print('Found pkg-config: %s' % version) + +def package_check(build, package, **var): + assert len(var) == 1 + _package, enabled = var.popitem() + enabled = enabled == 'yes' + modversion = run_pkg_config(build, '--modversion', package) + print("Found dependency '%s': %s" % (package, modversion)) + cppflags = run_pkg_config(build, '--cflags-only-I', package) + cflags = run_pkg_config(build, '--cflags-only-other', package) + ldflags = run_pkg_config(build, '--libs-only-L', '--libs-only-other', package) + libs = run_pkg_config(build, '--libs-only-l', package) + + build.vars['CPPFLAGS'] += cppflags + if 'CFLAGS' in build.vars: + build.vars['CFLAGS'] += cflags + if 'CXXFLAGS' in build.vars: + build.vars['CXXFLAGS'] += cflags + build.vars['LDFLAGS'] += ldflags + build.vars['LIBS'] += libs + +class PkgConfig(ClassyProject): + ''' Fill CFLAGS etc by pkg-config for dependencies. + ''' + __slots__ = () + _merge_slots_ = ('required_packages', 'optional_packages') + + def __init__(self, required_packages, optional_packages, **kwargs): + assert isinstance(self, (C, Cxx)) + super(PkgConfig, self).__init__(**kwargs) + self.required_packages = required_packages + self.optional_packages = optional_packages + + def vars(self): + super(PkgConfig, self).vars() + self.add_option('PKG_CONFIG', init=['pkg-config'], + type=ShellList, check=check_pkg_config, + help='Tool to find dependencies', hidden=False) + + def packages(self): + super(PkgConfig, self).packages() + for package in self.required_packages: + self._pkg_config_add_package(package, True) + for package in self.optional_packages: + self._pkg_config_add_package(package, False) + + def _pkg_config_add_package(self, package, hidden): + positive = '--with-' + package + negative = '--without-' + package + #check = package_required_check if hidden else package_optional_check + check = lambda build, **kwargs: package_check(build, package, **kwargs) + level = 'required' if hidden else 'optional' + help = "Build with %s dependency '%s'" % (level, package) + self.add_option(positive, type=yesno, hidden=hidden, init='yes', check=check, help=help) + # TODO: instead reveal one of the aliases and hide the main + # this requires messing with help slightly + self.add_alias(positive, [positive + '=yes'], help=None, hidden=True) + self.add_alias(negative, [positive + '=no'], help=None, hidden=True) -- cgit v1.2.3-70-g09d2 From 50e08a90d5e9fec332603b11cc3ad7e03fe1552c Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Thu, 1 Oct 2015 00:22:11 -0700 Subject: Fix legacy compatibility again --- attoconf/classy.py | 4 +++- attoconf/lib/install.py | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/attoconf/classy.py b/attoconf/classy.py index ba06fcc..59a62e1 100644 --- a/attoconf/classy.py +++ b/attoconf/classy.py @@ -38,7 +38,9 @@ class PolymorphicSlotMergerMetaclass(type): # TODO: remove *args for 1.0 def __call__(cls, *args, **kwargs): instance = type.__call__(cls, *args, **kwargs) - instance._do_jiggle() + if 'package' in kwargs or not isinstance(instance, + __import__('attoconf.lib.install', fromlist=['Install']).Install): + instance._do_jiggle() return instance diff --git a/attoconf/lib/install.py b/attoconf/lib/install.py index 3dc7f5b..26e515c 100644 --- a/attoconf/lib/install.py +++ b/attoconf/lib/install.py @@ -152,8 +152,12 @@ class Install(ClassyProject): self.set_package(package, package_name) def set_package(self, package, package_name): + if package is not None: + assert self.package is None self.package = package self.package_name = package_name + if package is not None: + self._do_jiggle() def general(self): super(Install, self).general() -- cgit v1.2.3-70-g09d2 From 7b939e7e4ce36e8b62b10025e567f871731cbf4d Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Thu, 1 Oct 2015 00:25:12 -0700 Subject: Enable travis container-based infrastructure --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f1aeb7f..f57abad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +sudo: false language: python python: - "2.7" -- cgit v1.2.3-70-g09d2 From 4e30c2ce14bb1cfbb0e3f87423db2c6f8d76f911 Mon Sep 17 00:00:00 2001 From: Fedja Beader Date: Sun, 10 Dec 2023 00:15:36 +0100 Subject: Explicitly use python2 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2357bce..09c35c9 100755 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 from distutils.core import setup -- cgit v1.2.3-70-g09d2 From 715982bdf8b7c6bd6fb05221d82a0e1ab905336f Mon Sep 17 00:00:00 2001 From: Fedja Beader Date: Sun, 10 Dec 2023 21:00:26 +0100 Subject: Upgrade to Python3. Mostly using 2to3 automatic converter with some educated guesses on my part. Produces same TMWA Makefile as py2 attoconf. YMMV. --- attoconf/classy.py | 7 +++---- attoconf/core.py | 11 ++++++----- attoconf/help.py | 2 +- attoconf/lib/arches.py | 2 +- attoconf/lib/c.py | 4 ++-- attoconf/lib/config_hash.py | 6 +++--- attoconf/lib/install.py | 2 +- attoconf/lib/lex.py | 2 +- attoconf/lib/make.py | 2 +- attoconf/lib/pkg_config.py | 2 +- attoconf/lib/templates.py | 2 +- attoconf/lib/yacc.py | 2 +- attoconf/tests/test_core.py | 10 +++++----- attoconf/tests/test_help.py | 4 ++-- attoconf/tests/test_types.py | 4 ++-- attoconf/tests/test_version.py | 2 +- attoconf/types.py | 2 +- attoconf/version.py | 6 +++--- setup.py | 2 +- 19 files changed, 37 insertions(+), 37 deletions(-) diff --git a/attoconf/classy.py b/attoconf/classy.py index 59a62e1..33c9c40 100644 --- a/attoconf/classy.py +++ b/attoconf/classy.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with attoconf. If not, see . -from __future__ import print_function, division, absolute_import + from .core import Project, Build @@ -26,7 +26,7 @@ class PolymorphicSlotMergerMetaclass(type): s = () for b in bases: s2 = b.__dict__.get('_merge_slots_', ()) - if isinstance(s2, basestring): + if isinstance(s2, str): s2 = (s2,) s += s2 s += dct.get('_merge_slots_', ()) @@ -48,12 +48,11 @@ class PolymorphicSlotMergerMetaclass(type): def add_slots(cls): return cls -class ClassyProject(Project): +class ClassyProject(Project, metaclass=PolymorphicSlotMergerMetaclass): ''' A more convenient, objectish, way of setting up a project. ''' __slots__ = () _merge_slots_ = () - __metaclass__ = PolymorphicSlotMergerMetaclass def __init__(self, srcdir): super(ClassyProject, self).__init__(srcdir) diff --git a/attoconf/core.py b/attoconf/core.py index 8fff40f..efc952b 100644 --- a/attoconf/core.py +++ b/attoconf/core.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with attoconf. If not, see . -from __future__ import print_function, division, absolute_import + from collections import namedtuple, OrderedDict import os @@ -140,7 +140,8 @@ class Project(object): self.help.print(sys.stdout, hidden) sys.exit() # sneaky -Project.do_help.im_func.__module__ = 'attoconf.types' +Project.do_help.__module__ = 'attoconf.types' +#Project.do_help.__func__.__module__ = 'attoconf.types' class Build(object): ''' A Build is a directory and set of options applied to a Project. @@ -157,7 +158,7 @@ class Build(object): self.project = project self.builddir = trim_trailing_slashes(builddir) self.vars = {as_var(k): o.init - for (k, o) in project.options.iteritems()} + for (k, o) in project.options.items()} self._seen_args = OrderedDict() def apply_arg(self, arg): @@ -196,7 +197,7 @@ class Build(object): check(self) status_file = os.path.join(self.builddir, 'config.status') # open fd to control +x mode - status_fd = os.open(status_file, os.O_WRONLY | os.O_CREAT | os.O_TRUNC, 0777) + status_fd = os.open(status_file, os.O_WRONLY | os.O_CREAT | os.O_TRUNC, 0o777) with os.fdopen(status_fd, 'w') as status: print('Generating config.status') status.write('#!%s\n' % sys.executable) @@ -205,7 +206,7 @@ class Build(object): status.write('old_build_dir = os.path.dirname(sys.argv[0])\n') status.write('configure = os.path.join(old_build_dir, %r, "configure")\n' % self.relative_source()) - seen_args = ['='.join(kv) for kv in self._seen_args.iteritems()] + seen_args = ['='.join(kv) for kv in self._seen_args.items()] status.write('os.execvp(configure, [configure] + %r + sys.argv[1:])\n' % seen_args) diff --git a/attoconf/help.py b/attoconf/help.py index 0fbc0a3..777becb 100644 --- a/attoconf/help.py +++ b/attoconf/help.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with attoconf. If not, see . -from __future__ import print_function, division, absolute_import + def put_line_in_width(file, line, width, indent): ''' Print a line with wrapping. diff --git a/attoconf/lib/arches.py b/attoconf/lib/arches.py index 63f6244..67a84bd 100644 --- a/attoconf/lib/arches.py +++ b/attoconf/lib/arches.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with attoconf. If not, see . -from __future__ import print_function, division, absolute_import + from ..classy import ClassyProject from ..types import triple, maybe diff --git a/attoconf/lib/c.py b/attoconf/lib/c.py index 03f77da..98d88df 100644 --- a/attoconf/lib/c.py +++ b/attoconf/lib/c.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with attoconf. If not, see . -from __future__ import print_function, division, absolute_import + import errno import os @@ -44,7 +44,7 @@ class TempFile: def __init__(self, filename, content): self.filename = filename if content is not None: - with open(filename, 'wx') as of: + with open(filename, 'x') as of: of.write(content) else: # TODO: raise OSError(errno.EEXIST) if file already exists diff --git a/attoconf/lib/config_hash.py b/attoconf/lib/config_hash.py index 81d4a68..b3cb423 100644 --- a/attoconf/lib/config_hash.py +++ b/attoconf/lib/config_hash.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with attoconf. If not, see . -from __future__ import print_function, division, absolute_import + from hashlib import md5 import os @@ -25,8 +25,8 @@ from ..classy import ClassyProject def calc_hash(build): hash = md5() - for var, val in sorted(build.vars.iteritems()): - hash.update('%s = %s\n' % (var, val)) + for var, val in sorted(build.vars.items()): + hash.update(('%s = %s\n' % (var, val)).encode(encoding = 'UTF-8', errors = 'strict')) return hash.hexdigest() diff --git a/attoconf/lib/install.py b/attoconf/lib/install.py index 26e515c..04b5c5a 100644 --- a/attoconf/lib/install.py +++ b/attoconf/lib/install.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with attoconf. If not, see . -from __future__ import print_function, division, absolute_import + import os diff --git a/attoconf/lib/lex.py b/attoconf/lib/lex.py index 5f8ff43..27c2a7e 100644 --- a/attoconf/lib/lex.py +++ b/attoconf/lib/lex.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with attoconf. If not, see . -from __future__ import print_function, division, absolute_import + from ..classy import ClassyProject from ..types import ShellList diff --git a/attoconf/lib/make.py b/attoconf/lib/make.py index f815cd0..ca70f34 100644 --- a/attoconf/lib/make.py +++ b/attoconf/lib/make.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with attoconf. If not, see . -from __future__ import print_function, division, absolute_import + import os import sys diff --git a/attoconf/lib/pkg_config.py b/attoconf/lib/pkg_config.py index 00bfba8..5bc846b 100644 --- a/attoconf/lib/pkg_config.py +++ b/attoconf/lib/pkg_config.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with attoconf. If not, see . -from __future__ import print_function, division, absolute_import + import os import sys diff --git a/attoconf/lib/templates.py b/attoconf/lib/templates.py index 0ec1a3e..7c26133 100644 --- a/attoconf/lib/templates.py +++ b/attoconf/lib/templates.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with attoconf. If not, see . -from __future__ import print_function, division, absolute_import + import os import sys diff --git a/attoconf/lib/yacc.py b/attoconf/lib/yacc.py index 885bbd3..c3fd1de 100644 --- a/attoconf/lib/yacc.py +++ b/attoconf/lib/yacc.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with attoconf. If not, see . -from __future__ import print_function, division, absolute_import + from ..classy import ClassyProject from ..types import ShellList diff --git a/attoconf/tests/test_core.py b/attoconf/tests/test_core.py index d8de71f..93aeaaf 100644 --- a/attoconf/tests/test_core.py +++ b/attoconf/tests/test_core.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with attoconf. If not, see . -from __future__ import print_function, division, absolute_import + import unittest @@ -23,7 +23,7 @@ from attoconf.core import Project, Build from attoconf.types import uint, shell_word, shell_partial_word, maybe import os -from cStringIO import StringIO +from io import StringIO import sys class ReplacingStdout(object): @@ -91,9 +91,9 @@ General: def test_path(self): proj = Project('foo/') build = Build(proj, 'bar/') - self.assertEquals(build.project.srcdir, 'foo') - self.assertEquals(build.builddir, 'bar') - self.assertEquals(build.relative_source(), '../foo') + self.assertEqual(build.project.srcdir, 'foo') + self.assertEqual(build.builddir, 'bar') + self.assertEqual(build.relative_source(), '../foo') def test_configure(self): def check_foo(bld, FOO): diff --git a/attoconf/tests/test_help.py b/attoconf/tests/test_help.py index ea42c28..60a9e49 100644 --- a/attoconf/tests/test_help.py +++ b/attoconf/tests/test_help.py @@ -15,13 +15,13 @@ # You should have received a copy of the GNU General Public License # along with attoconf. If not, see . -from __future__ import print_function, division, absolute_import + import unittest from attoconf.help import Help, HelpSection, put_line_in_width -from cStringIO import StringIO +from io import StringIO class TestHelpSection(unittest.TestCase): def test_basic(self): diff --git a/attoconf/tests/test_types.py b/attoconf/tests/test_types.py index 662c0a3..14926ef 100644 --- a/attoconf/tests/test_types.py +++ b/attoconf/tests/test_types.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with attoconf. If not, see . -from __future__ import print_function, division, absolute_import + import unittest @@ -26,7 +26,7 @@ class TestEnum(unittest.TestCase): foobar = enum('foo', 'bar') foobar('foo') foobar('bar') - with self.assertRaisesRegexp(ValueError, "'baz' not in {foo, bar}"): + with self.assertRaisesRegex(ValueError, "'baz' not in {foo, bar}"): foobar('baz') class TestShell(unittest.TestCase): diff --git a/attoconf/tests/test_version.py b/attoconf/tests/test_version.py index 4325fba..9967283 100644 --- a/attoconf/tests/test_version.py +++ b/attoconf/tests/test_version.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with attoconf. If not, see . -from __future__ import print_function, division, absolute_import + import unittest diff --git a/attoconf/types.py b/attoconf/types.py index 8a8d56a..e1af528 100644 --- a/attoconf/types.py +++ b/attoconf/types.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with attoconf. If not, see . -from __future__ import print_function, division, absolute_import + import os from pipes import quote as shell_quote diff --git a/attoconf/version.py b/attoconf/version.py index 829005c..065195b 100644 --- a/attoconf/version.py +++ b/attoconf/version.py @@ -15,14 +15,14 @@ # You should have received a copy of the GNU General Public License # along with attoconf. If not, see . -from __future__ import print_function, division, absolute_import + import sys from . import _version -if sys.version_info[0] != 2 or sys.version_info[1] < 7: - sys.exit('Unsupported Python version: %s\nattoconf requires Python 2.7' % sys.version) +if sys.version_info[0] != 3 or sys.version_info[1] < 10: + sys.exit('Unsupported Python version: %s\nattoconf requires Python 3.10+' % sys.version) def require_version(major, minor, patch=0): ''' Check that this is the right version of attoconf, or die trying. diff --git a/setup.py b/setup.py index 09c35c9..db30276 100755 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 from distutils.core import setup -- cgit v1.2.3-70-g09d2 From bd57b489d0dacccbdd7a675cafdaff5e72ba7215 Mon Sep 17 00:00:00 2001 From: Fedja Beader Date: Mon, 11 Dec 2023 23:55:19 +0100 Subject: Update travis config --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f57abad..faabbc1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ sudo: false language: python python: - - "2.7" + - "3.11" - "pypy" install: ":" script: ./test-everything.sh @@ -11,7 +11,7 @@ notifications: on_success: changed on_failure: always irc: - channels: "chat.freenode.net#tmwa" + channels: "libera.chat#themanaworld-irc" on_success: always on_failure: always use_notice: true -- cgit v1.2.3-70-g09d2 From 635a136ec06c00efadc46a9d364f15d771f4036e Mon Sep 17 00:00:00 2001 From: Fedja Beader Date: Tue, 12 Dec 2023 21:25:02 +0100 Subject: Update for Python3 File "attoconf/help.py", line 113, in detect_terminal_width fd = getattr(fd, 'fileno', lambda: -1)() ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ io.UnsupportedOperation: fileno --- attoconf/help.py | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/attoconf/help.py b/attoconf/help.py index 777becb..a2379a6 100644 --- a/attoconf/help.py +++ b/attoconf/help.py @@ -109,23 +109,16 @@ class HelpSection(object): def detect_terminal_width(fd, DEFAULT_WIDTH=float('inf')): ''' Detect the width of a terminal. ''' - if not isinstance(fd, int): - fd = getattr(fd, 'fileno', lambda: -1)() - if fd == -1: - return DEFAULT_WIDTH - - import fcntl - import termios - try: - buf = fcntl.ioctl(fd, termios.TIOCGWINSZ, b'xx' * 4) - except IOError as e: - import errno - if e.errno != errno.ENOTTY: - raise - return DEFAULT_WIDTH - import struct - ws_row, ws_col, ws_xpixel, ws_ypixel = struct.unpack('HHHH', buf) - return ws_col + import os + import shutil + + if isinstance(fd, int): + try: + return os.get_terminal_size(fd) + except OSError(...): + return DEFAULT_WIDTH + else: + return shutil.get_terminal_size(fallback=(DEFAULT_WIDTH, 24)).columns class Help(object): -- cgit v1.2.3-70-g09d2 From 6bfc88d0b0613dab1b25de913311cbeedfff3132 Mon Sep 17 00:00:00 2001 From: Fedja Beader Date: Tue, 12 Dec 2023 21:26:41 +0100 Subject: Update README and demo project to python3 Update py2->py3 in README Not strictly necessary, but use python3 directly + remove py2 compatibility line Use python3 explicity. Debian (CI) does not have a python->python3 link? --- README | 2 +- demo-project/configure | 4 +--- test-everything.sh | 3 ++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README b/README index c76a0ce..41c08b5 100644 --- a/README +++ b/README @@ -4,5 +4,5 @@ Principles: * Assume most build environments are sane, and ignore the rest. * In the face of ambiguity, refuse the temptation to guess. * Never automatically toggle features based on the build environment. -* Written in python2 for easy editing and wide portability. +* Written in python3 for easy editing and wide portability. * GPL, but this does not apply to the program being built. diff --git a/demo-project/configure b/demo-project/configure index 47022c2..61a2c2e 100755 --- a/demo-project/configure +++ b/demo-project/configure @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2013 Ben Longbons # @@ -17,8 +17,6 @@ # You should have received a copy of the GNU General Public License # along with attoconf. If not, see . -from __future__ import print_function, division, absolute_import - import os import sys diff --git a/test-everything.sh b/test-everything.sh index 64fc89d..c45ad00 100755 --- a/test-everything.sh +++ b/test-everything.sh @@ -1,5 +1,6 @@ #!/bin/sh -e -python -m unittest discover "$@" +python3 -m unittest discover "$@" + mkdir -p demo-build cd demo-build ../demo-project/configure -- cgit v1.2.3-70-g09d2 From f34b2801e4b5085c9be4ab6f46eb3e4afcdbe063 Mon Sep 17 00:00:00 2001 From: Fedja Beader Date: Tue, 12 Dec 2023 21:29:31 +0100 Subject: Gitlab CI file Try with package python3? Maybe? --- .gitlab-ci.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..2d637c6 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,37 @@ +# Copied in from Moubootaur Legends's Hercules .gitlab-ci.yml +stages: + - test + +variables: &base_vars + DEBIAN_COMMON_PACKAGES: make python3 + +.prerequisites: &prerequisites + before_script: + - echo "Building demo project $CI_BUILD_NAME" + - uname -a + - apt-get update + - apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES + +# Compilers + variables: + <<: *base_vars + +re:debian-stable: + <<: *prerequisites + stage: test + image: debian:stable + variables: + <<: *base_vars + INSTALL_PACKAGES: gcc + script: + - ./test-everything.sh + +re:debian-testing: + <<: *prerequisites + stage: test + image: debian:testing + variables: + <<: *base_vars + INSTALL_PACKAGES: gcc + script: + - ./test-everything.sh -- cgit v1.2.3-70-g09d2 From f1a54c378b7b51b36103ad8111d66aef63e7f041 Mon Sep 17 00:00:00 2001 From: Fedja Beader Date: Wed, 7 Feb 2024 17:42:20 +0100 Subject: Loosen Python version requirement --- attoconf/version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/attoconf/version.py b/attoconf/version.py index 065195b..96db3e5 100644 --- a/attoconf/version.py +++ b/attoconf/version.py @@ -21,8 +21,8 @@ import sys from . import _version -if sys.version_info[0] != 3 or sys.version_info[1] < 10: - sys.exit('Unsupported Python version: %s\nattoconf requires Python 3.10+' % sys.version) +if sys.version_info[0] != 3 or sys.version_info[1] < 6: + sys.exit('Unsupported Python version: %s\nattoconf requires Python 3.6+' % sys.version) def require_version(major, minor, patch=0): ''' Check that this is the right version of attoconf, or die trying. -- cgit v1.2.3-70-g09d2