Commit 851b73b9 authored by Mohamed, Fawzi Roberto (fawzi)'s avatar Mohamed, Fawzi Roberto (fawzi)
Browse files

metainfo generation fixes

parent 10643ff1
Pipeline #34340 failed with stages
in 41 minutes and 7 seconds
......@@ -665,7 +665,7 @@ object SimpleMetaInfoEnv extends StrictLogging {
name = dict.metadict_name,
description = dict.metadict_description,
source = JObject(
("path" -> JString(uri.path.toString)) ::
("path" -> JString(uri.path.toString.replace(".meta_dictionary.json", ".nomadmetainfo.json"))) ::
("kind" -> JString(uri.protocol.toString.toLowerCase)) :: Nil
),
nameToGid = Map(),
......@@ -679,7 +679,7 @@ object SimpleMetaInfoEnv extends StrictLogging {
)
}
for ((dName, e) <- envs) {
// very rough, could put only real deps...
// rough, puts all deps, not only the direct ones...
var toDo: Set[String] = Set(dName)
var done: Set[String] = Set()
var deps: Seq[MetaInfoEnv] = Seq()
......
......@@ -154,8 +154,8 @@ object MetaInfoTool extends StrictLogging {
if (Files.isDirectory(p)) {
(MetaDictionary.fromExplodedPath(p) -> DictFormat.Exploded)
} else {
val explodedDictionaryRe = "^([a-zA-Z_]+)(?:\\s*([0-9]+(?:\\.[0-9]+(?:\\.[0-9]+-[-+a-zA-Z0-9_])?)?))?\\.meta_dictionary$".r
val metaDictionaryRe = "^([a-zA-Z_]+)(?:\\s*([0-9]+(?:\\.[0-9]+(?:\\.[0-9]+-[-+a-zA-Z0-9_])?)?))?\\.meta_dictionary\\.json$".r
val explodedDictionaryRe = "^([a-zA-Z0-9_]+)(?:\\s+([0-9]+(?:\\.[0-9]+(?:\\.[0-9]+-[-+a-zA-Z0-9_])?)?))?\\.meta_dictionary$".r
val metaDictionaryRe = "^([a-zA-Z0-9_]+)(?:\\s+([0-9]+(?:\\.[0-9]+(?:\\.[0-9]+-[-+a-zA-Z0-9_])?)?))?\\.meta_dictionary\\.json$".r
val v1DictionaryRe = "^.*\\.nomadmetainfo\\.json$".r
p.getFileName.toString match {
case metaDictionaryRe(name, version) =>
......
Markdown is supported
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