tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add directory argument to get_version.py (#107)

Browse Source 
* Add root-dir option to get_version.py

* Make CMake callable outside from the repository
This commit is contained in:
János Benjamin Antal 2021-03-15 11:55:39 +01:00 committed by GitHub
parent 35d789c56b
commit 1598cb24ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -74,6 +74,8 @@ execute_process(
COMMAND "${get_version_script}" ${get_version_enterprise} COMMAND "${get_version_script}" ${get_version_enterprise}
"${MEMGRAPH_OVERRIDE_VERSION}" "${MEMGRAPH_OVERRIDE_VERSION}"
"${MEMGRAPH_OVERRIDE_VERSION_SUFFIX}" "${MEMGRAPH_OVERRIDE_VERSION_SUFFIX}"
"--memgraph-root-dir"
"${CMAKE_SOURCE_DIR}"
) )
if(MEMGRAPH_VERSION_RESULT AND NOT MEMGRAPH_VERSION_RESULT EQUAL 0) if(MEMGRAPH_VERSION_RESULT AND NOT MEMGRAPH_VERSION_RESULT EQUAL 0)
message(FATAL_ERROR "Unable to get Memgraph version.") message(FATAL_ERROR "Unable to get Memgraph version.")
@ -89,6 +91,8 @@ execute_process(
--variant deb --variant deb
"${MEMGRAPH_OVERRIDE_VERSION}" "${MEMGRAPH_OVERRIDE_VERSION}"
"${MEMGRAPH_OVERRIDE_VERSION_SUFFIX}" "${MEMGRAPH_OVERRIDE_VERSION_SUFFIX}"
"--memgraph-root-dir"
"${CMAKE_SOURCE_DIR}"
) )
if(MEMGRAPH_VERSION_DEB_RESULT AND NOT MEMGRAPH_VERSION_DEB_RESULT EQUAL 0) if(MEMGRAPH_VERSION_DEB_RESULT AND NOT MEMGRAPH_VERSION_DEB_RESULT EQUAL 0)
message(FATAL_ERROR "Unable to get Memgraph DEB version.") message(FATAL_ERROR "Unable to get Memgraph DEB version.")
@ -104,6 +108,8 @@ execute_process(
--variant rpm --variant rpm
"${MEMGRAPH_OVERRIDE_VERSION}" "${MEMGRAPH_OVERRIDE_VERSION}"
"${MEMGRAPH_OVERRIDE_VERSION_SUFFIX}" "${MEMGRAPH_OVERRIDE_VERSION_SUFFIX}"
"--memgraph-root-dir"
"${CMAKE_SOURCE_DIR}"
) )
if(MEMGRAPH_VERSION_RPM_RESULT AND NOT MEMGRAPH_VERSION_RPM_RESULT EQUAL 0) if(MEMGRAPH_VERSION_RPM_RESULT AND NOT MEMGRAPH_VERSION_RPM_RESULT EQUAL 0)
message(FATAL_ERROR "Unable to get Memgraph RPM version.") message(FATAL_ERROR "Unable to get Memgraph RPM version.")

10
release/get_version.py
View File

@ -3,6 +3,7 @@ import argparse
import re import re
import subprocess import subprocess
import sys import sys
import os
# This script is used to determine the current version of Memgraph. The script # This script is used to determine the current version of Memgraph. The script
@ -161,8 +162,17 @@ parser.add_argument(
parser.add_argument( parser.add_argument(
"--variant", choices=("binary", "deb", "rpm"), default="binary", "--variant", choices=("binary", "deb", "rpm"), default="binary",
help="which variant of the version string should be generated") help="which variant of the version string should be generated")
parser.add_argument(
"--memgraph-root-dir", help="The root directory of the checked out "
"Memgraph repository.", default=".")
args = parser.parse_args() args = parser.parse_args()
if not os.path.isdir(args.memgraph_root_dir):
raise Exception("The root directory ({}) is not a valid directory".format(
args.memgraph_root_dir))
os.chdir(args.memgraph_root_dir)
offering = "enterprise" if args.enterprise else "community" offering = "enterprise" if args.enterprise else "community"
# Check whether the version was manually supplied. # Check whether the version was manually supplied.