Skip to content

Commit 88d54cc

Browse files
Update configure and build for MRtrix3Tissue user experience
As with set_path, this should avoid confusion for users, so it's clear for them that they are interacting with the MRtrix3Tissue fork. As with set_path, this is made clear at all times, and the relation to MRtrix3 is emphasised at a few key points. For optional assistance with or bug reporting on the configure script, they are also kindly referred to the MRtrix3 community: problems or bugs with this script are highly likely to equally apply to MRtrix3 and MRtrix3Tissue, so this would be beneficial to the community as a whole. This may also allow for bug fixing in MRtrix3, should the opportunity arise.
1 parent 7f24548 commit 88d54cc

File tree

2 files changed

+22
-15
lines changed

2 files changed

+22
-15
lines changed

build

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ USAGE
77
88
DESCRIPTION
99
10-
This script will compile and link the MRtrix3 source tree. It relies on the
11-
configuration file produced by ./configure - please ensure you have run
12-
this first.
10+
This script will compile and link the MRtrix3Tissue source tree. It relies
11+
on the configuration file produced by ./configure - please ensure you have
12+
run this first.
13+
14+
MRtrix3Tissue is a fork of the MRtrix3 project.
1315
1416
In most cases, a simple invocation is all that is required:
1517

configure

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ if len(build_options):
236236
build_type += ' with ' + ', '.join (build_options)
237237

238238
report ("""
239-
MRtrix build type requested: """ + build_type + '\n\n')
239+
MRtrix3Tissue build type requested: """ + build_type + '\n\n' + 'MRtrix3Tissue is a fork of the MRtrix3 project' + '\n\n')
240240

241241

242242
# remove any mention of anaconda from PATH:
@@ -391,10 +391,15 @@ def linker_flags_hint (name, var, flags):
391391

392392
configure_log_hint='''
393393
394-
See the file 'configure.log' for details. If this doesn't help and you need
395-
further assistance, please post on the MRtrix3 community forum
396-
(http://community.mrtrix.org/), and make sure to include the full contents of
397-
the 'configure.log' file.
394+
See the file 'configure.log' for details. MRtrix3Tissue is a fork of the
395+
MRtrix3 project. The functionality of the configure script is unmodified,
396+
so when experiencing problems with this script, you might be able to find
397+
assistance in the MRtrix3 community forum at http://community.mrtrix.org/.
398+
Make sure to include the full contents of the 'configure.log' file to
399+
enable community members to help you efficiently. If you believe there are
400+
bugs or other issues with the script, it might be useful to flag these to
401+
MRtrix3 developers as well, as bug fixes are likely to be useful to both
402+
MRtrix3 and MRtrix3Tissue.
398403
'''
399404

400405
qt_path_hint='''
@@ -594,15 +599,15 @@ def compile_check (full_name, name, cflags, ldflags, code, cflags_env=None, cfla
594599
hint = configure_log_hint
595600
error ('error compiling ' + name + ''' application!
596601
597-
MRtrix3 was unable to compile a test program involving ''' + name + '.' + hint)
602+
MRtrix3Tissue was unable to compile a test program involving ''' + name + '.' + hint)
598603
except LinkError as e:
599604
if cflags_env and cflags_hint:
600605
hint = linker_flags_hint (name, ldflags_env, ldflags_hint)
601606
else:
602607
hint = configure_log_hint
603608
error ('error linking ' + name + ''' application!
604609
605-
MRtrix3 was unable to link a test program involving ''' + name + '.' + hint)
610+
MRtrix3Tissue was unable to link a test program involving ''' + name + '.' + hint)
606611
except RuntimeError:
607612
error ('''runtime error!
608613
@@ -761,7 +766,7 @@ if not noshared:
761766
except LinkError:
762767
error ('''linker not found!
763768
764-
MRtrix3 was unable to employ the linker program for shared library generation.''' + compiler_hint ('shared library linker', 'LDLIB_FLAGS', '"-L/usr/local/lib"', 'LDLIB_ARGS', '"-shared LDLIB_FLAGS OBJECTS -o LIB"'))
769+
MRtrix3Tissue was unable to employ the linker program for shared library generation.''' + compiler_hint ('shared library linker', 'LDLIB_FLAGS', '"-L/usr/local/lib"', 'LDLIB_ARGS', '"-shared LDLIB_FLAGS OBJECTS -o LIB"'))
765770
except:
766771
error ('unexpected exception!' + configure_log_hint)
767772

@@ -1038,7 +1043,7 @@ if not nogui:
10381043
except OSError:
10391044
error (''' Qt moc not found!
10401045
1041-
MRtrix3 was unable to locate the Qt meta-object compiler 'moc'.''' + qt_path_hint)
1046+
MRtrix3Tissue was unable to locate the Qt meta-object compiler 'moc'.''' + qt_path_hint)
10421047
except:
10431048
error ('unexpected exception!' + configure_log_hint)
10441049

@@ -1058,7 +1063,7 @@ if not nogui:
10581063
except OSError:
10591064
error (''' Qt qmake not found!
10601065
1061-
MRtrix3 was unable to locate the Qt command 'qmake'.''' + qt_path_hint)
1066+
MRtrix3Tissue was unable to locate the Qt command 'qmake'.''' + qt_path_hint)
10621067
except:
10631068
error ('unexpected exception!' + configure_log_hint)
10641069

@@ -1081,7 +1086,7 @@ if not nogui:
10811086
except OSError:
10821087
error (''' Qt rcc not found!
10831088
1084-
MRtrix3 was unable to locate the Qt command 'rcc'.''' + qt_path_hint)
1089+
MRtrix3Tissue was unable to locate the Qt command 'rcc'.''' + qt_path_hint)
10851090
except:
10861091
error ('unexpected exception!' + configure_log_hint)
10871092

@@ -1303,7 +1308,7 @@ cache = open (cache_filename, 'w')
13031308

13041309
cache.write ("""#!/usr/bin/python
13051310
#
1306-
# autogenerated by MRtrix configure script
1311+
# autogenerated by MRtrix3Tissue configure script
13071312
#
13081313
# configure output:
13091314
""")

0 commit comments

Comments
 (0)