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

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

Revision: 9161
          http://octave.svn.sourceforge.net/octave/?rev=9161&view=rev
Author:   jpicarbajal
Date:     2011-11-21 01:27:28 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
geometry. Simplifying hack in PKG* files

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

Modified: trunk/octave-forge/main/geometry/PKG_ADD
===================================================================
--- trunk/octave-forge/main/geometry/PKG_ADD	2011-11-21 01:08:38 UTC (rev 9160)
+++ trunk/octave-forge/main/geometry/PKG_ADD	2011-11-21 01:27:28 UTC (rev 9161)
@@ -2,23 +2,24 @@
 dirlist = {"geom2d","io","polygons2d","shape2d","octclip"};
 dirname = fileparts (canonicalize_file_name (mfilename ("fullpath")));
 
-%% If we are not in Architecture dependent folder
+%% If we are in Architecture dependent folder add from outside
 arch = cstrcat (octave_config_info ("canonical_host_type"),
                               "-", octave_config_info ("api_version"));
-if !strcmp(arch , strsplit (fileparts(dbstack ()(1).file),filesep (), true){end})
+pp = strsplit (dirname,filesep (), true);
+if strcmp(arch , pp{end})
+  dirname = [strcat(filesep(),{pp{1:end-1}}){:}];
+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
+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
+clear dirlist dirname pp

Modified: trunk/octave-forge/main/geometry/PKG_DEL
===================================================================
--- trunk/octave-forge/main/geometry/PKG_DEL	2011-11-21 01:08:38 UTC (rev 9160)
+++ trunk/octave-forge/main/geometry/PKG_DEL	2011-11-21 01:27:28 UTC (rev 9161)
@@ -5,20 +5,21 @@
 %% 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})
+pp = strsplit (dirname,filesep (), true);
+if strcmp(arch , pp{end})
+  dirname = [strcat(filesep(),{pp{1:end-1}}){:}];
+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
+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
+clear dirlist dirname pp

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