[Lldb-commits] [PATCH] D74859: [lldb] Fix version string when using LLDB_REVISION but not LLDB_REPOSITORY

[Jordan Rupprecht via Phabricator via lldb-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rG0ffa6e1a7e1c: [lldb] Fix version string when using 
LLDB_REVISION but not LLDB_REPOSITORY (authored by rupprecht).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D74859/new/

https://reviews.llvm.org/D74859

Files:
  lldb/source/lldb.cpp


Index: lldb/source/lldb.cpp
===
--- lldb/source/lldb.cpp
+++ lldb/source/lldb.cpp
@@ -50,8 +50,10 @@
   g_version_str += " (";
   if (lldb_repo)
 g_version_str += lldb_repo;
+  if (lldb_repo && lldb_rev)
+g_version_str += " ";
   if (lldb_rev) {
-g_version_str += " revision ";
+g_version_str += "revision ";
 g_version_str += lldb_rev;
   }
   g_version_str += ")";


Index: lldb/source/lldb.cpp
===
--- lldb/source/lldb.cpp
+++ lldb/source/lldb.cpp
@@ -50,8 +50,10 @@
   g_version_str += " (";
   if (lldb_repo)
 g_version_str += lldb_repo;
+  if (lldb_repo && lldb_rev)
+g_version_str += " ";
   if (lldb_rev) {
-g_version_str += " revision ";
+g_version_str += "revision ";
 g_version_str += lldb_rev;
   }
   g_version_str += ")";
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

[Lldb-commits] [PATCH] D74859: [lldb] Fix version string when using LLDB_REVISION but not LLDB_REPOSITORY

[Jonas Devlieghere via Phabricator via lldb-commits]

JDevlieghere accepted this revision.
JDevlieghere added a comment.

In D74859#1884159 , @labath wrote:

> > Aside: I'm not sure we really need all the different versions since we've 
> > moved to the monorepo layout -- I don't think anyone is using different 
> > llvm/clang/lldb revisions, are they?
>
> The standalone build of lldb (and clang) still works, and there are people 
> that use it (some distros build their packages this way, and it's the 
> "official" build method in the swift fork afaik). So, in theory one could 
> build lldb+clang+llvm from three different revisions (but I hope noone 
> actually does that).


Yup, Swift uses the standalone build.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D74859/new/

https://reviews.llvm.org/D74859



___
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

[Lldb-commits] [PATCH] D74859: [lldb] Fix version string when using LLDB_REVISION but not LLDB_REPOSITORY

[Pavel Labath via Phabricator via lldb-commits]

labath accepted this revision.
labath added a comment.
This revision is now accepted and ready to land.

> Aside: I'm not sure we really need all the different versions since we've 
> moved to the monorepo layout -- I don't think anyone is using different 
> llvm/clang/lldb revisions, are they?

The standalone build of lldb (and clang) still works, and there are people that 
use it (some distros build their packages this way, and it's the "official" 
build method in the swift fork afaik). So, in theory one could build 
lldb+clang+llvm from three different revisions (but I hope noone actually does 
that).


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D74859/new/

https://reviews.llvm.org/D74859



___
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

[Lldb-commits] [PATCH] D74859: [lldb] Fix version string when using LLDB_REVISION but not LLDB_REPOSITORY

[Jordan Rupprecht via Phabricator via lldb-commits]

rupprecht created this revision.
rupprecht added reviewers: labath, JDevlieghere, friss.
Herald added a project: LLDB.
Herald added a subscriber: lldb-commits.

lldb's format string (line one) is:
`lldb version $clang_version ($lldb_repo revision $lldb_revision)`

When only using $lldb_revision and not $lldb_repo, this might look like:
`lldb version 11 ( revision 12345)`
which looks pretty ugly.

Aside: I'm not sure we really need all the different versions since we've moved 
to the monorepo layout -- I don't think anyone is using different 
llvm/clang/lldb revisions, are they? We could likely tidy this up further if we 
knew how people consumed the output of lldb --version.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D74859

Files:
  lldb/source/lldb.cpp


Index: lldb/source/lldb.cpp
===
--- lldb/source/lldb.cpp
+++ lldb/source/lldb.cpp
@@ -50,8 +50,10 @@
   g_version_str += " (";
   if (lldb_repo)
 g_version_str += lldb_repo;
+  if (lldb_repo && lldb_rev)
+g_version_str += " ";
   if (lldb_rev) {
-g_version_str += " revision ";
+g_version_str += "revision ";
 g_version_str += lldb_rev;
   }
   g_version_str += ")";


Index: lldb/source/lldb.cpp
===
--- lldb/source/lldb.cpp
+++ lldb/source/lldb.cpp
@@ -50,8 +50,10 @@
   g_version_str += " (";
   if (lldb_repo)
 g_version_str += lldb_repo;
+  if (lldb_repo && lldb_rev)
+g_version_str += " ";
   if (lldb_rev) {
-g_version_str += " revision ";
+g_version_str += "revision ";
 g_version_str += lldb_rev;
   }
   g_version_str += ")";
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits