This reverts commit ecdf3ff297.
This commit is contained in:
Harmen Stoppels
GitHub
parent
2b0268864c
commit
408b0e0c45
1 changed files with 62 additions and 88 deletions
|
|
@ -11,21 +11,7 @@
|
|||
from spack.util.environment import is_system_path
|
||||
|
||||
|
||||
class TclMixin:
|
||||
def _find_script_dir(self):
|
||||
# Put more-specific prefixes first
|
||||
check_prefixes = [
|
||||
join_path(self.prefix, "share", "tcl{0}".format(self.version.up_to(2))),
|
||||
self.prefix,
|
||||
]
|
||||
for prefix in check_prefixes:
|
||||
result = find_first(prefix, "init.tcl")
|
||||
if result:
|
||||
return os.path.dirname(result)
|
||||
raise RuntimeError("Cannot locate init.tcl")
|
||||
|
||||
|
||||
class Tcl(AutotoolsPackage, NMakePackage, SourceforgePackage, TclMixin):
|
||||
class Tcl(AutotoolsPackage, SourceforgePackage):
|
||||
"""Tcl (Tool Command Language) is a very powerful but easy to learn dynamic
|
||||
programming language, suitable for a very wide range of uses, including web and
|
||||
desktop applications, networking, administration, testing and many more. Open source
|
||||
|
|
@ -34,7 +20,6 @@ class Tcl(AutotoolsPackage, NMakePackage, SourceforgePackage, TclMixin):
|
|||
|
||||
homepage = "https://www.tcl.tk/"
|
||||
sourceforge_mirror_path = "tcl/tcl8.6.11-src.tar.gz"
|
||||
tags = ["windows"]
|
||||
|
||||
version("8.6.12", sha256="26c995dd0f167e48b11961d891ee555f680c175f7173ff8cb829f4ebcde4c1a6")
|
||||
version("8.6.11", sha256="8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258")
|
||||
|
|
@ -50,11 +35,44 @@ class Tcl(AutotoolsPackage, NMakePackage, SourceforgePackage, TclMixin):
|
|||
|
||||
depends_on("zlib-api")
|
||||
|
||||
# No compiler wrappers on Windows
|
||||
for plat in ["linux", "darwin", "cray"]:
|
||||
filter_compiler_wrappers("tclConfig.sh", relative_root="lib", when=f"platform={plat}")
|
||||
configure_directory = "unix"
|
||||
|
||||
filter_compiler_wrappers("tclConfig.sh", relative_root="lib")
|
||||
|
||||
def install(self, spec, prefix):
|
||||
with working_dir(self.build_directory):
|
||||
make("install")
|
||||
|
||||
# https://wiki.tcl-lang.org/page/kitgen
|
||||
if self.spec.satisfies("@8.6:"):
|
||||
make("install-headers")
|
||||
|
||||
# Some applications like Expect require private Tcl headers.
|
||||
make("install-private-headers")
|
||||
|
||||
# Copy source to install tree
|
||||
# A user-provided install option might re-do this
|
||||
# https://github.com/spack/spack/pull/4102/files
|
||||
installed_src = join_path(self.spec.prefix, "share", self.name, "src")
|
||||
stage_src = os.path.realpath(self.stage.source_path)
|
||||
install_tree(stage_src, installed_src)
|
||||
|
||||
# Replace stage dir -> installed src dir in tclConfig
|
||||
filter_file(
|
||||
stage_src,
|
||||
installed_src,
|
||||
join_path(self.spec["tcl"].libs.directories[0], "tclConfig.sh"),
|
||||
)
|
||||
|
||||
# Don't install binaries in src/ tree
|
||||
with working_dir(join_path(installed_src, self.configure_directory)):
|
||||
make("clean")
|
||||
|
||||
@run_after("install")
|
||||
def symlink_tclsh(self):
|
||||
with working_dir(self.prefix.bin):
|
||||
symlink("tclsh{0}".format(self.version.up_to(2)), "tclsh")
|
||||
|
||||
build_system("autotools", "nmake")
|
||||
# ========================================================================
|
||||
# Set up environment to make install easy for tcl extensions.
|
||||
# ========================================================================
|
||||
|
|
@ -79,6 +97,18 @@ def command(self):
|
|||
os.path.realpath(self.prefix.bin.join("tclsh{0}".format(self.version.up_to(2))))
|
||||
)
|
||||
|
||||
def _find_script_dir(self):
|
||||
# Put more-specific prefixes first
|
||||
check_prefixes = [
|
||||
join_path(self.prefix, "share", "tcl{0}".format(self.version.up_to(2))),
|
||||
self.prefix,
|
||||
]
|
||||
for prefix in check_prefixes:
|
||||
result = find_first(prefix, "init.tcl")
|
||||
if result:
|
||||
return os.path.dirname(result)
|
||||
raise RuntimeError("Cannot locate init.tcl")
|
||||
|
||||
def setup_run_environment(self, env):
|
||||
"""Set TCL_LIBRARY to the directory containing init.tcl.
|
||||
|
||||
|
|
@ -90,28 +120,6 @@ def setup_run_environment(self, env):
|
|||
# python will not be able to find Tcl unless TCL_LIBRARY is set.
|
||||
env.set("TCL_LIBRARY", self._find_script_dir())
|
||||
|
||||
def setup_dependent_run_environment(self, env, dependent_spec):
|
||||
"""Set TCLLIBPATH to include the tcl-shipped directory for
|
||||
extensions and any other tcl extension it depends on.
|
||||
|
||||
For further info see:
|
||||
|
||||
* https://wiki.tcl-lang.org/page/TCLLIBPATH
|
||||
"""
|
||||
if dependent_spec.package.extends(self.spec):
|
||||
# Tcl libraries may be installed in lib or lib64, see #19546
|
||||
for lib in ["lib", "lib64"]:
|
||||
tcllibpath = join_path(dependent_spec.prefix, lib)
|
||||
if os.path.exists(tcllibpath):
|
||||
env.prepend_path("TCLLIBPATH", tcllibpath, separator=" ")
|
||||
|
||||
|
||||
class BaseBuilder(TclMixin, metaclass=spack.builder.PhaseCallbacksMeta):
|
||||
@run_after("install")
|
||||
def symlink_tclsh(self):
|
||||
with working_dir(self.prefix.bin):
|
||||
symlink("tclsh{0}".format(self.version.up_to(2)), "tclsh")
|
||||
|
||||
def setup_dependent_build_environment(self, env, dependent_spec):
|
||||
"""Set TCL_LIBRARY to the directory containing init.tcl.
|
||||
Set TCLLIBPATH to include the tcl-shipped directory for
|
||||
|
|
@ -152,51 +160,17 @@ def setup_dependent_build_environment(self, env, dependent_spec):
|
|||
if os.path.exists(tcllibpath):
|
||||
env.prepend_path("TCLLIBPATH", tcllibpath, separator=" ")
|
||||
|
||||
def setup_dependent_run_environment(self, env, dependent_spec):
|
||||
"""Set TCLLIBPATH to include the tcl-shipped directory for
|
||||
extensions and any other tcl extension it depends on.
|
||||
|
||||
class AutotoolsBuilder(BaseBuilder, spack.build_systems.autotools.AutotoolsBuilder):
|
||||
configure_directory = "unix"
|
||||
For further info see:
|
||||
|
||||
def install(self, spec, prefix):
|
||||
with working_dir(self.build_directory):
|
||||
make("install")
|
||||
|
||||
# https://wiki.tcl-lang.org/page/kitgen
|
||||
if self.spec.satisfies("@8.6:"):
|
||||
make("install-headers")
|
||||
|
||||
# Some applications like Expect require private Tcl headers.
|
||||
make("install-private-headers")
|
||||
|
||||
# Copy source to install tree
|
||||
# A user-provided install option might re-do this
|
||||
# https://github.com/spack/spack/pull/4102/files
|
||||
installed_src = join_path(self.spec.prefix, "share", self.name, "src")
|
||||
stage_src = os.path.realpath(self.stage.source_path)
|
||||
install_tree(stage_src, installed_src)
|
||||
|
||||
# Replace stage dir -> installed src dir in tclConfig
|
||||
filter_file(
|
||||
stage_src,
|
||||
installed_src,
|
||||
join_path(self.spec["tcl"].libs.directories[0], "tclConfig.sh"),
|
||||
)
|
||||
|
||||
# Don't install binaries in src/ tree
|
||||
with working_dir(join_path(installed_src, self.configure_directory)):
|
||||
make("clean")
|
||||
|
||||
|
||||
class NMakeBuilder(BaseBuilder, spack.build_systems.nmake.NMakeBuilder):
|
||||
build_targets = ["all"]
|
||||
install_targets = ["install"]
|
||||
|
||||
@property
|
||||
def makefile_root(self):
|
||||
return f"{self.stage.source_path}\\win"
|
||||
|
||||
@property
|
||||
def makefile_name(self):
|
||||
return "makefile.vc"
|
||||
|
||||
def nmake_install_args(self):
|
||||
return [self.define("INSTALLDIR", self.spec.prefix)]
|
||||
* https://wiki.tcl-lang.org/page/TCLLIBPATH
|
||||
"""
|
||||
if dependent_spec.package.extends(self.spec):
|
||||
# Tcl libraries may be installed in lib or lib64, see #19546
|
||||
for lib in ["lib", "lib64"]:
|
||||
tcllibpath = join_path(dependent_spec.prefix, lib)
|
||||
if os.path.exists(tcllibpath):
|
||||
env.prepend_path("TCLLIBPATH", tcllibpath, separator=" ")
|
||||
|
|
|
|||
Loading…
Reference in a new issue