Mercurial > octave
comparison scripts/pkg/pkg.m @ 27573:0cedd1e23c1f
Adapt path styles for pkg.m on Windows (bug #57083)
Change 8.3-style paths into LFN paths before writing octave-packages files
* standardize_paths.m: New function that converts 8.3-style paths to LFN paths with
canonicalize_file_name().
* scripts/pkg/module.mk: Add standardize_paths.m to build system.
* pkg.m, install.m, uninstall.m: On Windows (ispc == true) platforms, call
standardize_paths to create unique pathnames for globalk_packages and
local_packages lists.
* installed_packages.m: Remove unnecessary calls to strrep() which were
previously used to standardize pathnames.
| author | Philip Nienhuis <prnienhuis@users.sf.net> |
|---|---|
| date | Sat, 26 Oct 2019 21:51:41 +0200 |
| parents | 65c036b78040 |
| children | c89a6f3eab69 |
comparison
equal
deleted
inserted
replaced
| 27572:6f9544b3a72b | 27573:0cedd1e23c1f |
|---|---|
| 561 case "rebuild" | 561 case "rebuild" |
| 562 if (global_install) | 562 if (global_install) |
| 563 global_packages = rebuild (prefix, archprefix, global_list, files, | 563 global_packages = rebuild (prefix, archprefix, global_list, files, |
| 564 verbose); | 564 verbose); |
| 565 global_packages = save_order (global_packages); | 565 global_packages = save_order (global_packages); |
| 566 if (ispc) | |
| 567 ## On Windows ensure LFN paths are saved rather than 8.3 style paths | |
| 568 global_packages = standardize_paths (global_packages); | |
| 569 endif | |
| 566 save (global_list, "global_packages"); | 570 save (global_list, "global_packages"); |
| 567 if (nargout) | 571 if (nargout) |
| 568 local_packages = global_packages; | 572 local_packages = global_packages; |
| 569 endif | 573 endif |
| 570 else | 574 else |
| 571 local_packages = rebuild (prefix, archprefix, local_list, files, | 575 local_packages = rebuild (prefix, archprefix, local_list, files, |
| 572 verbose); | 576 verbose); |
| 573 local_packages = save_order (local_packages); | 577 local_packages = save_order (local_packages); |
| 578 if (ispc) | |
| 579 local_packages = standardize_paths (local_packages); | |
| 580 endif | |
| 574 save (local_list, "local_packages"); | 581 save (local_list, "local_packages"); |
| 575 if (! nargout) | 582 if (! nargout) |
| 576 clear ("local_packages"); | 583 clear ("local_packages"); |
| 577 endif | 584 endif |
| 578 endif | 585 endif |