From b76178a33178a6385bf0a9ee695b54e7992117a1 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 31 Oct 2018 10:47:40 +0200
Subject: Send CI requests from staged toolchain to ci.stage.build2.org

---
 bdep/buildfile |  6 ++++++
 bdep/ci.cli    |  2 +-
 bdep/ci.cxx    | 10 +++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/bdep/buildfile b/bdep/buildfile
index cc71107..f77282a 100644
--- a/bdep/buildfile
+++ b/bdep/buildfile
@@ -47,6 +47,12 @@ hxx{version}: in{version} $src_root/manifest
 
 obj{utility}: cxx.poptions += -DBDEP_EXE_SUFFIX='"'$bin.exe.suffix'"'
 
+# For now assume this is a staged toolchain if we are building with the staged
+# build system (see build.version.stage for details on the final plan).
+#
+if $build.version.stage
+  cxx.poptions += -DBDEP_STAGE
+
 # Disable "unknown pragma" warnings.
 #
 if ($cxx.class == 'msvc')
diff --git a/bdep/ci.cli b/bdep/ci.cli
index c7251ed..85c7a5f 100644
--- a/bdep/ci.cli
+++ b/bdep/ci.cli
@@ -71,7 +71,7 @@ namespace bdep
       "Don't prompt for confirmation before submitting."
     }
 
-    url --server = "https://ci.cppget.org"
+    url --server
     {
       "<url>",
       "CI server to submit the request to."
diff --git a/bdep/ci.cxx b/bdep/ci.cxx
index 1bb95c6..0ab6fad 100644
--- a/bdep/ci.cxx
+++ b/bdep/ci.cxx
@@ -19,6 +19,14 @@ namespace bdep
 {
   using bpkg::repository_location;
 
+  static const url default_server (
+#ifdef BDEP_STAGE
+    "https://ci.stage.build2.org"
+#else
+    "https://ci.cppget.org"
+#endif
+  );
+
   // Get the project's remote repository location corresponding to the current
   // (local) state of the repository. Fail if the working directory is not
   // clean or if the local state isn't in sync with the remote.
@@ -271,7 +279,7 @@ namespace bdep
 
     // Get the server and repository URLs.
     //
-    const url& srv (o.server ());
+    const url& srv (o.server_specified () ? o.server () : default_server);
     const repository_location rep (repository_url (o, prj));
 
     // Print the plan and ask for confirmation.
-- 
cgit v1.1