changeset 9147:113b4b48ebbd octave-forge

mechanics: Major structure change finished. Everythig installs correctly.
author jpicarbajal
date Fri, 09 Dec 2011 13:06:19 +0000
parents 4cdbeaf8409b
children a2850d47ea73
files main/mechanics/DESCRIPTION main/mechanics/README.B4ADDING main/mechanics/pre_install.m
diffstat 3 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/main/mechanics/DESCRIPTION	Fri Dec 09 12:54:22 2011 +0000
+++ b/main/mechanics/DESCRIPTION	Fri Dec 09 13:06:19 2011 +0000
@@ -5,7 +5,7 @@
 Maintainer: Juan Pablo Carbajal <carbajal@ifi.uzh.ch>, Johan Beke <johanbeke@hotmail.com>
 Title: Classical Mechanics & Structural Analysis
 Description: Library with functions useful for numerical computation in classical mechanics and structural analysis.
-Depends: octave (>= 3.4.0), linear-algebra (>= 2.0.0), general (> 1.2.2), geometry (>=1.2.1)
+Depends: octave (>= 3.4.0), linear-algebra (>= 2.0.0), general (>= 1.2.2), geometry (>= 1.2.1)
 Autoload: no
 License: GPL version 3 or later
 Url: http://octave.sf.net, http://ocframe.sourceforge.net/
--- a/main/mechanics/README.B4ADDING	Fri Dec 09 12:54:22 2011 +0000
+++ b/main/mechanics/README.B4ADDING	Fri Dec 09 13:06:19 2011 +0000
@@ -1,5 +1,10 @@
-This package is organized in subfolder.
+This is a multipackage, therefore it is organized in subfolders.
+
 When adding a new subproject with a src folder, make sure to provide a unique makefile
 merged with the previous one. The installation scripts doesn't hanlde multiple Makefiles yet.
 
-JPi Carbajal 10-2011
+You will need to edit pre_install as well...
+
+I will fix this asap. If you have ideas please send me an e-mail.
+
+JPi Carbajal 12-2011
--- a/main/mechanics/pre_install.m	Fri Dec 09 12:54:22 2011 +0000
+++ b/main/mechanics/pre_install.m	Fri Dec 09 13:06:19 2011 +0000
@@ -1,8 +1,8 @@
 function pre_install (desc)
 %% Prepares for installation a package that is organized in subfolders
 
-  %% List of subfolders
-  subfld = {"molecularDynamics","ocframe", "core"};
+  %% List of subfolders with SRC folder
+  subfld = {"molecularDynamics"};
 
   %% Create correct strings
   subfld_ready = strcat ({[pwd() filesep() "inst" filesep()]},