Skip to content
Snippets Groups Projects
Commit d2f3ff3d authored by Samuel Burbulla's avatar Samuel Burbulla Committed by Andreas Dedner
Browse files

Append version sepcifier to dune modules in python requires.

don't need shared libs to install dune modules so adapted packagedata
accordingly - this solves the issue of having to prescibe some relative rpath
parent fa0e0040
No related branches found
No related tags found
No related merge requests found
......@@ -22,7 +22,7 @@ def main(argv):
repositories = ["gitlab", "testpypi", "pypi"]
def usage():
return 'usage: dunepackaging.py [--upload <'+"|".join(repositories)+'> | -c | --clean | --version 1.0.DATE> | --onlysdist]'
return 'usage: dunepackaging.py [--upload <'+"|".join(repositories)+'> | -c | --clean | --version <version> | --onlysdist]'
try:
opts, args = getopt.getopt(argv, "hc", ["upload=", "clean", "version=", "onlysdist"])
......
......@@ -227,7 +227,7 @@ class Data:
major = self.version.split('-')[0]
self.version = Version(major).__str__() + '.dev' + date.today().strftime('%Y%m%d')
self.depends = [(dep[0], '(<= '+self.version+')') for dep in self.depends]
self.suggests = [(dep[0], '(<= '+self.version+')') for dep in self.suggests]
self.python_requires = [((pr[0], '(<= '+self.version+')') if pr[0].startswith('dune-') else pr) for pr in self.python_requires]
def asPythonRequirementString(self, requirements):
return [(r[0]+str(r[1])).replace("("," ").replace(")","").replace(" ","") for r in requirements]
......@@ -236,11 +236,9 @@ def cmakeFlags():
# defaults
flags = dict([
('CMAKE_BUILD_TYPE','Release'),
('BUILD_SHARED_LIBS','TRUE'),
('CMAKE_INSTALL_RPATH_USE_LINK_PATH','TRUE'),
('DUNE_ENABLE_PYTHONBINDINGS','TRUE'),
('DUNE_PYTHON_INSTALL_LOCATION','none'),
('CMAKE_INSTALL_RPATH_USE_LINK_PATH','TRUE'),
('CMAKE_INSTALL_RPATH',"'$ORIGIN/../../../..'"),
('ALLOW_CXXFLAGS_OVERWRITE','ON'),
('CMAKE_DISABLE_FIND_PACKAGE_LATEX','TRUE'),
('CMAKE_DISABLE_FIND_PACKAGE_Doxygen','TRUE'),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment