zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Flake8 and new tk version

Browse Source
This commit is contained in:
Adam J. Stewart 2016-07-12 11:44:24 -05:00
parent 583232ea52
commit ea425a101a
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
var/spack/repos/builtin/packages/tcl/package.py
View File

@ -24,6 +24,7 @@
############################################################################## ##############################################################################
from spack import * from spack import *
class Tcl(Package): class Tcl(Package):
"""Tcl (Tool Command Language) is a very powerful but easy to """Tcl (Tool Command Language) is a very powerful but easy to
learn dynamic programming language, suitable for a very wide learn dynamic programming language, suitable for a very wide
@ -34,9 +35,6 @@ class Tcl(Package):
extensible.""" extensible."""
homepage = "http://www.tcl.tk" homepage = "http://www.tcl.tk"
def url_for_version(self, version):
return 'http://prdownloads.sourceforge.net/tcl/tcl%s-src.tar.gz' % version
version('8.6.5', '0e6426a4ca9401825fbc6ecf3d89a326') version('8.6.5', '0e6426a4ca9401825fbc6ecf3d89a326')
version('8.6.4', 'd7cbb91f1ded1919370a30edd1534304') version('8.6.4', 'd7cbb91f1ded1919370a30edd1534304')
version('8.6.3', 'db382feca91754b7f93da16dc4cdad1f') version('8.6.3', 'db382feca91754b7f93da16dc4cdad1f')
@ -44,6 +42,10 @@ def url_for_version(self, version):
depends_on('zlib') depends_on('zlib')
def url_for_version(self, version):
base_url = 'http://prdownloads.sourceforge.net/tcl'
return '{0}/tcl{1}-src.tar.gz'.format(base_url, version)
def setup_environment(self, spack_env, env): def setup_environment(self, spack_env, env):
# When using Tkinter from within spack provided python+tk, python # When using Tkinter from within spack provided python+tk, python
# will not be able to find Tcl/Tk unless TCL_LIBRARY is set. # will not be able to find Tcl/Tk unless TCL_LIBRARY is set.
@ -52,6 +54,6 @@ def setup_environment(self, spack_env, env):
def install(self, spec, prefix): def install(self, spec, prefix):
with working_dir('unix'): with working_dir('unix'):
configure("--prefix=%s" % prefix) configure("--prefix={0}".format(prefix))
make() make()
make("install") make("install")

13
var/spack/repos/builtin/packages/tk/package.py
View File

@ -24,6 +24,7 @@
############################################################################## ##############################################################################
from spack import * from spack import *
class Tk(Package): class Tk(Package):
"""Tk is a graphical user interface toolkit that takes developing """Tk is a graphical user interface toolkit that takes developing
desktop applications to a higher level than conventional desktop applications to a higher level than conventional
@ -33,13 +34,15 @@ class Tk(Package):
and more.""" and more."""
homepage = "http://www.tcl.tk" homepage = "http://www.tcl.tk"
def url_for_version(self, version): version('8.6.5', '11dbbd425c3e0201f20d6a51482ce6c4')
return "http://prdownloads.sourceforge.net/tcl/tk%s-src.tar.gz" % version
version('8.6.3', '85ca4dbf4dcc19777fd456f6ee5d0221') version('8.6.3', '85ca4dbf4dcc19777fd456f6ee5d0221')
depends_on("tcl") depends_on("tcl")
def url_for_version(self, version):
base_url = "http://prdownloads.sourceforge.net/tcl"
return "{0}/tk{1}-src.tar.gz".format(base_url, version)
def setup_environment(self, spack_env, env): def setup_environment(self, spack_env, env):
# When using Tkinter from within spack provided python+tk, python # When using Tkinter from within spack provided python+tk, python
# will not be able to find Tcl/Tk unless TK_LIBRARY is set. # will not be able to find Tcl/Tk unless TK_LIBRARY is set.
@ -48,7 +51,7 @@ def setup_environment(self, spack_env, env):
def install(self, spec, prefix): def install(self, spec, prefix):
with working_dir('unix'): with working_dir('unix'):
configure("--prefix=%s" % prefix, configure("--prefix={0}".format(prefix),
"--with-tcl=%s" % spec['tcl'].prefix.lib) "--with-tcl={0}".format(spec['tcl'].prefix.lib))
make() make()
make("install") make("install")