Skip to content

Commit cfa578b

Browse files
robertodrarnfinn
authored andcommitted
Remove gitlab stuff (#64)
* Update Autocmake * Remove GitLab-related stuff * Remove Magnum CI YAML file
1 parent 5a5f9c3 commit cfa578b

File tree

12 files changed

+27
-219
lines changed

12 files changed

+27
-219
lines changed

.gitlab-ci.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.gitlab/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 35 deletions
This file was deleted.

.gitlab/MERGE_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 42 deletions
This file was deleted.

.magnum.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

README.md

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[![DOI](https://zenodo.org/badge/doi/10.5281/zenodo.11910.png)](http://dx.doi.org/10.5281/zenodo.11910)
22
[![Travis CI build status](https://travis-ci.org/PCMSolver/pcmsolver.svg?branch=release%2F1.Y)](https://travis-ci.org/PCMSolver/pcmsolver)
3-
[![Magnum CI build status](https://magnum-ci.com/status/9207aa29405095b0b7aef0cd809ed6c2.svg?branch=release%2F1.Y)](https://magnum-ci.com/builds)
43
[![Documentation Status](https://readthedocs.org/projects/pcmsolver/badge/?version=stable)](http://pcmsolver.readthedocs.org/en/latest/?badge=latest)
54
[![Coverage Status](https://coveralls.io/repos/PCMSolver/pcmsolver/badge.svg?branch=release%2F1.Y)](https://coveralls.io/r/PCMSolver/pcmsolver?branch=release)
65
[![Coverity Scan Build](https://scan.coverity.com/projects/3046/badge.svg)](https://scan.coverity.com/projects/3046)
@@ -10,11 +9,11 @@ PCMSolver
109

1110
An API for the Polarizable Continuum Model.
1211

13-
- [Project website](https://gitlab.com/PCMSolver/pcmsolver)
12+
- [Project website](https://github.com/PCMSolver/pcmsolver)
1413
- [Changelog](CHANGELOG.md)
1514
- [Documentation](http://pcmsolver.readthedocs.io)
1615
- [Build and test history](https://travis-ci.org/PCMSolver/pcmsolver/builds)
17-
- [Nightly build dashboard](https://testboard.org/cdash/index.php?project=PCMSolver)
16+
- [Build dashboard](https://testboard.org/cdash/index.php?project=PCMSolver)
1817
- Version 1.1.10 available
1918
- Licensed under [LGPLv3](LICENSE)
2019
- CMake infrastructure managed *via* [Autocmake](http://autocmake.readthedocs.io/)
@@ -30,11 +29,8 @@ Continuous integration builds
3029

3130
All CI builds are triggered by push events to any branch.
3231
Travis CI runs release builds using [ccache](https://ccache.samba.org/) to speed up compilation.
33-
Magnum CI runs debug builds.
3432
The outcome of the CI builds is deployed to the [build dashboard](https://testboard.org/cdash/index.php?project=PCMSolver)
3533

36-
- Ubuntu 12.04 LTS 64-bit. GCC 4.6, Python 2.7.3, CMake 3.4.2
37-
This is the environment offered by [Magnum CI](https://magnum-ci.com)
3834
- Ubuntu 12.04 LTS 64-bit with CMake 3.3.2 and Boost 1.55.0 this is the
3935
environment offered by [Travis CI](https://travis-ci.org) pulling in various
4036
PPA. Python and Python packages are installed and managed _via_ Conda within
@@ -70,20 +66,3 @@ is triggered by pushes to the `coverity_scan` branch. It is run on
7066
Ubuntu 12.04 LTS 64-bit with Python 2.7, CMake 3.3.2 and Boost 1.55.0
7167
this is the environment offered by [Travis CI](https://travis-ci.org) pulling
7268
in various PPA. GCC 5.1 is used, in debug mode.
73-
74-
Nightly builds
75-
--------------
76-
77-
*OUTDATED INFORMATION*
78-
79-
- CentOS 6.6. Intel 12.1.2, Python 2.7.3, CMake 3.1.0
80-
- CentOS 6.6. Intel 13.0, Python 2.7.3, CMake 3.1.0
81-
- CentOS 6.6. Intel 13.4, Python 2.7.3, CMake 3.1.0
82-
- CentOS 6.6. Intel 14.0, Python 2.7.3, CMake 3.1.0
83-
- CentOS 6.6. Intel 15.0, Python 2.7.9, CMake 3.2.2.
84-
Uses Boost 1.58.0
85-
- CentOS 6.6. GCC 4.4.7, Python 2.7.3, CMake 3.1.0
86-
- CentOS 6.6. GCC 4.7.2, Python 2.7.3, CMake 3.1.0
87-
- CentOS 6.6. GCC 4.9.1, Python 2.7.3, CMake 3.1.0
88-
- OS X 10.10.5 Yosemite. LLVM 7.0.0 , GFortran 5.2.0, Python 2.7.10, CMake 3.3.2
89-
Uses Boost 1.58.0 from the Homebrew repositories.

TODO

Lines changed: 0 additions & 15 deletions
This file was deleted.

cmake/autocmake.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: PCMSolver
22
min_cmake_version: 2.8.10
33
setup_script: setup.py
44
url_root: https://github.com/coderefinery/autocmake/raw/master/
5+
default_build_type: debug
56

67
modules:
78
- compilers:

cmake/autocmake/generate.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def autogenerated_notice():
4545
return '\n'.join(s)
4646

4747

48-
def gen_setup(config, relative_path, setup_script_name):
48+
def gen_setup(config, default_build_type, relative_path, setup_script_name):
4949
"""
5050
Generate setup script.
5151
"""
@@ -76,7 +76,7 @@ def gen_setup(config, relative_path, setup_script_name):
7676
rest = ' '.join(opt.split()[1:]).strip()
7777
options.append([first, rest])
7878

79-
options.append(['--type=<TYPE>', 'Set the CMake build type (debug, release, or relwithdeb) [default: release].'])
79+
options.append(['--type=<TYPE>', 'Set the CMake build type (debug, release, relwithdebinfo, minsizerel) [default: {0}].'.format(default_build_type)])
8080
options.append(['--generator=<STRING>', 'Set the CMake build system generator [default: Unix Makefiles].'])
8181
options.append(['--show', 'Show CMake command and exit.'])
8282
options.append(['--cmake-executable=<CMAKE_EXECUTABLE>', 'Set the CMake executable [default: cmake].'])
@@ -118,7 +118,7 @@ def gen_setup(config, relative_path, setup_script_name):
118118
return s
119119

120120

121-
def gen_cmakelists(project_name, min_cmake_version, relative_path, modules):
121+
def gen_cmakelists(project_name, min_cmake_version, default_build_type, relative_path, modules):
122122
"""
123123
Generate CMakeLists.txt.
124124
"""
@@ -137,9 +137,15 @@ def gen_cmakelists(project_name, min_cmake_version, relative_path, modules):
137137
s.append('\n# do not rebuild if rules (compiler flags) change')
138138
s.append('set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)')
139139

140-
s.append('\n# if CMAKE_BUILD_TYPE undefined, we set it to Debug')
140+
build_type_capitalized = {'debug': 'Debug',
141+
'release': 'Release',
142+
'relwithdebinfo': 'RelWithDebInfo',
143+
'minsizerel': 'MinSizeRel'}
144+
145+
_build_type = build_type_capitalized[default_build_type]
146+
s.append('\n# if CMAKE_BUILD_TYPE undefined, we set it to {0}'.format(_build_type))
141147
s.append('if(NOT CMAKE_BUILD_TYPE)')
142-
s.append(' set(CMAKE_BUILD_TYPE "Debug")')
148+
s.append(' set(CMAKE_BUILD_TYPE "{0}")'.format(_build_type))
143149
s.append('endif()')
144150

145151
if len(modules) > 0:

cmake/downloaded/autocmake_safeguards.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ string(TOUPPER "${CMAKE_BUILD_TYPE}" cmake_build_type_toupper)
1717

1818
if(NOT cmake_build_type_tolower STREQUAL "debug" AND
1919
NOT cmake_build_type_tolower STREQUAL "release" AND
20+
NOT cmake_build_type_tolower STREQUAL "minsizerel" AND
2021
NOT cmake_build_type_tolower STREQUAL "relwithdebinfo")
21-
message(FATAL_ERROR "Unknown build type \"${CMAKE_BUILD_TYPE}\". Allowed values are Debug, Release, RelWithDebInfo (case-insensitive).")
22+
message(FATAL_ERROR "Unknown build type \"${CMAKE_BUILD_TYPE}\". Allowed values are Debug, Release, RelWithDebInfo, and MinSizeRel (case-insensitive).")
2223
endif()

cmake/update.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,12 @@ def process_yaml(argv):
147147
sys.stderr.write("ERROR: you have to specify min_cmake_version in autocmake.yml\n")
148148
sys.exit(-1)
149149

150+
if 'default_build_type' in config:
151+
default_build_type = config['default_build_type'].lower()
152+
else:
153+
sys.stderr.write("ERROR: you have to specify default_build_type in autocmake.yml\n")
154+
sys.exit(-1)
155+
150156
if 'setup_script' in config:
151157
setup_script_name = config['setup_script']
152158
else:
@@ -173,13 +179,13 @@ def process_yaml(argv):
173179

174180
# create CMakeLists.txt
175181
print('- generating CMakeLists.txt')
176-
s = gen_cmakelists(project_name, min_cmake_version, relative_path, modules)
182+
s = gen_cmakelists(project_name, min_cmake_version, default_build_type, relative_path, modules)
177183
with open(os.path.join(project_root, 'CMakeLists.txt'), 'w') as f:
178184
f.write('{0}\n'.format('\n'.join(s)))
179185

180186
# create setup script
181187
print('- generating setup script')
182-
s = gen_setup(cleaned_config, relative_path, setup_script_name)
188+
s = gen_setup(cleaned_config, default_build_type, relative_path, setup_script_name)
183189
file_path = os.path.join(project_root, setup_script_name)
184190
with open(file_path, 'w') as f:
185191
f.write('{0}\n'.format('\n'.join(s)))

0 commit comments

Comments
 (0)