b932c14008
* Bump the package API of the `builtin` repo to `v2.0`
* Move `var/spack/repos/builtin` -> `var/spack/repos/spack_repo/builtin`
* Move test repos `var/spack/repos/{builtin.mock,tutorial,...}` -> `var/spack/test_repos/`
* Update package dir names to v2 format (`-` -> `_` etc)
* Change absolute imports `from spack.pkg.builtin.my_pkg ...` to relative imports `from ..my_pkg.package ...`
Users who have a repo on top of builtin should change imports from
```python
from spack.pkg.builtin.my_pkg import MyPkg
```
to
```python
from spack_repo.builtin.packages.my_pkg.package import MyPkg
```
and can configure their editors with
```
PYTHONPATH=$spack/lib/spack:$spack/var/spack/repos
```
[skip-verify-checksums]
22 lines
868 B
Diff
22 lines
868 B
Diff
--- old/CMake/vtkCompilerExtras.cmake
|
|
+++ new/CMake/vtkCompilerExtras.cmake
|
|
@@ -26,6 +26,8 @@
|
|
execute_process(COMMAND ${CMAKE_C_COMPILER} --version
|
|
OUTPUT_VARIABLE _gcc_version_info
|
|
ERROR_VARIABLE _gcc_version_info)
|
|
+
|
|
+ string (REPLACE ";" "" _gcc_version_info "${_gcc_version_info}")
|
|
|
|
string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]"
|
|
_gcc_version "${_gcc_version_info}")
|
|
--- old/CMake/GenerateExportHeader.cmake
|
|
+++ new/CMake/GenerateExportHeader.cmake
|
|
@@ -166,6 +166,7 @@
|
|
execute_process(COMMAND ${CMAKE_C_COMPILER} --version
|
|
OUTPUT_VARIABLE _gcc_version_info
|
|
ERROR_VARIABLE _gcc_version_info)
|
|
+ string (REPLACE ";" "" _gcc_version_info "${_gcc_version_info}")
|
|
string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]"
|
|
_gcc_version "${_gcc_version_info}")
|
|
# gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
|