Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openstructure
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
schwede
openstructure
Commits
3e165475
Commit
3e165475
authored
5 years ago
by
Bienchen
Browse files
Options
Downloads
Patches
Plain Diff
SCHWED-4638: Bump version numbers
parent
17810375
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+2
-2
2 additions, 2 deletions
CMakeLists.txt
docker/Dockerfile
+1
-1
1 addition, 1 deletion
docker/Dockerfile
scripts/bump-version.py
+0
-12
0 additions, 12 deletions
scripts/bump-version.py
with
3 additions
and
15 deletions
CMakeLists.txt
+
2
−
2
View file @
3e165475
...
...
@@ -13,8 +13,8 @@ cmake_policy(SET CMP0060 NEW)
project
(
OpenStructure CXX C
)
set
(
CMAKE_EXPORT_COMPILE_COMMANDS 1
)
set
(
OST_VERSION_MAJOR
1
)
set
(
OST_VERSION_MINOR
1
0
)
set
(
OST_VERSION_MAJOR
2
)
set
(
OST_VERSION_MINOR 0
)
set
(
OST_VERSION_PATCH 0
)
set
(
OST_VERSION_STRING
${
OST_VERSION_MAJOR
}
.
${
OST_VERSION_MINOR
}
.
${
OST_VERSION_PATCH
}
)
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
${
PROJECT_SOURCE_DIR
}
/cmake_support
)
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile
+
1
−
1
View file @
3e165475
...
...
@@ -2,7 +2,7 @@ FROM ubuntu:18.04
# ARGUMENTS
###########
ARG
OPENSTRUCTURE_VERSION="
python3_port
"
ARG
OPENSTRUCTURE_VERSION="
2.0.0
"
ARG
SRC_FOLDER="/usr/local/src"
ARG
CPUS_FOR_MAKE=2
ARG
MSMS_VERSION="2.6.1"
...
...
This diff is collapsed.
Click to expand it.
scripts/bump-version.py
+
0
−
12
View file @
3e165475
#!/usr/bin/env python
import
sys
raise
RuntimeError
(
"
Many things have changed in the Python 3 port.
"
+
"
bump-version.py might require updates.
"
+
"
Only remove this error after careful checking!
"
)
if
len
(
sys
.
argv
)
<
2
:
print
(
"
USAGE: python scripts/bump-version.py OST_VERSION
"
)
print
(
"
-> OST_VERSION is MAJOR.MINOR.PATCH (e.g. 1.9.1)
"
)
...
...
@@ -40,10 +35,3 @@ for i, line in enumerate(lines):
if
line
.
startswith
(
"
ARG OPENSTRUCTURE_VERSION
"
):
lines
[
i
]
=
'
ARG OPENSTRUCTURE_VERSION=
"
%s
"
\n
'
%
version_string
open
(
"
docker/Dockerfile
"
,
"
w
"
).
writelines
(
lines
)
# fix Singularity recipe
lines
=
open
(
"
singularity/Singularity
"
).
readlines
()
for
i
,
line
in
enumerate
(
lines
):
if
line
.
startswith
(
"
export OPENSTRUCTURE_VERSION=
"
):
lines
[
i
]
=
'
export OPENSTRUCTURE_VERSION=
"
%s
"
\n
'
%
version_string
open
(
"
singularity/Singularity
"
,
"
w
"
).
writelines
(
lines
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment