Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ns-3-dev to latest version and remove WAF build system #34084

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion lib/spack/docs/build_systems.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ on these ideas for each distinct build system that Spack supports:

build_systems/mavenpackage
build_systems/sconspackage
build_systems/wafpackage

.. toctree::
:maxdepth: 1
Expand Down
130 changes: 0 additions & 130 deletions lib/spack/docs/build_systems/wafpackage.rst

This file was deleted.

6 changes: 0 additions & 6 deletions lib/spack/docs/packaging_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3390,9 +3390,6 @@ the build system. The build systems currently supported by Spack are:
| :class:`~spack.build_systems.scons` | Specialized build system for |
| | software built using SCons |
+----------------------------------------------------------+----------------------------------+
| :class:`~spack.build_systems.waf` | Specialized build system for |
| | software built using Waf |
+----------------------------------------------------------+----------------------------------+
| :class:`~spack.build_systems.r` | Specialized build system for |
| | R extensions |
+----------------------------------------------------------+----------------------------------+
Expand Down Expand Up @@ -4720,9 +4717,6 @@ other checks.
* - :ref:`SIPPackage <sippackage>`
- Not applicable
- ``test`` (module imports)
* - :ref:`WafPackage <wafpackage>`
- ``build_test`` (must be overridden)
- ``install_test`` (must be overridden)

For example, the ``Libelf`` package inherits from ``AutotoolsPackage``
and its ``Makefile`` has a standard ``check`` target. So Spack will
Expand Down
151 changes: 0 additions & 151 deletions lib/spack/spack/build_systems/waf.py

This file was deleted.

12 changes: 0 additions & 12 deletions lib/spack/spack/cmd/create.py
Original file line number Diff line number Diff line change
Expand Up @@ -259,16 +259,6 @@ def build_args(self, spec, prefix):
return args"""


class WafPackageTemplate(PackageTemplate):
"""Provides appropriate override for Waf-based packages"""

base_class_name = "WafPackage"

body_def = """\
# FIXME: Override configure_args(), build_args(),
# or install_args() if necessary."""


class BazelPackageTemplate(PackageTemplate):
"""Provides appropriate overrides for Bazel-based packages"""

Expand Down Expand Up @@ -591,7 +581,6 @@ def __init__(self, name, *args, **kwargs):
"qmake": QMakePackageTemplate,
"maven": MavenPackageTemplate,
"scons": SconsPackageTemplate,
"waf": WafPackageTemplate,
"bazel": BazelPackageTemplate,
"python": PythonPackageTemplate,
"r": RPackageTemplate,
Expand Down Expand Up @@ -693,7 +682,6 @@ def __call__(self, stage, url):
(r"/Makefile\.am$", "autoreconf"),
(r"/pom\.xml$", "maven"),
(r"/SConstruct$", "scons"),
(r"/waf$", "waf"),
(r"/pyproject.toml", "python"),
(r"/setup\.(py|cfg)$", "python"),
(r"/WORKSPACE$", "bazel"),
Expand Down
1 change: 0 additions & 1 deletion lib/spack/spack/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
from spack.build_systems.sip import SIPPackage
from spack.build_systems.sourceforge import SourceforgePackage
from spack.build_systems.sourceware import SourcewarePackage
from spack.build_systems.waf import WafPackage
from spack.build_systems.xorg import XorgPackage
from spack.builder import run_after, run_before
from spack.dependency import all_deptypes
Expand Down
1 change: 0 additions & 1 deletion lib/spack/spack/test/build_system_guess.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
("project.pro", "qmake"),
("pom.xml", "maven"),
("SConstruct", "scons"),
("waf", "waf"),
("argbah.rockspec", "lua"),
("setup.py", "python"),
("NAMESPACE", "r"),
Expand Down
1 change: 0 additions & 1 deletion lib/spack/spack/test/cmd/create.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@
"py-test-sip",
[r"PyTestSip(SIPPackage)", r"def configure_args(self"],
),
(["-t", "waf", "/test-waf"], "test-waf", [r"TestWaf(WafPackage)", r"configure_args()"]),
],
)
def test_create_template(mock_test_repo, args, name, expected):
Expand Down