summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorestebanpauli <40901502+estebanpauli@users.noreply.github.com>2018-07-06 17:59:34 -0700
committerAdam J. Stewart <ajstewart426@gmail.com>2018-07-06 19:59:34 -0500
commit891aa6ad7ae243154da9af2fbcd88f175d4dc047 (patch)
tree9e00606a8b5a20f8a5a412a316dfa793b36cbc3c
parent64d5847f058dec81a288482665a1d8208f0f4e17 (diff)
downloadspack-891aa6ad7ae243154da9af2fbcd88f175d4dc047.tar.gz
spack-891aa6ad7ae243154da9af2fbcd88f175d4dc047.tar.bz2
spack-891aa6ad7ae243154da9af2fbcd88f175d4dc047.tar.xz
spack-891aa6ad7ae243154da9af2fbcd88f175d4dc047.zip
Added support for uncrustify 0.67. (#8655)
* Added support for uncrustify 0.67. Since the build system changed for uncrustify at version 0.64, I had to change the package from an AutotoolsPackage to a plain Package and use @when annotations to build the packages differently. * Removed blank line at end of file * Added support for python2.6 in uncrustify configuration.
-rw-r--r--var/spack/repos/builtin/packages/uncrustify/package.py18
1 files changed, 17 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/uncrustify/package.py b/var/spack/repos/builtin/packages/uncrustify/package.py
index 4ef0049c73..a30a7b0ae3 100644
--- a/var/spack/repos/builtin/packages/uncrustify/package.py
+++ b/var/spack/repos/builtin/packages/uncrustify/package.py
@@ -25,10 +25,26 @@
from spack import *
-class Uncrustify(AutotoolsPackage):
+class Uncrustify(Package):
"""Source Code Beautifier for C, C++, C#, ObjectiveC, Java, and others."""
homepage = "http://uncrustify.sourceforge.net/"
url = "http://downloads.sourceforge.net/project/uncrustify/uncrustify/uncrustify-0.61/uncrustify-0.61.tar.gz"
+ version('0.67', '0c9a08366e5c97cd02ae766064e957de41827611')
version('0.61', 'b6140106e74c64e831d0b1c4b6cf7727')
+
+ depends_on('cmake', type='build', when='@0.64:')
+
+ @when('@0.64:')
+ def install(self, spec, prefix):
+ with working_dir('spack-build', create=True):
+ cmake('..', *std_cmake_args)
+ make()
+ make('install')
+
+ @when('@:0.62')
+ def install(self, spec, prefix):
+ configure('--prefix={0}'.format(self.prefix))
+ make()
+ make('install')