Improve building local projects. Add xml mime type.

egorpugin · egorpugin · commit 2138fdc3f3bb · 2017-02-02T00:05:49.000+03:00
diff --git a/src/client/main.cpp b/src/client/main.cpp
@@ -450,6 +450,8 @@ void default_run()
     check_spec_file();
 
     Config c;
+    c.allow_relative_project_names = true;
+    c.allow_local_dependencies = true;
     auto &deps = Settings::get_local_settings().dependencies;
     if (deps.empty())
     {
@@ -505,7 +507,10 @@ void load_current_config()
     try
     {
         // load local settings for storage dir
-        Config().load_current_config();
+        Config c;
+        c.allow_relative_project_names = true;
+        c.allow_local_dependencies = true;
+        c.load_current_config();
     }
     catch (...)
     {
diff --git a/src/common/package_store.cpp b/src/common/package_store.cpp
@@ -414,20 +414,26 @@ PackageStore::read_packages_from_file(path p, const String &config_name, bool di
             sname = cppan_fn.parent_path().filename().string();
             p = cppan_fn;
         }
-        else if (fs::exists(main_fn))
-        {
-            read_from_cpp(main_fn);
-            p = main_fn;
-            sname = p.filename().stem().string();
-            cpp_fn = p;
-        }
         else
         {
-            LOG_DEBUG(logger, "No candidates {cppan.yml|main.cpp} for reading in directory " + p.string() +
-                ". Assuming default config.");
+            if (!fs::exists(main_fn) && fs::exists("main.c"))
+                main_fn = "main.c";
 
-            conf = build_spec_file(p);
-            sname = p.filename().string();
+            if (fs::exists(main_fn))
+            {
+                read_from_cpp(main_fn);
+                p = main_fn;
+                sname = p.filename().stem().string();
+                cpp_fn = p;
+            }
+            else
+            {
+                LOG_DEBUG(logger, "No candidates {cppan.yml|main.c[pp]} for reading in directory " + p.string() +
+                    ". Assuming default config.");
+
+                conf = build_spec_file(p);
+                sname = p.filename().string();
+            }
         }
     }
     else
diff --git a/src/common/project.cpp b/src/common/project.cpp
@@ -36,6 +36,9 @@ using MimeType = String;
 using MimeTypes = std::set<MimeType>;
 
 const MimeTypes source_mime_types{
+    "application/xml",
+    "text/xml",
+
     "inode/x-empty", // empty file
 
     "text/x-asm",
@@ -825,7 +828,11 @@ void Project::load(const yaml &root)
                         if (dependency.ppath.empty())
                             throw std::runtime_error("Could not load local project: " + lp);
                     }
-                    dependency.ppath = ld.value();
+
+                    if (dependency.ppath.is_relative() && rd.has_local_package(ld.value() / dependency.ppath))
+                        dependency.ppath = ld.value() / dependency.ppath;
+                    else // is this really needed?
+                        dependency.ppath = ld.value();
                 }
             }
 
@@ -1055,9 +1062,11 @@ void Project::load(const yaml &root)
     }
     if (defaults_allowed && iempty)
     {
-        std::function<void(const String &, const String &)> autodetect_source_dir;
-        autodetect_source_dir = [this, &autodetect_source_dir](const String &current, const String &next = String())
+        std::function<void(const Strings &)> autodetect_source_dir;
+        autodetect_source_dir = [this, &autodetect_source_dir](const Strings &dirs)
         {
+            const auto &current = dirs[0];
+            const auto &next = dirs[1];
             if (fs::exists(current))
             {
                 if (fs::exists("include"))
@@ -1081,11 +1090,12 @@ void Project::load(const yaml &root)
                 {
                     // now check next dir
                     if (!next.empty())
-                        autodetect_source_dir(next, "");
+                        autodetect_source_dir({ dirs.begin() + 1, dirs.end() });
                 }
             }
         };
-        autodetect_source_dir("src", "lib");
+        // keep empty entry at the end
+        autodetect_source_dir({ "src", "source", "sources", "lib", "" });
     }
     include_directories.public_.insert("${BDIR}");
 
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
@@ -204,6 +204,8 @@ void Settings::load_main(const yaml &root, const SettingsType type)
     if (type == SettingsType::Local)
     {
         Project p;
+        p.allow_relative_project_names = true;
+        p.allow_local_dependencies = true;
         p.load(root);
         dependencies = p.dependencies;
     }
diff --git a/src/printers/cmake.cpp b/src/printers/cmake.cpp
@@ -1805,6 +1805,7 @@ else())");
 
     // aliases
     {
+        // target type
         const String tt = d.flags[pfExecutable] ? "add_executable" : "add_library";
 
         config_section_title(ctx, "aliases");
@@ -1823,6 +1824,12 @@ else())");
         add_aliases(".");
         add_aliases("::");
 
+        if (d.flags[pfLocalProject])
+        {
+            ctx.addLine(tt + "(" + d.ppath.back() + " ALIAS ${this})");
+            ctx.emptyLines();
+        }
+
         if (!p.aliases.empty())
         {
             ctx.addLine("# user-defined");

Original file line number	Diff line number	Diff line change
`@@ -450,6 +450,8 @@ void default_run()`
`450`	`450`	`check_spec_file();`
`451`	`451`
`452`	`452`	`Config c;`
	`453`	`+ c.allow_relative_project_names = true;`
	`454`	`+ c.allow_local_dependencies = true;`
`453`	`455`	`auto &deps = Settings::get_local_settings().dependencies;`
`454`	`456`	`if (deps.empty())`
`455`	`457`	`{`
`@@ -505,7 +507,10 @@ void load_current_config()`
`505`	`507`	`try`
`506`	`508`	`{`
`507`	`509`	`// load local settings for storage dir`
`508`		`- Config().load_current_config();`
	`510`	`+ Config c;`
	`511`	`+ c.allow_relative_project_names = true;`
	`512`	`+ c.allow_local_dependencies = true;`
	`513`	`+ c.load_current_config();`
`509`	`514`	`}`
`510`	`515`	`catch (...)`
`511`	`516`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,9 @@ using MimeType = String;`
`36`	`36`	`using MimeTypes = std::set<MimeType>;`
`37`	`37`
`38`	`38`	`const MimeTypes source_mime_types{`
	`39`	`+ "application/xml",`
	`40`	`+ "text/xml",`
	`41`	`+`
`39`	`42`	`"inode/x-empty", // empty file`
`40`	`43`
`41`	`44`	`"text/x-asm",`
`@@ -825,7 +828,11 @@ void Project::load(const yaml &root)`
`825`	`828`	`if (dependency.ppath.empty())`
`826`	`829`	`throw std::runtime_error("Could not load local project: " + lp);`
`827`	`830`	`}`
`828`		`- dependency.ppath = ld.value();`
	`831`	`+`
	`832`	`+ if (dependency.ppath.is_relative() && rd.has_local_package(ld.value() / dependency.ppath))`
	`833`	`+ dependency.ppath = ld.value() / dependency.ppath;`
	`834`	`+ else // is this really needed?`
	`835`	`+ dependency.ppath = ld.value();`
`829`	`836`	`}`
`830`	`837`	`}`
`831`	`838`
`@@ -1055,9 +1062,11 @@ void Project::load(const yaml &root)`
`1055`	`1062`	`}`
`1056`	`1063`	`if (defaults_allowed && iempty)`
`1057`	`1064`	`{`
`1058`		`- std::function<void(const String &, const String &)> autodetect_source_dir;`
`1059`		`- autodetect_source_dir = [this, &autodetect_source_dir](const String &current, const String &next = String())`
	`1065`	`+ std::function<void(const Strings &)> autodetect_source_dir;`
	`1066`	`+ autodetect_source_dir = [this, &autodetect_source_dir](const Strings &dirs)`
`1060`	`1067`	`{`
	`1068`	`+ const auto &current = dirs[0];`
	`1069`	`+ const auto &next = dirs[1];`
`1061`	`1070`	`if (fs::exists(current))`
`1062`	`1071`	`{`
`1063`	`1072`	`if (fs::exists("include"))`
`@@ -1081,11 +1090,12 @@ void Project::load(const yaml &root)`
`1081`	`1090`	`{`
`1082`	`1091`	`// now check next dir`
`1083`	`1092`	`if (!next.empty())`
`1084`		`- autodetect_source_dir(next, "");`
	`1093`	`+ autodetect_source_dir({ dirs.begin() + 1, dirs.end() });`
`1085`	`1094`	`}`
`1086`	`1095`	`}`
`1087`	`1096`	`};`
`1088`		`- autodetect_source_dir("src", "lib");`
	`1097`	`+ // keep empty entry at the end`
	`1098`	`+ autodetect_source_dir({ "src", "source", "sources", "lib", "" });`
`1089`	`1099`	`}`
`1090`	`1100`	`include_directories.public_.insert("${BDIR}");`
`1091`	`1101`
Original file line number	Diff line number	Diff line change
`@@ -204,6 +204,8 @@ void Settings::load_main(const yaml &root, const SettingsType type)`
`204`	`204`	`if (type == SettingsType::Local)`
`205`	`205`	`{`
`206`	`206`	`Project p;`
	`207`	`+ p.allow_relative_project_names = true;`
	`208`	`+ p.allow_local_dependencies = true;`
`207`	`209`	`p.load(root);`
`208`	`210`	`dependencies = p.dependencies;`
`209`	`211`	`}`