From c19b7e2a4a97ebc3a2c060d67a323e0e6fe66f91 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 15 Nov 2018 17:27:28 +0100 Subject: copy plot_geom files in correct folders when installing --- build/linux/Makefile.in | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'build/linux') diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index 2129519..14df491 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -517,8 +517,30 @@ install-matlab: $(MATLAB_MEX) install-matlab-so $(INSTALL_SH) -m 755 -d $(MATLABBASE) $(INSTALL_SH) -m 755 -d $(MATLABBASE)/mex $(INSTALL_SH) -m 755 -d $(MATLABBASE)/tools + $(INSTALL_SH) -m 755 -d $(MATLABBASE)/algorithms $(INSTALL_SH) -m 755 $(MATLAB_MEX) $(MATLABBASE)/mex $(INSTALL_SH) -m 644 $(srcdir)/../../matlab/tools/*.m $(MATLABBASE)/tools + + # TODO: there must be a more efficient way to do this than to create and fill every single folder + # install plot_geom + $(INSTALL_SH) -m 755 -d $(MATLABBASE)/algorithms/plot_geom + $(INSTALL_SH) -m 644 $(srcdir)/../../matlab/algorithms/plot_geom/*.m $(MATLABBASE)/algorithms/plot_geom + + $(INSTALL_SH) -m 755 -d $(MATLABBASE)/algorithms/plot_geom/draw + $(INSTALL_SH) -m 644 $(srcdir)/../../matlab/algorithms/plot_geom/draw/*.m $(MATLABBASE)/algorithms/plot_geom/draw + + $(INSTALL_SH) -m 755 -d $(MATLABBASE)/algorithms/plot_geom/stl + $(INSTALL_SH) -m 644 $(srcdir)/../../matlab/algorithms/plot_geom/stl/*.stl $(MATLABBASE)/algorithms/plot_geom/stl + + $(INSTALL_SH) -m 755 -d $(MATLABBASE)/algorithms/plot_geom/util + $(INSTALL_SH) -m 644 $(srcdir)/../../matlab/algorithms/plot_geom/util/*.m $(MATLABBASE)/algorithms/plot_geom/util + + $(INSTALL_SH) -m 755 -d $(MATLABBASE)/algorithms/plot_geom/util/parseargs + $(INSTALL_SH) -m 644 $(srcdir)/../../matlab/algorithms/plot_geom/util/parseargs/* $(MATLABBASE)/algorithms/plot_geom/util/parseargs + + $(INSTALL_SH) -m 755 -d $(MATLABBASE)/algorithms/plot_geom/util/stlTools + $(INSTALL_SH) -m 644 $(srcdir)/../../matlab/algorithms/plot_geom/util/stlTools/* $(MATLABBASE)/algorithms/plot_geom/util/stlTools + # TODO: docs else install-matlab: -- cgit v1.2.3 From 40979a6f4ab678a2f57ccaf8aede1156713e3bf8 Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 16 Nov 2018 10:14:17 +0100 Subject: add astra_plot_geom command and sample s024 Signed-off-by: Tim --- build/linux/Makefile.in | 3 --- 1 file changed, 3 deletions(-) (limited to 'build/linux') diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index 14df491..73d8279 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -529,9 +529,6 @@ install-matlab: $(MATLAB_MEX) install-matlab-so $(INSTALL_SH) -m 755 -d $(MATLABBASE)/algorithms/plot_geom/draw $(INSTALL_SH) -m 644 $(srcdir)/../../matlab/algorithms/plot_geom/draw/*.m $(MATLABBASE)/algorithms/plot_geom/draw - $(INSTALL_SH) -m 755 -d $(MATLABBASE)/algorithms/plot_geom/stl - $(INSTALL_SH) -m 644 $(srcdir)/../../matlab/algorithms/plot_geom/stl/*.stl $(MATLABBASE)/algorithms/plot_geom/stl - $(INSTALL_SH) -m 755 -d $(MATLABBASE)/algorithms/plot_geom/util $(INSTALL_SH) -m 644 $(srcdir)/../../matlab/algorithms/plot_geom/util/*.m $(MATLABBASE)/algorithms/plot_geom/util -- cgit v1.2.3 From 3276485c96636cd38248908ff3575282654ff335 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Wed, 12 Dec 2018 14:45:38 +0100 Subject: Reorganize functions into packages/private functions This also replaces modifying the path with a request to the user to modify the path. --- build/linux/Makefile.in | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'build/linux') diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index 73d8279..a294578 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -521,22 +521,10 @@ install-matlab: $(MATLAB_MEX) install-matlab-so $(INSTALL_SH) -m 755 $(MATLAB_MEX) $(MATLABBASE)/mex $(INSTALL_SH) -m 644 $(srcdir)/../../matlab/tools/*.m $(MATLABBASE)/tools - # TODO: there must be a more efficient way to do this than to create and fill every single folder - # install plot_geom - $(INSTALL_SH) -m 755 -d $(MATLABBASE)/algorithms/plot_geom - $(INSTALL_SH) -m 644 $(srcdir)/../../matlab/algorithms/plot_geom/*.m $(MATLABBASE)/algorithms/plot_geom - - $(INSTALL_SH) -m 755 -d $(MATLABBASE)/algorithms/plot_geom/draw - $(INSTALL_SH) -m 644 $(srcdir)/../../matlab/algorithms/plot_geom/draw/*.m $(MATLABBASE)/algorithms/plot_geom/draw - - $(INSTALL_SH) -m 755 -d $(MATLABBASE)/algorithms/plot_geom/util - $(INSTALL_SH) -m 644 $(srcdir)/../../matlab/algorithms/plot_geom/util/*.m $(MATLABBASE)/algorithms/plot_geom/util - - $(INSTALL_SH) -m 755 -d $(MATLABBASE)/algorithms/plot_geom/util/parseargs - $(INSTALL_SH) -m 644 $(srcdir)/../../matlab/algorithms/plot_geom/util/parseargs/* $(MATLABBASE)/algorithms/plot_geom/util/parseargs - - $(INSTALL_SH) -m 755 -d $(MATLABBASE)/algorithms/plot_geom/util/stlTools - $(INSTALL_SH) -m 644 $(srcdir)/../../matlab/algorithms/plot_geom/util/stlTools/* $(MATLABBASE)/algorithms/plot_geom/util/stlTools + for D in plot_geom plot_geom/private plot_geom/+draw plot_geom/+draw/private plot_geom/+parseargs plot_geom/+stlTools; do \ + $(INSTALL_SH) -m 755 -d $(MATLABBASE)/algorithms/$$D; \ + $(INSTALL_SH) -m 644 $(srcdir)/../../matlab/algorithms/$$D/*.m $(MATLABBASE)/algorithms/$$D; \ + done # TODO: docs else -- cgit v1.2.3