Mercurial > hg > octave-nkf

comparison scripts/pkg/pkg.m @ 11149:fe3c3dfc07eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style fix: break lines before && and ||, not after
author John W. Eaton <jwe@octave.org>
date Sat, 23 Oct 2010 03:00:31 -0400
parents a4f482e66b65
children b1f4bdc276b6
comparison
equal deleted inserted replaced
11148:c9ec943ebe65 11149:fe3c3dfc07eb
826 end_try_catch 826 end_try_catch
827 827
828 ## Check if the installed directory is empty. If it is remove it 828 ## Check if the installed directory is empty. If it is remove it
829 ## from the list. 829 ## from the list.
830 for i = length (descriptions):-1:1 830 for i = length (descriptions):-1:1
831 if (dirempty (descriptions{i}.dir, {"packinfo", "doc"}) && 831 if (dirempty (descriptions{i}.dir, {"packinfo", "doc"})
832 dirempty (getarchdir (descriptions{i}))) 832 && dirempty (getarchdir (descriptions{i})))
833 warning ("package %s is empty\n", descriptions{i}.name); 833 warning ("package %s is empty\n", descriptions{i}.name);
834 rm_rf (descriptions{i}.dir); 834 rm_rf (descriptions{i}.dir);
835 rm_rf (getarchdir (descriptions{i})); 835 rm_rf (getarchdir (descriptions{i}));
836 descriptions(i) = []; 836 descriptions(i) = [];
837 endif 837 endif
1510 [status, output] = copyfile (fullfile (instdir, "*"), desc.dir); 1510 [status, output] = copyfile (fullfile (instdir, "*"), desc.dir);
1511 if (status != 1) 1511 if (status != 1)
1512 rm_rf (desc.dir); 1512 rm_rf (desc.dir);
1513 error ("couldn't copy files to the installation directory"); 1513 error ("couldn't copy files to the installation directory");
1514 endif 1514 endif
1515 if (exist (fullfile (desc.dir, getarch ()), "dir") && 1515 if (exist (fullfile (desc.dir, getarch ()), "dir")
1516 ! strcmp (fullfile (desc.dir, getarch ()), octfiledir)) 1516 && ! strcmp (fullfile (desc.dir, getarch ()), octfiledir))
1517 if (! exist (octfiledir, "dir")) 1517 if (! exist (octfiledir, "dir"))
1518 ## Can be required to create upto three levels of dirs. 1518 ## Can be required to create upto three levels of dirs.
1519 octm1 = fileparts (octfiledir); 1519 octm1 = fileparts (octfiledir);
1520 if (! exist (octm1, "dir")) 1520 if (! exist (octm1, "dir"))
1521 octm2 = fileparts (octm1); 1521 octm2 = fileparts (octm1);
2252 2252
2253 function newdesc = save_order (desc) 2253 function newdesc = save_order (desc)
2254 newdesc = {}; 2254 newdesc = {};
2255 for i = 1 : length(desc) 2255 for i = 1 : length(desc)
2256 deps = desc{i}.depends; 2256 deps = desc{i}.depends;
2257 if (isempty (deps) || (length (deps) == 1 && 2257 if (isempty (deps)
2258 strcmp(deps{1}.package, "octave"))) 2258 || (length (deps) == 1 && strcmp(deps{1}.package, "octave")))
2259 newdesc {end + 1} = desc{i}; 2259 newdesc {end + 1} = desc{i};
2260 else 2260 else
2261 tmpdesc = {}; 2261 tmpdesc = {};
2262 for k = 1 : length (deps) 2262 for k = 1 : length (deps)
2263 for j = 1 : length (desc) 2263 for j = 1 : length (desc)
2317 endif 2317 endif
2318 endfunction 2318 endfunction
2319 2319
2320 function idx = load_package_dirs (lidx, idx, handle_deps, installed_pkgs_lst) 2320 function idx = load_package_dirs (lidx, idx, handle_deps, installed_pkgs_lst)
2321 for i = lidx 2321 for i = lidx
2322 if (isfield (installed_pkgs_lst{i}, "loaded") && 2322 if (isfield (installed_pkgs_lst{i}, "loaded")
2323 installed_pkgs_lst{i}.loaded) 2323 && installed_pkgs_lst{i}.loaded)
2324 continue; 2324 continue;
2325 else 2325 else
2326 if (handle_deps) 2326 if (handle_deps)
2327 deps = installed_pkgs_lst{i}.depends; 2327 deps = installed_pkgs_lst{i}.depends;
2328 if ((length (deps) > 1) || (length (deps) == 1 && 2328 if ((length (deps) > 1)
2329 ! strcmp(deps{1}.package, "octave"))) 2329 || (length (deps) == 1 && ! strcmp(deps{1}.package, "octave")))
2330 tmplidx = []; 2330 tmplidx = [];
2331 for k = 1 : length (deps) 2331 for k = 1 : length (deps)
2332 for j = 1 : length (installed_pkgs_lst) 2332 for j = 1 : length (installed_pkgs_lst)
2333 if (strcmp (installed_pkgs_lst{j}.name, deps{k}.package)) 2333 if (strcmp (installed_pkgs_lst{j}.name, deps{k}.package))
2334 tmplidx (end + 1) = j; 2334 tmplidx (end + 1) = j;