app: more versatile initialization for path in config

in case a manifest file is contained into some sub directories,
the command to init a workspace locally should be
```
west init -l sub1/sub2 --mf west.yml
```

but in that case, the west top dir is going to be into `sub1`
which is an issue.

one workaround is to use:
```
west init -l sub1 --mf sub2/west.yml
```

but in that case, the config is initialized incorrectly:
`manifest.path` contains only `sub1` and `manifest.file` is `sub2/west.yml`.

`manifest.path` should contain a path, even if `--mf` is a relative path.
`manifest.file` should only contain the filename.

this change allows any usage so that the workspace top dir is created next to `sub1`
and the manifest repo can be located into nested directories

Signed-off-by: Cyril Fougeray <[email protected]>

Author: fouge

src/west/app/project.py

@@ -204,13 +204,13 @@ def do_add_parser(self, parser_adder):
                             help='''manifest repository branch or tag name
                             to check out first; cannot be combined with -l''')
         parser.add_argument('--mf', '--manifest-file', dest='manifest_file',
-                            help='manifest file name to use')
+                            help='manifest file name to use, relative to "directory"')
         parser.add_argument('-l', '--local', action='store_true',
-                            help='''use "directory" as an existing local
-                            manifest repository instead of cloning one from
-                            MANIFEST_URL; .west is created next to "directory"
-                            in this case, and manifest.path points at
-                            "directory"''')
+                            help='''use "directory" to create the workspace
+                            from a local manifest directory, instead of cloning 
+                            one from MANIFEST_URL; .west is created next to 
+                            "directory" in this case, and manifest.path points at
+                            the manifest file location.''')
         parser.add_argument('--rename-delay', type=int,
                             help='''Number of seconds to wait before renaming
                             some temporary directories. Some filesystems like NTFS
@@ -273,7 +273,7 @@ def local(self, args) -> Path:
         manifest_filename = args.manifest_file or 'west.yml'
         manifest_file = manifest_dir / manifest_filename
         topdir = manifest_dir.parent
-        rel_manifest = manifest_dir.name
+        rel_manifest = manifest_file.parent.relative_to(manifest_dir.parent)
         west_dir = topdir / WEST_DIR
 
         if not manifest_file.is_file():
@@ -287,7 +287,7 @@ def local(self, args) -> Path:
         os.chdir(topdir)
         self.config = Configuration(topdir=topdir)
         self.config.set('manifest.path', os.fspath(rel_manifest))
-        self.config.set('manifest.file', manifest_filename)
+        self.config.set('manifest.file', manifest_file.name)
 
         return topdir