averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

build-script/libSwiftBasic: properly propagate the Swift version down to

Browse Source 
Version.cpp

rdar://19166288 rdar://19445760

Swift SVN r24592
This commit is contained in:
Dmitri Hrybenko
2015-01-21 05:01:42 +00:00
parent 53cf98c001
commit 41cd10e3f1
3 changed files with 48 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lib/Basic/Version.cpp
View File

@@ -1,4 +1,4 @@
//===- Version.cpp - Swift Version Number -----------------------*- C++ -*-===//
//===--- Version.cpp - Swift Version Number -------------------------------===//
//
// This source file is part of the Swift.org open source project
//
@@ -23,20 +23,20 @@
#define TOSTR(X) TOSTR2(X)
#ifdef SWIFT_VERSION_PATCHLEVEL
/// \brief Helper macro for SWIFT_VERSION_STRING.
#define SWIFT_MAKE_VERSION_STRING(X,Y,Z) TOSTR2(X.Y.Z)
/// Helper macro for SWIFT_VERSION_STRING.
#define SWIFT_MAKE_VERSION_STRING(X, Y, Z) TOSTR(X) "." TOSTR(Y) "." TOSTR(Z)
/// \brief A string that describes the Swift version number, e.g., "1.0".
#define SWIFT_VERSION_STRING \
SWIFT_MAKE_VERSION_STRING(SWIFT_VERSION_MAJOR,SWIFT_VERSION_MINOR, \
SWIFT_VERSION_PATCHLEVEL)
/// A string that describes the Swift version number, e.g., "1.0".
#define SWIFT_VERSION_STRING \
SWIFT_MAKE_VERSION_STRING(SWIFT_VERSION_MAJOR, SWIFT_VERSION_MINOR, \
SWIFT_VERSION_PATCHLEVEL)
#else
/// \brief Helper macro for SWIFT_VERSION_STRING.
#define SWIFT_MAKE_VERSION_STRING(X,Y) TOSTR2(X.Y)
/// Helper macro for SWIFT_VERSION_STRING.
#define SWIFT_MAKE_VERSION_STRING(X, Y) TOSTR(X) "." TOSTR(Y)
/// \brief A string that describes the Swift version number, e.g., "1.0".
#define SWIFT_VERSION_STRING \
SWIFT_MAKE_VERSION_STRING(SWIFT_VERSION_MAJOR,SWIFT_VERSION_MINOR)
/// A string that describes the Swift version number, e.g., "1.0".
#define SWIFT_VERSION_STRING \
SWIFT_MAKE_VERSION_STRING(SWIFT_VERSION_MAJOR, SWIFT_VERSION_MINOR)
#endif
namespace swift {
@@ -50,22 +50,15 @@ std::string getSwiftFullVersion() {
std::string buf;
llvm::raw_string_ostream OS(buf);
#ifdef SWIFT_VENDOR
OS << SWIFT_VENDOR;
OS << SWIFT_VENDOR " ";
#endif
OS << "Swift version " SWIFT_VERSION_STRING;
#ifdef SWIFT_SUBMIT_VERSION_STRING
OS << " (" TOSTR(SWIFT_SUBMIT_VERSION_STRING) ")";
#ifdef SWIFT_REPOSITORY_STRING
OS << " (" SWIFT_REPOSITORY_STRING ")";
#endif
return OS.str();
}
std::string getSwiftSubmitVersionQuad() {
#ifdef SWIFT_SUBMIT_VERSION_QUAD_STRING
return TOSTR(SWIFT_SUBMIT_VERSION_QUAD_STRING);
#else
return "0.0.0.0";
#endif
}
} // end namespace version
} // end namespace swift