From fdf5d0b35b2b9c19136437af97b687b34fc740ea Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 13 Feb 2020 12:50:41 +0200
Subject: Move bdep-new binless sub-option from --lang|-l to --type|t

---
 bdep/new.cxx | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'bdep/new.cxx')

diff --git a/bdep/new.cxx b/bdep/new.cxx
index 4c1146e..e4f3dd6 100644
--- a/bdep/new.cxx
+++ b/bdep/new.cxx
@@ -325,6 +325,9 @@ namespace bdep
         }
       case type::lib:
         {
+          if (t.lib_opt.binless () && l != lang::cxx)
+            fail << "--type|-t,binless is only valid for C++ libraries";
+
           readme  = !t.lib_opt.no_readme ()  && !sub;
           altn    =  t.lib_opt.alt_naming ();
           itest   = !t.lib_opt.no_tests ()   && !sub;
@@ -366,12 +369,6 @@ namespace bdep
           break;
         }
       }
-
-      // @@ TODO: move into the lib case once binless is a project type
-      //    suboption.
-      //
-      if (l == lang::cxx && l.cxx_opt.binless () && t != type::lib)
-        fail << "'binless' is only valid for libraries";
     }
 
     // Standard/alternative build file/directory naming scheme.
@@ -1495,7 +1492,7 @@ namespace bdep
               break;
             }
           case lang::cxx:
-            if (l.cxx_opt.binless ())
+            if (t.lib_opt.binless ())
             {
               apih = s + he;
               verh = ver ? "version" + he : string ();
@@ -1668,7 +1665,7 @@ namespace bdep
             os.close ();
           }
 
-          bool binless (l == lang::cxx && l.cxx_opt.binless ());
+          bool binless (t.lib_opt.binless ());
 
           // buildfile
           //
-- 
cgit v1.1