From dfd737aa661de0c4cfbe3b2f72b75454d322fab0 Mon Sep 17 00:00:00 2001 From: Leonardo de Moura Date: Thu, 25 Oct 2012 22:02:24 -0700 Subject: [PATCH] Assuming VS x64 command prompt Signed-off-by: Leonardo de Moura --- scripts/config-vs-debug-x64.mk | 6 +++--- scripts/config-vs-debug.mk | 6 +++--- scripts/config-vs-release-x64.mk | 6 +++--- scripts/config-vs-release.mk | 6 +++--- scripts/mk_util.py | 19 +++++++++++-------- 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/scripts/config-vs-debug-x64.mk b/scripts/config-vs-debug-x64.mk index 968fb03cf..8bf6e6fb1 100644 --- a/scripts/config-vs-debug-x64.mk +++ b/scripts/config-vs-debug-x64.mk @@ -1,4 +1,4 @@ -CXX="$(VSINSTALLDIR)VC\Bin\x86_amd64\cl" +CXX=cl CXXFLAGS=/c /ZI /nologo /W3 /WX- /Od /Oy- /D WIN32 /D _AMD64_ /D _DEBUG /D Z3DEBUG /D _CONSOLE /D _TRACE /D _WINDOWS /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /openmp /Gd /analyze- CXX_OUT_FLAG=/Fo OBJ_EXT=.obj @@ -7,13 +7,13 @@ AR=lib AR_FLAGS=/nologo AR_OUTFLAG=/OUT: EXE_EXT=.exe -LINK="$(VSINSTALLDIR)VC\Bin\x86_amd64\cl" +LINK=cl LINK_FLAGS=/nologo /MDd LINK_EXTRA_FLAGS=/link /DEBUG /MACHINE:X64 /SUBSYSTEM:CONSOLE /INCREMENTAL:NO /STACK:8388608 /OPT:REF /OPT:ICF /TLBID:1 /DYNAMICBASE /NXCOMPAT LINK_OUT_FLAG=/Fe SO_EXT=.dll -SLINK="$(VSINSTALLDIR)VC\Bin\x86_amd64\cl" +SLINK=cl SLINK_FLAGS=/nologo /LDd SLINK_EXTRA_FLAGS=/link /DEBUG /MACHINE:X64 /SUBSYSTEM:WINDOWS /INCREMENTAL:NO /STACK:8388608 /OPT:REF /OPT:ICF /TLBID:1 /DYNAMICBASE:NO SLINK_OUT_FLAG=/Fe diff --git a/scripts/config-vs-debug.mk b/scripts/config-vs-debug.mk index 2c890f5de..1b2784104 100644 --- a/scripts/config-vs-debug.mk +++ b/scripts/config-vs-debug.mk @@ -1,5 +1,5 @@ CXX=cl -CXXFLAGS=/c /ZI /nologo /W3 /WX- /Od /Oy- /D "WIN32" /D "_DEBUG" /D "Z3DEBUG" /D "_CONSOLE" /D "_TRACE" /D "_WINDOWS" /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /openmp /Gd /analyze- +CXXFLAGS=/c /ZI /nologo /W3 /WX- /Od /Oy- /D WIN32 /D _DEBUG /D Z3DEBUG /D _CONSOLE /D _TRACE /D _WINDOWS /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /openmp /Gd /analyze- CXX_OUT_FLAG=/Fo OBJ_EXT=.obj LIB_EXT=.lib @@ -9,12 +9,12 @@ AR_OUTFLAG=/OUT: EXE_EXT=.exe LINK=cl LINK_FLAGS=/nologo /MDd -LINK_EXTRA_FLAGS=/link /DEBUG /MACHINE:X86 /SUBSYSTEM:CONSOLE /INCREMENTAL:NO /STACK:"8388608" /OPT:REF /OPT:ICF /TLBID:1 /DYNAMICBASE /NXCOMPAT +LINK_EXTRA_FLAGS=/link /DEBUG /MACHINE:X86 /SUBSYSTEM:CONSOLE /INCREMENTAL:NO /STACK:8388608 /OPT:REF /OPT:ICF /TLBID:1 /DYNAMICBASE /NXCOMPAT LINK_OUT_FLAG=/Fe SO_EXT=.dll SLINK=cl SLINK_FLAGS=/nologo /LDd -SLINK_EXTRA_FLAGS=/link /DEBUG /MACHINE:X86 /SUBSYSTEM:WINDOWS /INCREMENTAL:NO /STACK:"8388608" /OPT:REF /OPT:ICF /TLBID:1 /DYNAMICBASE:NO +SLINK_EXTRA_FLAGS=/link /DEBUG /MACHINE:X86 /SUBSYSTEM:WINDOWS /INCREMENTAL:NO /STACK:8388608 /OPT:REF /OPT:ICF /TLBID:1 /DYNAMICBASE:NO SLINK_OUT_FLAG=/Fe diff --git a/scripts/config-vs-release-x64.mk b/scripts/config-vs-release-x64.mk index b1e856b18..37cb55420 100644 --- a/scripts/config-vs-release-x64.mk +++ b/scripts/config-vs-release-x64.mk @@ -1,4 +1,4 @@ -CXX="$(VSINSTALLDIR)VC\Bin\x86_amd64\cl" +CXX=cl CXXFLAGS=/c /Zi /nologo /W3 /WX- /O2 /D WIN32 /D NDEBUG /D _LIB /D _WINDOWS /D _AMD64_ /D _UNICODE /D UNICODE /Gm- /EHsc /MD /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TP CXX_OUT_FLAG=/Fo OBJ_EXT=.obj @@ -7,13 +7,13 @@ AR=lib AR_FLAGS=/nologo AR_OUTFLAG=/OUT: EXE_EXT=.exe -LINK="$(VSINSTALLDIR)VC\Bin\x86_amd64\cl" +LINK=cl LINK_FLAGS=/nologo /MD LINK_EXTRA_FLAGS=/link /MACHINE:X64 /SUBSYSTEM:CONSOLE /INCREMENTAL:NO /STACK:8388608 LINK_OUT_FLAG=/Fe SO_EXT=.dll -SLINK="$(VSINSTALLDIR)VC\Bin\x86_amd64\cl" +SLINK=cl SLINK_FLAGS=/nologo /LD SLINK_EXTRA_FLAGS=/link /MACHINE:X64 /SUBSYSTEM:WINDOWS /INCREMENTAL:NO /STACK:8388608 SLINK_OUT_FLAG=/Fe diff --git a/scripts/config-vs-release.mk b/scripts/config-vs-release.mk index 72bc9bb98..9fd30b050 100644 --- a/scripts/config-vs-release.mk +++ b/scripts/config-vs-release.mk @@ -1,5 +1,5 @@ CXX=cl -CXXFLAGS=/nologo /c /W3 /WX- /O2 /Oy- /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WINDOWS" /D "ASYNC_COMMANDS" /Gm- /EHsc /GS /fp:precise /Zc:wchar_t /Zc:forScope /openmp /Gd /analyze- /arch:SSE2 +CXXFLAGS=/nologo /c /W3 /WX- /O2 /Oy- /D WIN32 /D NDEBUG /D _CONSOLE /D _WINDOWS /D ASYNC_COMMANDS /Gm- /EHsc /GS /fp:precise /Zc:wchar_t /Zc:forScope /openmp /Gd /analyze- /arch:SSE2 CXX_OUT_FLAG=/Fo OBJ_EXT=.obj LIB_EXT=.lib @@ -9,13 +9,13 @@ AR_OUTFLAG=/OUT: EXE_EXT=.exe LINK=cl LINK_FLAGS=/nologo /MD -LINK_EXTRA_FLAGS=/link /MACHINE:X86 /SUBSYSTEM:CONSOLE /INCREMENTAL:NO /STACK:"8388608" /OPT:REF /OPT:ICF /TLBID:1 /DYNAMICBASE /NXCOMPAT +LINK_EXTRA_FLAGS=/link /MACHINE:X86 /SUBSYSTEM:CONSOLE /INCREMENTAL:NO /STACK:8388608 /OPT:REF /OPT:ICF /TLBID:1 /DYNAMICBASE /NXCOMPAT LINK_OUT_FLAG=/Fe SO_EXT=.dll SLINK=cl SLINK_FLAGS=/nologo /LD -SLINK_EXTRA_FLAGS=/link /MACHINE:X86 /SUBSYSTEM:WINDOWS /INCREMENTAL:NO /STACK:"8388608" /OPT:REF /OPT:ICF /TLBID:1 /DYNAMICBASE:NO +SLINK_EXTRA_FLAGS=/link /MACHINE:X86 /SUBSYSTEM:WINDOWS /INCREMENTAL:NO /STACK:8388608 /OPT:REF /OPT:ICF /TLBID:1 /DYNAMICBASE:NO SLINK_OUT_FLAG=/Fe diff --git a/scripts/mk_util.py b/scripts/mk_util.py index 099b7f38e..b9217be9a 100644 --- a/scripts/mk_util.py +++ b/scripts/mk_util.py @@ -18,7 +18,7 @@ BUILD_DIR='build' REV_BUILD_DIR='..' SRC_DIR='src' IS_WINDOW=False -VERBOSE=False +VERBOSE=True DEBUG_MODE=False SHOW_CPPS = True VS_X64 = False @@ -36,7 +36,7 @@ def display_help(): print "It must be executed from the Z3 root directory." print "\nOptions:" print " -h, --help display this message." - print " -v, --verbose be verbose." + print " -s, --silent do not print verbose messages." print " -b , --build= subdirectory where Z3 will be built (default: build)." print " -d, --debug compile Z3 in debug mode." print " -x, --x64 create 64 binary when using Visual Studio." @@ -47,9 +47,9 @@ def display_help(): # Parse configuration option for mk_make script def parse_options(): global VERBOSE, DEBUG_MODE, IS_WINDOW, VS_X64, ONLY_MAKEFILES, SHOW_CPPS - options, remainder = getopt.gnu_getopt(sys.argv[1:], 'b:dvxhmc', ['build=', + options, remainder = getopt.gnu_getopt(sys.argv[1:], 'b:svxhmc', ['build=', 'debug', - 'verbose', + 'silent', 'x64', 'help', 'makefiles', @@ -60,8 +60,8 @@ def parse_options(): if arg == 'src': raise MKException('The src directory should not be used to host the Makefile') set_build_dir(arg) - elif opt in ('-v', '--verbose'): - VERBOSE = True + elif opt in ('-s', '--silent'): + VERBOSE = False elif opt in ('-d', '--debug'): DEBUG_MODE = True elif opt in ('-x', '--x64'): @@ -481,10 +481,13 @@ def mk_makefile(): print " compilation mode: Release" if IS_WINDOW: if VS_X64: - print " platform: x64" + print " platform: x64\n" + print "To build Z3, open a ***Visual Studio x64 Command Prompt***, then" else: print " platform: x86" - print "Type 'cd %s && nmake to build Z3" % BUILD_DIR + print "To build Z3, open a ***Visual Studio Command Prompt***, then" + print "type 'cd %s/%s && nmake'\n" % (os.getcwd(), BUILD_DIR) + print 'Remark: to open a Visual Studio Command Prompt, go to: "Start > All Programs > Visual Studio > Visual Studio Tools >"' else: print "Type 'cd %s; make' to build Z3" % BUILD_DIR