From: <cd...@us...> - 2012-09-16 07:31:14
|
Revision: 11033 http://octave.svn.sourceforge.net/octave/?rev=11033&view=rev Author: cdf Date: 2012-09-16 07:31:08 +0000 (Sun, 16 Sep 2012) Log Message: ----------- patches for compatibility with mingw Modified Paths: -------------- trunk/octave-forge/extra/ocs/PKG_ADD trunk/octave-forge/extra/ocs/PKG_DEL Modified: trunk/octave-forge/extra/ocs/PKG_ADD =================================================================== --- trunk/octave-forge/extra/ocs/PKG_ADD 2012-09-15 21:49:01 UTC (rev 11032) +++ trunk/octave-forge/extra/ocs/PKG_ADD 2012-09-16 07:31:08 UTC (rev 11033) @@ -4,15 +4,15 @@ if (! exist (fullfile (dirname, "inst"), "dir")) ## Run this if the package is installed for ii=1:length (dirlist) - addpath ( [ dirname "/../" dirlist{ii}],"-end") + addpath (fullfile (dirname, dirlist{ii}), "-end") endfor else ## Run this if we are testing the package without installation for ii=1:length(dirlist) - addpath ([ dirname "/inst/" dirlist{ii}]) - addpath ([ dirname "/src/"]) + addpath (fullfile (dirname, "inst", dirlist{ii})) + addpath (fullfile (dirname, "src")) endfor endif -warning('off', 'Octave:fopen-file-in-path'); +warning ("off", "Octave:fopen-file-in-path"); clear dirlist dirname Modified: trunk/octave-forge/extra/ocs/PKG_DEL =================================================================== --- trunk/octave-forge/extra/ocs/PKG_DEL 2012-09-15 21:49:01 UTC (rev 11032) +++ trunk/octave-forge/extra/ocs/PKG_DEL 2012-09-16 07:31:08 UTC (rev 11033) @@ -1,15 +1,17 @@ dirlist = {"utl", "asm", "tst", "nls", "prs", "sbn"}; dirname = fileparts (canonicalize_file_name (mfilename ("fullpath"))); -for ii=1:length (dirlist) - if (! exist (fullfile (dirname, "inst"), "dir")) - ## Run this if the package is installed - rmpath ( [ dirname "/../" dirlist{ii}]) - else - ## Run this if we are testing the package without installation - rmpath ([ dirname "/inst/" dirlist{ii}]) - rmpath ([ dirname "/src/"]) - end -end +if (! exist (fullfile (dirname, "inst"), "dir")) + ## Run this if the package is installed + for ii=1:length (dirlist) + rmpath (fullfile (dirname, "..", dirlist{ii})) + endfor +else + ## Run this if we are testing the package without installation + for ii=1:length (dirlist) + rmpath (fullfile (dirname, "inst", dirlist{ii})) + endfor + rmpath (fullfile (dirname, "src")) +endif clear dirlist dirname This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |