minor update in cmake infrastructure

Author: bast

cmake/autocmake/generate.py

@@ -56,7 +56,7 @@ def gen_setup(config, default_build_type, relative_path, setup_script_name):
     s.append('\n{0}'.format(autogenerated_notice()))
     s.append('\nimport os')
     s.append('import sys')
-    s.append('assert sys.version_info >= (2, 6), \'Python >= 2.6 is required\' ')
+    s.append('assert sys.version_info >= (2, 6), \'Python >= 2.6 is required\'')
 
     s.append("\nsys.path.insert(0, '{0}')".format(relative_path))
 

cmake/update.py

@@ -144,7 +144,9 @@ def process_yaml(argv):
     if 'language' in config:
         project_language = ' '.join(config['language']) if isinstance(config['language'], list) else config['language']
     else:
-        sys.stderr.write("ERROR: you have to specify the project language(s) in autocmake.yml\n")
+        sys.stderr.write("ERROR: you have to specify the project language(s) in autocmake.yml\n\n")
+        sys.stderr.write("# for instance like this (several languages):\nlanguage:\n  - CXX\n  - Fortran\n\n")
+        sys.stderr.write("# or like this (one language):\nlanguage: Fortran\n\n")
         sys.exit(-1)
 
     if 'min_cmake_version' in config:
@@ -156,7 +158,8 @@ def process_yaml(argv):
     if 'default_build_type' in config:
         default_build_type = config['default_build_type'].lower()
     else:
-        sys.stderr.write("ERROR: you have to specify default_build_type in autocmake.yml\n")
+        sys.stderr.write("ERROR: you have to specify default_build_type in autocmake.yml\n\n")
+        sys.stderr.write("# for instance like this (debug, release, relwithdebinfo, or minsizerel):\ndefault_build_type: release\n\n")
         sys.exit(-1)
 
     if 'setup_script' in config:
@@ -189,14 +192,15 @@ def process_yaml(argv):
     with open(os.path.join(project_root, 'CMakeLists.txt'), 'w') as f:
         f.write('{0}\n'.format('\n'.join(s)))
 
-    # create setup script
-    print('- generating setup script')
-    s = gen_setup(cleaned_config, default_build_type, relative_path, setup_script_name)
-    file_path = os.path.join(project_root, setup_script_name)
-    with open(file_path, 'w') as f:
-        f.write('{0}\n'.format('\n'.join(s)))
-    if sys.platform != 'win32':
-        make_executable(file_path)
+    # create setup script unless it is 'None' or 'none'
+    if setup_script_name.lower() != 'none':
+        print('- generating setup script')
+        s = gen_setup(cleaned_config, default_build_type, relative_path, setup_script_name)
+        file_path = os.path.join(project_root, setup_script_name)
+        with open(file_path, 'w') as f:
+            f.write('{0}\n'.format('\n'.join(s)))
+        if sys.platform != 'win32':
+            make_executable(file_path)
 
 
 def main(argv):

setup

@@ -5,7 +5,7 @@
 
 import os
 import sys
-assert sys.version_info >= (2, 6), 'Python >= 2.6 is required' 
+assert sys.version_info >= (2, 6), 'Python >= 2.6 is required'
 
 sys.path.insert(0, 'cmake')
 from autocmake import configure