Call target 'default' if none specified instead of all and allow call…

…ing of other targets
nekosys-os · Aug 22, 2020 · fc6cded · fc6cded
1 parent 2f3d171
commit fc6cded
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 7 deletions.
diff --git a/nkm/AST/Expression/TargetInvokeExpr.cs b/nkm/AST/Expression/TargetInvokeExpr.cs
@@ -0,0 +1,7 @@
+namespace nkm.AST.Expression
+{
+    public class TargetInvokeExpr : IExpression
+    {
+        public string TargetName { get; set; }
+    }
+}
diff --git a/nkm/Parser/NekofileParser.cs b/nkm/Parser/NekofileParser.cs
@@ -1,4 +1,5 @@
 using nkm.AST;
+using nkm.AST.Expression;
 using nkm.Logging;
 using nkm.Utils;
 using System;
@@ -116,7 +117,14 @@ private void ParseLine(int no, string line)
                     }
                     else if (currentToolInvoke == null)
                     {
-                        currentTarget.Commands.Add(new RawCommandExpr { Value = line });
+                        if (line.StartsWith("%"))
+                        {
+                            currentTarget.Commands.Add(new TargetInvokeExpr { TargetName = line.Substring(1).Trim() });
+                        }
+                        else
+                        {
+                            currentTarget.Commands.Add(new RawCommandExpr { Value = line });
+                        }
                     }
                     else
                     {

diff --git a/nkm/Program.cs b/nkm/Program.cs
@@ -36,8 +36,10 @@ private static void RunBuilder(string target)
                 return;
             }
 
-            var targetName = target == string.Empty ? "all targets" : target;
-            LoggerFactory.Current.Log(LogLevel.Info, $"Building {targetName} in script {buildScript.FullName}...");
+            if (target == string.Empty)
+                target = "default";
+
+            LoggerFactory.Current.Log(LogLevel.Info, $"Building {target} in script {buildScript.FullName}...");
 
             var runner = new NekofileRunner(parser.Document);
             if (!runner.Execute(target))

diff --git a/nkm/Runner/NekofileRunner.cs b/nkm/Runner/NekofileRunner.cs
@@ -1,4 +1,5 @@
 using nkm.AST;
+using nkm.AST.Expression;
 using nkm.Logging;
 using System;
 using System.Collections.Generic;
@@ -28,7 +29,7 @@ public bool Execute(string target)
             {
                 foreach (var expr in nekofile.Expressions)
                 {
-                    if (expr is TargetDefExpr targetExpr && (target == string.Empty || targetExpr.Name == target))
+                    if (expr is TargetDefExpr targetExpr && targetExpr.Name == target)
                     {
                         ExecuteTarget(targetExpr);
                     }
@@ -58,6 +59,10 @@ private void ExecuteTarget(TargetDefExpr target)
                 {
                     InvokeTool(invokeCmd);
                 }
+                else if (cmd is TargetInvokeExpr targetCmd)
+                {
+                    Execute(targetCmd.TargetName);
+                }
             }
         }
 
@@ -169,7 +174,7 @@ private void ExecuteCommand(string command)
             else
             {
                 startInfo.FileName = "sh";
-                var escapedArgs = command.Replace("\"", "\\\""); 
+                var escapedArgs = command.Replace("\"", "\\\"");
                 startInfo.Arguments = $"-c \"{escapedArgs}\"";
             }
 

diff --git a/nkm/nkm.csproj b/nkm/nkm.csproj
@@ -3,12 +3,12 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>0.1.0</Version>
+    <Version>0.2.0</Version>
     <Authors>Twometer</Authors>
     <Product>NekoMake Build System</Product>
     <Description>The NekoMake build system is the next-gen and convenient build system used by the nekosys OS</Description>
     <PackageProjectUrl>https://github.com/nekosys-os/nkm</PackageProjectUrl>
-    <AssemblyVersion>0.1.0.0</AssemblyVersion>
+    <AssemblyVersion>0.2.0.0</AssemblyVersion>
   </PropertyGroup>
 
 </Project>