mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-03 04:41:21 +00:00
Code Activity

Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable

Browse source
This commit is contained in:
Christoph M. Wintersteiger 2013-02-13 17:21:29 +00:00
commit f161f455df
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/mk_util.py
View file

@ -1298,7 +1298,7 @@ def mk_config():
'SLINK_OUT_FLAG=/Fe\n') 'SLINK_OUT_FLAG=/Fe\n')
extra_opt = '' extra_opt = ''
if GIT_HASH: if GIT_HASH:
extra_opt = '%s /D Z3GITHASH="%s"' % (extra_opt, GIT_HASH) extra_opt = '%s /D Z3GITHASH=%s' % (extra_opt, GIT_HASH)
if DEBUG_MODE: if DEBUG_MODE:
config.write( config.write(
'LINK_FLAGS=/nologo /MDd\n' 'LINK_FLAGS=/nologo /MDd\n'
@ -1361,7 +1361,7 @@ def mk_config():
else: else:
CPPFLAGS = '%s -D_MP_INTERNAL' % CPPFLAGS CPPFLAGS = '%s -D_MP_INTERNAL' % CPPFLAGS
if GIT_HASH: if GIT_HASH:
CPPFLAGS = '%s -DZ3GITHASH="%s"' % (CPPFLAGS, GIT_HASH) CPPFLAGS = '%s -DZ3GITHASH=%s' % (CPPFLAGS, GIT_HASH)
CXXFLAGS = '%s -c' % CXXFLAGS CXXFLAGS = '%s -c' % CXXFLAGS
HAS_OMP = test_openmp(CXX) HAS_OMP = test_openmp(CXX)
if HAS_OMP: if HAS_OMP:

5
src/shell/main.cpp
View file

@ -50,6 +50,9 @@ void error(const char * msg) {
exit(ERR_CMD_LINE); exit(ERR_CMD_LINE);
} }
#define STRINGIZE(x) #x
#define STRINGIZE_VALUE_OF(x) STRINGIZE(x)
void display_usage() { void display_usage() {
std::cout << "Z3 [version " << Z3_MAJOR_VERSION << "." << Z3_MINOR_VERSION << "." << Z3_BUILD_NUMBER; std::cout << "Z3 [version " << Z3_MAJOR_VERSION << "." << Z3_MINOR_VERSION << "." << Z3_BUILD_NUMBER;
std::cout << " - "; std::cout << " - ";
@ -60,7 +63,7 @@ void display_usage() {
#endif #endif
std::cout << " bit"; std::cout << " bit";
#ifdef Z3GITHASH #ifdef Z3GITHASH
std::cout << " - build hashcode " << Z3GITHASH; std::cout << " - build hashcode " << STRINGIZE_VALUE_OF(Z3GITHASH);
#endif #endif
std::cout << "]. (C) Copyright 2006-2013 Microsoft Corp.\n"; std::cout << "]. (C) Copyright 2006-2013 Microsoft Corp.\n";
std::cout << "Usage: z3 [options] [-file:]file\n"; std::cout << "Usage: z3 [options] [-file:]file\n";