build: temporary files now stored in separate folder

This changes the location of temporary files (objects, executables, library, etc) from within the source tree (potentially named after the corresponding config if not default), to a dedicated folder per config. The config file for each config now also resides in that folder, so that the folder name is the config name. Unless a named config is requested in ./configure, by default this folder will be called 'default'. This now means that executables will now reside in default/bin/ rather than bin/. The reason for these changes is simplify management of co-existing configs - each one now resides in its own folder, making it trivial to clean it out if needed. It also makes it easier to request building of specific target, since the config can now easily be parsed from the folder location, e.g.: $ ./build debug/bin/mrconvert
kpannek · Jul 6, 2015 · f3589e1 · f3589e1
1 parent 3ef33e6
commit f3589e1
Show file tree

Hide file tree

Showing 57 changed files with 145 additions and 104 deletions.
diff --git a/build b/build
diff --git a/cmd/5tt2gmwmi.cpp → cmd_to_port/5tt2gmwmi.cpp b/cmd/5tt2gmwmi.cpp → cmd_to_port/5tt2gmwmi.cpp
diff --git a/cmd/5tt2vis.cpp → cmd_to_port/5tt2vis.cpp b/cmd/5tt2vis.cpp → cmd_to_port/5tt2vis.cpp
diff --git a/cmd/5ttedit.cpp → cmd_to_port/5ttedit.cpp b/cmd/5ttedit.cpp → cmd_to_port/5ttedit.cpp
diff --git a/cmd/5ttgen.cpp → cmd_to_port/5ttgen.cpp b/cmd/5ttgen.cpp → cmd_to_port/5ttgen.cpp
diff --git a/cmd/afdconnectivity.cpp → cmd_to_port/afdconnectivity.cpp b/cmd/afdconnectivity.cpp → cmd_to_port/afdconnectivity.cpp
diff --git a/cmd/dirgen.cpp → cmd_to_port/dirgen.cpp b/cmd/dirgen.cpp → cmd_to_port/dirgen.cpp
diff --git a/cmd/dirstat.cpp → cmd_to_port/dirstat.cpp b/cmd/dirstat.cpp → cmd_to_port/dirstat.cpp
diff --git a/cmd/dwi2adc.cpp → cmd_to_port/dwi2adc.cpp b/cmd/dwi2adc.cpp → cmd_to_port/dwi2adc.cpp
diff --git a/cmd/dwi2mask.cpp → cmd_to_port/dwi2mask.cpp b/cmd/dwi2mask.cpp → cmd_to_port/dwi2mask.cpp
diff --git a/cmd/dwi2qbi.cpp → cmd_to_port/dwi2qbi.cpp b/cmd/dwi2qbi.cpp → cmd_to_port/dwi2qbi.cpp
diff --git a/cmd/dwi2response.cpp → cmd_to_port/dwi2response.cpp b/cmd/dwi2response.cpp → cmd_to_port/dwi2response.cpp
diff --git a/cmd/dwi2tensor.cpp → cmd_to_port/dwi2tensor.cpp b/cmd/dwi2tensor.cpp → cmd_to_port/dwi2tensor.cpp
diff --git a/cmd/dwiextract.cpp → cmd_to_port/dwiextract.cpp b/cmd/dwiextract.cpp → cmd_to_port/dwiextract.cpp
diff --git a/cmd/fixel2sh.cpp → cmd_to_port/fixel2sh.cpp b/cmd/fixel2sh.cpp → cmd_to_port/fixel2sh.cpp
diff --git a/cmd/fixel2voxel.cpp → cmd_to_port/fixel2voxel.cpp b/cmd/fixel2voxel.cpp → cmd_to_port/fixel2voxel.cpp
diff --git a/cmd/fixelmult.cpp → cmd_to_port/fixelmult.cpp b/cmd/fixelmult.cpp → cmd_to_port/fixelmult.cpp
diff --git a/cmd/fixelthreshold.cpp → cmd_to_port/fixelthreshold.cpp b/cmd/fixelthreshold.cpp → cmd_to_port/fixelthreshold.cpp
diff --git a/cmd/fod2fixel.cpp → cmd_to_port/fod2fixel.cpp b/cmd/fod2fixel.cpp → cmd_to_port/fod2fixel.cpp
diff --git a/cmd/gen_planar_ROI.cpp → cmd_to_port/gen_planar_ROI.cpp b/cmd/gen_planar_ROI.cpp → cmd_to_port/gen_planar_ROI.cpp
diff --git a/cmd/label2colour.cpp → cmd_to_port/label2colour.cpp b/cmd/label2colour.cpp → cmd_to_port/label2colour.cpp
diff --git a/cmd/labelconfig.cpp → cmd_to_port/labelconfig.cpp b/cmd/labelconfig.cpp → cmd_to_port/labelconfig.cpp
diff --git a/cmd/maskfilter.cpp → cmd_to_port/maskfilter.cpp b/cmd/maskfilter.cpp → cmd_to_port/maskfilter.cpp
diff --git a/cmd/mesh2pve.cpp → cmd_to_port/mesh2pve.cpp b/cmd/mesh2pve.cpp → cmd_to_port/mesh2pve.cpp
diff --git a/cmd/mrcat.cpp → cmd_to_port/mrcat.cpp b/cmd/mrcat.cpp → cmd_to_port/mrcat.cpp
diff --git a/cmd/mrclusterstats.cpp → cmd_to_port/mrclusterstats.cpp b/cmd/mrclusterstats.cpp → cmd_to_port/mrclusterstats.cpp
diff --git a/cmd/mrconnect.cpp → cmd_to_port/mrconnect.cpp b/cmd/mrconnect.cpp → cmd_to_port/mrconnect.cpp
diff --git a/cmd/mrfilter.cpp → cmd_to_port/mrfilter.cpp b/cmd/mrfilter.cpp → cmd_to_port/mrfilter.cpp
diff --git a/cmd/mrstats.cpp → cmd_to_port/mrstats.cpp b/cmd/mrstats.cpp → cmd_to_port/mrstats.cpp
diff --git a/cmd/mrthreshold.cpp → cmd_to_port/mrthreshold.cpp b/cmd/mrthreshold.cpp → cmd_to_port/mrthreshold.cpp
diff --git a/cmd/mrtransform.cpp → cmd_to_port/mrtransform.cpp b/cmd/mrtransform.cpp → cmd_to_port/mrtransform.cpp
diff --git a/cmd/mrview.cpp → cmd_to_port/mrview.cpp b/cmd/mrview.cpp → cmd_to_port/mrview.cpp
diff --git a/cmd/peaks2amp.cpp → cmd_to_port/peaks2amp.cpp b/cmd/peaks2amp.cpp → cmd_to_port/peaks2amp.cpp
diff --git a/cmd/sh2amp.cpp → cmd_to_port/sh2amp.cpp b/cmd/sh2amp.cpp → cmd_to_port/sh2amp.cpp
diff --git a/cmd/sh2peaks.cpp → cmd_to_port/sh2peaks.cpp b/cmd/sh2peaks.cpp → cmd_to_port/sh2peaks.cpp
diff --git a/cmd/sh2power.cpp → cmd_to_port/sh2power.cpp b/cmd/sh2power.cpp → cmd_to_port/sh2power.cpp
diff --git a/cmd/sh2response.cpp → cmd_to_port/sh2response.cpp b/cmd/sh2response.cpp → cmd_to_port/sh2response.cpp
diff --git a/cmd/shbasis.cpp → cmd_to_port/shbasis.cpp b/cmd/shbasis.cpp → cmd_to_port/shbasis.cpp
diff --git a/cmd/shconv.cpp → cmd_to_port/shconv.cpp b/cmd/shconv.cpp → cmd_to_port/shconv.cpp
diff --git a/cmd/shview.cpp → cmd_to_port/shview.cpp b/cmd/shview.cpp → cmd_to_port/shview.cpp
diff --git a/cmd/tck2connectome.cpp → cmd_to_port/tck2connectome.cpp b/cmd/tck2connectome.cpp → cmd_to_port/tck2connectome.cpp
diff --git a/cmd/tck2vtk.cpp → cmd_to_port/tck2vtk.cpp b/cmd/tck2vtk.cpp → cmd_to_port/tck2vtk.cpp
diff --git a/cmd/tckfixcount.cpp → cmd_to_port/tckfixcount.cpp b/cmd/tckfixcount.cpp → cmd_to_port/tckfixcount.cpp
diff --git a/cmd/tckimport.cpp → cmd_to_port/tckimport.cpp b/cmd/tckimport.cpp → cmd_to_port/tckimport.cpp
diff --git a/cmd/tckinfo.cpp → cmd_to_port/tckinfo.cpp b/cmd/tckinfo.cpp → cmd_to_port/tckinfo.cpp
diff --git a/cmd/tcknodeextract.cpp → cmd_to_port/tcknodeextract.cpp b/cmd/tcknodeextract.cpp → cmd_to_port/tcknodeextract.cpp
diff --git a/cmd/tcknormalise.cpp → cmd_to_port/tcknormalise.cpp b/cmd/tcknormalise.cpp → cmd_to_port/tcknormalise.cpp
diff --git a/cmd/tcksample.cpp → cmd_to_port/tcksample.cpp b/cmd/tcksample.cpp → cmd_to_port/tcksample.cpp
diff --git a/cmd/tcksift.cpp → cmd_to_port/tcksift.cpp b/cmd/tcksift.cpp → cmd_to_port/tcksift.cpp
diff --git a/cmd/tensor2metric.cpp → cmd_to_port/tensor2metric.cpp b/cmd/tensor2metric.cpp → cmd_to_port/tensor2metric.cpp
diff --git a/cmd/transformcalc.cpp → cmd_to_port/transformcalc.cpp b/cmd/transformcalc.cpp → cmd_to_port/transformcalc.cpp
diff --git a/cmd/tsfdivide.cpp → cmd_to_port/tsfdivide.cpp b/cmd/tsfdivide.cpp → cmd_to_port/tsfdivide.cpp
diff --git a/cmd/tsfinfo.cpp → cmd_to_port/tsfinfo.cpp b/cmd/tsfinfo.cpp → cmd_to_port/tsfinfo.cpp
diff --git a/cmd/tsfmult.cpp → cmd_to_port/tsfmult.cpp b/cmd/tsfmult.cpp → cmd_to_port/tsfmult.cpp
diff --git a/cmd/tsfthreshold.cpp → cmd_to_port/tsfthreshold.cpp b/cmd/tsfthreshold.cpp → cmd_to_port/tsfthreshold.cpp
diff --git a/cmd/warpinit.cpp → cmd_to_port/warpinit.cpp b/cmd/warpinit.cpp → cmd_to_port/warpinit.cpp
diff --git a/configure b/configure
@@ -40,18 +40,21 @@ In most cases, a simple invocation should work:
 
    $ ./configure
 
-If a name is provided, the configuration will be written to a different file, 
-which can then be used by the build script. For example:
+By default, this creates a target folder named 'main', and a 'config' file
+within that folder. If a name is provided, the configuration will be written to
+a different folder, which can then be used by the build script. For example:
 
    $ ./configure testing -debug
 
-will generate the file 'config.testing', which can be used with the build
-script as follows:
+will generate the folder 'testing' and a config file with debugging symbols
+enabled, which can be used with the build script as follows:
 
    $ ./build testing
 
-Note that all intermediate files will be named according to the name of the
-configuration to avoid conflict with any other configuration.
+By default, the build script will compile the 'main' folder. 
+
+All intermediate files will be placed within the target folder to avoid
+conflict with any other configurations.
 
 
 OPTIONS:
@@ -144,6 +147,13 @@ if not profile_name:
   profile_name = 'default'
 
 
+try: 
+  os.makedirs (profile_name)
+except OSError:
+  if not os.path.isdir (profile_name):
+    raise
+
+
 global logfile, config_report
 logfile = open (os.path.join (os.path.dirname(sys.argv[0]), 'configure.log'), 'wb')
 config_report = ''
@@ -1114,8 +1124,7 @@ if sh_basis_def is not None:
 
 
 # write out configuration:
-
-cache_filename = os.path.join (os.path.dirname(sys.argv[0]), 'config.' + profile_name)
+cache_filename = os.path.join (os.path.dirname(sys.argv[0]), profile_name, 'config')
 
 sys.stdout.write ('\nwriting configuration to file \'' + cache_filename + '\': ')