[Octave-cvsupdate] SF.net SVN: octave:[9159] trunk/octave-forge/main/geometry

[<jpi...@us...>]

Revision: 9159
          http://octave.svn.sourceforge.net/octave/?rev=9159&view=rev
Author:   jpicarbajal
Date:     2011-11-21 00:40:08 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
geometry. Adding post installation function

Modified Paths:
--------------
    trunk/octave-forge/main/geometry/pre_install.m

Added Paths:
-----------
    trunk/octave-forge/main/geometry/post_install.m

Added: trunk/octave-forge/main/geometry/post_install.m
===================================================================
--- trunk/octave-forge/main/geometry/post_install.m	                        (rev 0)
+++ trunk/octave-forge/main/geometry/post_install.m	2011-11-21 00:40:08 UTC (rev 9159)
@@ -0,0 +1,13 @@
+function post_install (desc)
+%% Prepares for installation a package that is organized in subfolders
+%% Since src is compiled only in the package main dir
+%% I need to remove the PKG_ADD and PKG_DEL from the architecture dependent folder
+
+  arch = cstrcat (octave_config_info ("canonical_host_type"),
+                              "-", octave_config_info ("api_version"));
+  if exist (arch,"dir")
+    system(["ls " arch])
+    pause
+  end
+
+end

Modified: trunk/octave-forge/main/geometry/pre_install.m
===================================================================
--- trunk/octave-forge/main/geometry/pre_install.m	2011-11-20 23:49:14 UTC (rev 9158)
+++ trunk/octave-forge/main/geometry/pre_install.m	2011-11-21 00:40:08 UTC (rev 9159)
@@ -5,19 +5,23 @@
   subfld = {"octclip"};
 
   %% Create correct strings
-  subfld_ready = strcat({[pwd() filesep()]},
-                         subfld,[filesep() "src"]);
+  subfld_ready = strcat ({[pwd() filesep() "inst" filesep()]},
+                         subfld,[filesep() "src" filesep() "*"]);
 
   %% Destination folder
-  to_fld = strcat(pwd,filesep ());
+  to_fld = strcat (pwd (),[filesep() "src"]);
 
 
   %% Copy files to package/src folder
-  for from_fld = subfld_ready
   %% TODO handle merging of Makefiles
-    warning("Multiple Makefiles not handled")
-    disp (["mv " from_fld{1} " " to_fld])
-    %system (["mv " from_fld{1} " " to_fld]);
+  warning ("Multiple Makefiles not handled")
+  if !exist("src","dir")
+    system(["mkdir " to_fld]);
   end
 
+  for from_fld = subfld_ready
+    system (["mv " from_fld{1} " " to_fld]);
+    system (["rm -R " from_fld{1}(1:end-2)]);
+  end
+
 end

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.