Commit 5aa7443e authored by John van Groningen's avatar John van Groningen
Browse files

allow application relative paths in project paths

parent 193eeebe
......@@ -259,13 +259,13 @@ ChangePaths project full home appl paths dstate
/* determine selected directory name. */
MatchDirName :: !Bool !Bool !Pathname !Pathname !String !(List Pathname) -> Pathname;
MatchDirName True full home appl sel paths = MatchPrjctDirName full home sel paths;
MatchDirName True full home appl sel paths = MatchProjectDirName full home appl sel paths;
MatchDirName false full home appl sel paths = MatchDefDirName full appl sel paths;
/* Convert pathname to a long / short form to be used in a list box. */
MakeDirName :: !Bool !Bool !Pathname !Pathname !Pathname -> String;
MakeDirName True full home appl name = MakePrjctDirName full home name;
MakeDirName True full home appl name = MakeProjectDirName full home appl name;
MakeDirName false full home appl name = MakeDefDirName full appl name;
/* Convert a list of pathname to a long / short form to be used in a list box. */
......
......@@ -28,9 +28,9 @@ MakeABCSystemPathname :: !Pathname !*Files -> (!Pathname, !*Files);
MakeObjSystemPathname :: !Processor !Pathname !*Files -> (!Pathname, !*Files);
MakeFullPathname :: !Pathname !Modulename -> Pathname;
GetModuleName :: !Pathname -> Modulename;
MakePrjctDirName :: !Bool !String !String -> String;
MakeProjectDirName :: !Bool !String !String !String -> String;
MakeDefDirName :: !Bool !String !String -> String;
MatchPrjctDirName :: !Bool !Pathname !String !(List Pathname) -> Pathname;
MatchProjectDirName :: !Bool !Pathname !String !String !(List Pathname) -> Pathname;
MatchDefDirName :: !Bool !Pathname !String !(List Pathname) -> Pathname;
ListBoxWidth :: Measure;
......
......@@ -126,15 +126,15 @@ MakeFullPathname path modname = path +++ toString DirSeparator +++ modname;
GetModuleName :: !Pathname -> Modulename;
GetModuleName name = RemoveSuffix (RemovePath name);
MakePrjctDirName :: !Bool !String !String -> String;
MakePrjctDirName long home file
MakeProjectDirName :: !Bool !String !String !String -> String;
MakeProjectDirName long home appl file
| long
= Truncate file;
| home==file
= Truncate "{Project}";
| equal_path_prefix home file
= Truncate "{Project}" +++ DirSeparatorString +++ file % (inc (size home), dec (size file));
= Truncate file;
= MakeDefDirName False appl file;
MakeDefDirName :: !Bool !String !String -> String;
MakeDefDirName long appl file
......@@ -146,16 +146,13 @@ MakeDefDirName long appl file
= Truncate "{Application}" +++ DirSeparatorString +++ file % (inc (size appl), dec (size file));
= Truncate file;
MatchPrjctDirName :: !Bool !Pathname !String !(List Pathname) -> Pathname;
MatchPrjctDirName long home select Nil
MatchProjectDirName :: !Bool !Pathname !String !String !(List Pathname) -> Pathname;
MatchProjectDirName long home appl select Nil
= EmptyPathname;
MatchPrjctDirName long home select (path:!paths)
| select == path`
MatchPrjctDirName long home appl select (path:!paths)
| select == MakeProjectDirName long home appl path;
= path;
= MatchPrjctDirName long home select paths;
where {
path` = MakePrjctDirName long home path;
};
= MatchProjectDirName long home appl select paths;
MatchDefDirName :: !Bool !Pathname !String !(List Pathname) -> Pathname;
MatchDefDirName long appl select Nil
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment