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

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

Revision: 9160
          http://octave.svn.sourceforge.net/octave/?rev=9160&view=rev
Author:   jpicarbajal
Date:     2011-11-21 01:08:38 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
geometry. fixing compilation issue, but not satisfactorily

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

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

Modified: trunk/octave-forge/main/geometry/PKG_ADD
===================================================================
--- trunk/octave-forge/main/geometry/PKG_ADD	2011-11-21 00:40:08 UTC (rev 9159)
+++ trunk/octave-forge/main/geometry/PKG_ADD	2011-11-21 01:08:38 UTC (rev 9160)
@@ -2,16 +2,23 @@
 dirlist = {"geom2d","io","polygons2d","shape2d","octclip"};
 dirname = fileparts (canonicalize_file_name (mfilename ("fullpath")));
 
-if (! exist (fullfile (dirname, "inst"), "dir"))
-  for ii=1:length (dirlist)
-    addpath ( [ dirname filesep dirlist{ii}],"-end")
-  endfor
-else
-  warning("geometry:Devel","Adding path for testing.");
-  for ii=1:length(dirlist)
-    addpath ([ dirname "/inst/" dirlist{ii}])
-  endfor
-endif
+%% If we are not in Architecture dependent folder
+arch = cstrcat (octave_config_info ("canonical_host_type"),
+                              "-", octave_config_info ("api_version"));
+if !strcmp(arch , strsplit (fileparts(dbstack ()(1).file),filesep (), true){end})
 
+  if (! exist (fullfile (dirname, "inst"), "dir"))
+    for ii=1:length (dirlist)
+      addpath ( [ dirname filesep dirlist{ii}],"-end")
+    endfor
+  else
+    warning("geometry:Devel","Adding path for testing.");
+    for ii=1:length(dirlist)
+      addpath ([ dirname "/inst/" dirlist{ii}])
+    endfor
+  endif
+
+end
+
 warning('off', 'Octave:fopen-file-in-path');
 clear dirlist dirname

Modified: trunk/octave-forge/main/geometry/PKG_DEL
===================================================================
--- trunk/octave-forge/main/geometry/PKG_DEL	2011-11-21 00:40:08 UTC (rev 9159)
+++ trunk/octave-forge/main/geometry/PKG_DEL	2011-11-21 01:08:38 UTC (rev 9160)
@@ -2,16 +2,23 @@
 dirlist = {"geom2d","io","polygons2d","shape2d","octclip"};
 dirname = fileparts (canonicalize_file_name (mfilename ("fullpath")));
 
-if (! exist (fullfile (dirname, "inst"), "dir"))
-  for ii=1:length (dirlist)
-      ## Run this if the package is installed
-      rmpath ( [ dirname filesep dirlist{ii}])
-  end
-else
-  warning("geometry:Devel","Removing path for testing.");
-  for ii=1:length(dirlist)
-    rmpath ([ dirname "/inst/" dirlist{ii}])
-  endfor
-endif
+%% If we are not in Architecture dependent folder
+arch = cstrcat (octave_config_info ("canonical_host_type"),
+                              "-", octave_config_info ("api_version"));
+if !strcmp(arch , strsplit (fileparts(dbstack ()(1).file),filesep (), true){end})
 
+  if (! exist (fullfile (dirname, "inst"), "dir"))
+    for ii=1:length (dirlist)
+        ## Run this if the package is installed
+        rmpath ( [ dirname filesep dirlist{ii}])
+    end
+  else
+    warning("geometry:Devel","Removing path for testing.");
+    for ii=1:length(dirlist)
+      rmpath ([ dirname "/inst/" dirlist{ii}])
+    endfor
+  endif
+
+end
+
 clear dirlist dirname

Deleted: trunk/octave-forge/main/geometry/post_install.m
===================================================================
--- trunk/octave-forge/main/geometry/post_install.m	2011-11-21 00:40:08 UTC (rev 9159)
+++ trunk/octave-forge/main/geometry/post_install.m	2011-11-21 01:08:38 UTC (rev 9160)
@@ -1,13 +0,0 @@
-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-21 00:40:08 UTC (rev 9159)
+++ trunk/octave-forge/main/geometry/pre_install.m	2011-11-21 01:08:38 UTC (rev 9160)
@@ -14,7 +14,8 @@
 
   %% Copy files to package/src folder
   %% TODO handle merging of Makefiles
-  warning ("Multiple Makefiles not handled")
+  warning ("Copying subfolder src to package main dir, but multiple Makefiles are not handled")
+  
   if !exist("src","dir")
     system(["mkdir " to_fld]);
   end

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