From 33872fc72e40331c23a82f2b5ec3e509c7191d7a Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Sat, 16 Dec 2017 18:23:00 +0100
Subject: Modify ninja interface to build after creating build file

This setup is needed because we need to build the project
before building tests
---
 src/GlobalLib.cpp | 6 +-----
 src/main.cpp      | 9 +--------
 2 files changed, 2 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/GlobalLib.cpp b/src/GlobalLib.cpp
index c38e22f..30a044f 100644
--- a/src/GlobalLib.cpp
+++ b/src/GlobalLib.cpp
@@ -203,14 +203,10 @@ namespace sibs
             if(createBuildDirResult.isErr())
                 return Result<string>::Err(createBuildDirResult);
 
-            Result<bool> buildFileResult = ninja.createBuildFile(sibsConfig, debugBuildPath.c_str(), staticLinkerFlagCallbackFunc, dynamicLinkerFlagCallbackFunc);
+            Result<bool> buildFileResult = ninja.build(sibsConfig, debugBuildPath.c_str(), staticLinkerFlagCallbackFunc, dynamicLinkerFlagCallbackFunc);
             if (buildFileResult.isErr())
                 return Result<string>::Err(buildFileResult.getErrMsg());
 
-            Result<bool> buildResult = ninja.build(debugBuildPath.c_str());
-            if (buildResult.isErr())
-                return Result<string>::Err(buildResult.getErrMsg());
-
             return Result<string>::Ok(libPath);
         }
     }
diff --git a/src/main.cpp b/src/main.cpp
index 3d970f4..e645b70 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -187,20 +187,13 @@ int buildProject(int argc, const char **argv)
     walkDir(projectPath.c_str(), collectSourceFiles);
 
     string debugBuildPath = projectPath + "/sibs-build/debug";
-    Result<bool> buildFileResult = ninja.createBuildFile(sibsConfig, debugBuildPath.c_str());
+    Result<bool> buildFileResult = ninja.build(sibsConfig, debugBuildPath.c_str());
     if(buildFileResult.isErr())
     {
         cerr << "Failed to build ninja file: " << buildFileResult.getErrMsg() << endl;
         exit(7);
     }
 
-    Result<bool> buildResult = ninja.build(debugBuildPath.c_str());
-    if(buildResult.isErr())
-    {
-        cerr << "Failed to build ninja file: " << buildResult.getErrMsg() << endl;
-        exit(8);
-    }
-
     return 0;
 }
 
-- 
cgit v1.2.3