From 4a69f36f2261c486f8aad954558781c949688b78 Mon Sep 17 00:00:00 2001 From: PB Date: Sun, 20 Nov 2022 10:29:39 +0100 Subject: [PATCH] Remove application testing if samples don't crash Hopefully, we will not need a specialized application testing whether a sample crashes on start-up or not anymore. --- utils/execmon/Makefile.in | 126 --------------- utils/execmon/execmon.bkl | 13 -- utils/execmon/execmon.cpp | 233 -------------------------- utils/execmon/makefile.gcc | 182 --------------------- utils/execmon/makefile.vc | 324 ------------------------------------- utils/utils.bkl | 10 -- 6 files changed, 888 deletions(-) delete mode 100644 utils/execmon/Makefile.in delete mode 100644 utils/execmon/execmon.bkl delete mode 100644 utils/execmon/execmon.cpp delete mode 100644 utils/execmon/makefile.gcc delete mode 100644 utils/execmon/makefile.vc diff --git a/utils/execmon/Makefile.in b/utils/execmon/Makefile.in deleted file mode 100644 index f4a64feb36..0000000000 --- a/utils/execmon/Makefile.in +++ /dev/null @@ -1,126 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.13 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - - -@MAKE_SET@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -datarootdir = @datarootdir@ -INSTALL = @INSTALL@ -EXEEXT = @EXEEXT@ -STRIP = @STRIP@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DIR = @INSTALL_DIR@ -BK_DEPS = @BK_DEPS@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -bindir = @bindir@ -LIBS = @LIBS@ -CXX = @CXX@ -CXXFLAGS = @CXXFLAGS@ -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ -TOOLKIT = @TOOLKIT@ -TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ -TOOLKIT_VERSION = @TOOLKIT_VERSION@ -EXTRALIBS = @EXTRALIBS@ -EXTRALIBS_XML = @EXTRALIBS_XML@ -EXTRALIBS_GUI = @EXTRALIBS_GUI@ -WX_CPPFLAGS = @WX_CPPFLAGS@ -WX_CXXFLAGS = @WX_CXXFLAGS@ -WX_LDFLAGS = @WX_LDFLAGS@ -HOST_SUFFIX = @HOST_SUFFIX@ -wx_top_builddir = @wx_top_builddir@ - -### Variables: ### - -DESTDIR = -WX_RELEASE = 3.3 -LIBDIRNAME = $(wx_top_builddir)/lib -EXECMON_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(WX_CXXFLAGS) \ - $(CPPFLAGS) $(CXXFLAGS) -EXECMON_OBJECTS = \ - execmon_execmon.o - -### Conditionally set variables: ### - -@COND_DEPS_TRACKING_0@CXXC = $(CXX) -@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) -@COND_USE_GUI_0@PORTNAME = base -@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) -@COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_BUILD_debug@WXDEBUGFLAG = d -@COND_WXUNIV_1@WXUNIVNAME = univ -@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS) -@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) \ -@COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) -@COND_USE_XRC_1@__execmon___depname = execmon$(EXEEXT) -@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -COND_MONOLITHIC_0___WXLIB_BASE_p = \ - -lwx_base$(WXBASEPORT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) -@COND_USE_XRC_1@__install_execmon___depname = install_execmon -@COND_USE_XRC_1@__uninstall_execmon___depname = uninstall_execmon -COND_MONOLITHIC_1___WXLIB_MONO_p = \ - -lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) -@COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p) -@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \ -@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \ -@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \ -@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = \ -@COND_wxUSE_REGEX_builtin@ -lwxregexu$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \ -@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) - -### Targets: ### - -all: $(__execmon___depname) - -install: $(__install_execmon___depname) - -uninstall: $(__uninstall_execmon___depname) - -install-strip: install - $(STRIP) $(DESTDIR)$(bindir)/execmon$(EXEEXT) - -clean: - rm -rf ./.deps ./.pch - rm -f ./*.o - rm -f execmon$(EXEEXT) - -distclean: clean - rm -f config.cache config.log config.status bk-deps bk-make-pch Makefile - -@COND_USE_XRC_1@execmon$(EXEEXT): $(EXECMON_OBJECTS) -@COND_USE_XRC_1@ $(CXX) -o $@ $(EXECMON_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - -@COND_USE_XRC_1@install_execmon: $(__execmon___depname) -@COND_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) -@COND_USE_XRC_1@ $(INSTALL_PROGRAM) execmon$(EXEEXT) $(DESTDIR)$(bindir) - -@COND_USE_XRC_1@uninstall_execmon: -@COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/execmon$(EXEEXT) - -execmon_execmon.o: $(srcdir)/execmon.cpp - $(CXXC) -c -o $@ $(EXECMON_CXXFLAGS) $(srcdir)/execmon.cpp - - -# Include dependency info, if present: -@IF_GNU_MAKE@-include ./.deps/*.d - -.PHONY: all install uninstall clean distclean install_execmon uninstall_execmon diff --git a/utils/execmon/execmon.bkl b/utils/execmon/execmon.bkl deleted file mode 100644 index 4f78908241..0000000000 --- a/utils/execmon/execmon.bkl +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - execmon.cpp - base - $(BINDIR) - - - diff --git a/utils/execmon/execmon.cpp b/utils/execmon/execmon.cpp deleted file mode 100644 index 6f53097e38..0000000000 --- a/utils/execmon/execmon.cpp +++ /dev/null @@ -1,233 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: execmon.cpp -// Purpose: A simple execution monitor to test if wx samples crash at startup or not -// Author: Francesco Montorsi -// Modified by: -// Created: 25/3/09 -// Copyright: (c) 2009 Francesco Montorsi -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/log.h" -#endif // WX_PRECOMP - -#include "wx/cmdline.h" -#include "wx/vector.h" -#include "wx/process.h" -#include "wx/sstream.h" -#include "wx/utils.h" -#include "wx/filename.h" -#include "wx/app.h" -#include "wx/log.h" - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// utility classes -// ---------------------------------------------------------------------------- - -class MonitoredProcess : public wxProcess -{ -public: - MonitoredProcess() - { Redirect(); m_crashed=false; m_exitCode=0; } - - void OnTerminate(int WXUNUSED(pid), int status) - { - wxStringOutputStream out, err; - if (GetInputStream()) out.Write(*GetInputStream()); - if (GetErrorStream()) err.Write(*GetErrorStream()); - - //wxPrintf("%s\n", stdout.GetString()); - //wxPrintf("%s\n", stderr.GetString()); - - // when wx programs assert on wxGTK/wxMac, they put on stderr a message like: - // [Debug] date somefilename.pp(nnnn): assert "xxxxx" failed in yyyy - // but then the assert dialog pop-ups and thus the app doesn't exit - // FIXME: make assertion detection work also under other platforms - // see https://github.com/wxWidgets/wxWidgets/issues/10697 - m_crashed = out.GetString().Contains("assert") || - err.GetString().Contains("assert"); - m_exitCode = status; - } - - void Kill() - { - wxProcess::Kill(GetPid()); - - // wxProcess::Kill doesn't trigger a call to OnTerminate() normally... - // but we still need to call it! - OnTerminate(0, -1); - } - - bool Crashed() const - { return m_crashed; } - - int GetExitCode() const - { return m_exitCode; } - -private: - bool m_crashed; - int m_exitCode; -}; - -class MonitorData -{ -public: - MonitorData(const wxString& cmd) : program(cmd) {} - - wxString program; - MonitoredProcess process; -}; - -// ---------------------------------------------------------------------------- -// the real main -// ---------------------------------------------------------------------------- - -bool TestExec(const wxVector& programs, long timeout) -{ - size_t i; - wxVector data; - - // run all programs specified as command line parameters - wxArrayLong procID; - for (i=0; iprocess); - if (pid == 0) - { - wxLogError("could not run the program '%s'", programs[i].GetFullPath()); - } - else - { - wxLogMessage("started program '%s' (pid %d)...", - programs[i].GetFullPath(), pid); - wxASSERT(dt->process.GetPid() == pid); - - data.push_back(dt); - } - } - - // sleep some moments - wxSleep(timeout); - - // check if all processes are still running - bool allok = true; - for (i=0; iprocess; - const wxString& prog = data[i]->program; - - if (wxProcess::Exists(proc.GetPid())) - proc.Kill(); - else - { - // this typically never happens, at least when running wx-programs - // built with debug builds of wx (see MonitoredProcess::OnTerminate; - // even if an asserts fail the app doesn't automatically close!): - - wxLogMessage("program '%s' (pid %d) is NOT running anymore...", - prog, proc.GetPid()); - allok = false; - } - - if (data[i]->process.Crashed()) - { - allok = false; - wxLogMessage("program '%s' (pid %d) crashed...", - prog, proc.GetPid()); - } - else - wxLogMessage("program '%s' (pid %d) ended with exit code %d...", - prog, proc.GetPid(), proc.GetExitCode()); - } - - return allok; -} - -// ---------------------------------------------------------------------------- -// main -// ---------------------------------------------------------------------------- - -int main(int argc, char **argv) -{ - wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, "execmon"); - - wxInitializer initializer; - if ( !initializer ) - { - fprintf(stderr, "Failed to initialize the wxWidgets library, aborting."); - return -1; - } - - static const wxCmdLineEntryDesc cmdLineDesc[] = - { - { wxCMD_LINE_SWITCH, "h", "help", - "show this help message", - wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP }, - { wxCMD_LINE_OPTION, "t", "timeout", - "kills all processes still alive after 'num' seconds", - wxCMD_LINE_VAL_NUMBER, 0 }, - { wxCMD_LINE_PARAM, "", "", - "program-to-run", - wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE }, - - { wxCMD_LINE_NONE } - }; - - wxLog::DisableTimestamp(); - - wxCmdLineParser parser(cmdLineDesc, argc, argv); - switch ( parser.Parse() ) - { - case -1: - // help was shown - break; - - case 0: - { - // check arguments - wxVector programs; - for (unsigned int i=0; i> $(subst \,/,$@).rsp.tmp)) - @move /y $@.rsp.tmp $@.rsp >nul - $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme - @-del $@.rsp -endif - -$(OBJS)\execmon_execmon.o: ./execmon.cpp - $(CXX) -c -o $@ $(EXECMON_CXXFLAGS) $(CPPDEPS) $< - -.PHONY: all clean - - -SHELL := $(COMSPEC) - -# Dependencies tracking: --include $(OBJS)/*.d diff --git a/utils/execmon/makefile.vc b/utils/execmon/makefile.vc deleted file mode 100644 index 156584aac6..0000000000 --- a/utils/execmon/makefile.vc +++ /dev/null @@ -1,324 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.13 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include <../../build/msw/config.vc> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 33 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG) -EXECMON_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\execmon.pdb $(____DEBUGRUNTIME_3_p) \ - $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) $(__TARGET_CPU_COMPFLAG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - /I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \ - $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) -EXECMON_OBJECTS = \ - $(OBJS)\execmon_execmon.obj - -### Conditionally set variables: ### - -!if "$(TARGET_CPU)" == "AMD64" -ARCH_SUFFIX = _x64 -!endif -!if "$(TARGET_CPU)" == "ARM64" -ARCH_SUFFIX = _arm64 -!endif -!if "$(TARGET_CPU)" == "IA64" -ARCH_SUFFIX = _ia64 -!endif -!if "$(TARGET_CPU)" == "X64" -ARCH_SUFFIX = _x64 -!endif -!if "$(TARGET_CPU)" == "" && "$(VISUALSTUDIOPLATFORM)" == "X64" -ARCH_SUFFIX = _x64 -!endif -!if "$(TARGET_CPU)" == "" && "$(VISUALSTUDIOPLATFORM)" == "x64" -ARCH_SUFFIX = _x64 -!endif -!if "$(TARGET_CPU)" == "amd64" -ARCH_SUFFIX = _x64 -!endif -!if "$(TARGET_CPU)" == "arm64" -ARCH_SUFFIX = _arm64 -!endif -!if "$(TARGET_CPU)" == "ia64" -ARCH_SUFFIX = _ia64 -!endif -!if "$(TARGET_CPU)" == "x64" -ARCH_SUFFIX = _x64 -!endif -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw$(TOOLKIT_VERSION) -!endif -!if "$(OFFICIAL_BUILD)" == "1" -COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:X64 -!endif -!if "$(TARGET_CPU)" == "ARM64" -LINK_TARGET_CPU = /MACHINE:ARM64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "X64" -LINK_TARGET_CPU = /MACHINE:X64 -!endif -!if "$(TARGET_CPU)" == "" && "$(VISUALSTUDIOPLATFORM)" == "X64" -LINK_TARGET_CPU = /MACHINE:X64 -!endif -!if "$(TARGET_CPU)" == "" && "$(VISUALSTUDIOPLATFORM)" == "x64" -LINK_TARGET_CPU = /MACHINE:X64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:X64 -!endif -!if "$(TARGET_CPU)" == "arm64" -LINK_TARGET_CPU = /MACHINE:ARM64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "x64" -LINK_TARGET_CPU = /MACHINE:X64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(USE_XRC)" == "1" -__execmon___depname = $(OBJS)\execmon.exe -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_2 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_2 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_3_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_3_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_3_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_3_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_4 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_4 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_4 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_4 = d -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_5 = -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_5 = /opt:ref /opt:icf -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_5 = /opt:ref /opt:icf -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_5 = -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_6 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_6 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_9 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_9 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_10 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_11 = /GR- -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_11 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_12 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_12 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(TARGET_CPU)" == "" -__TARGET_CPU_COMPFLAG_p = /DTARGET_CPU_COMPFLAG=0 -!endif -!if "$(TARGET_CPU)" == "" && "$(VISUALSTUDIOPLATFORM)" == "x64" -__TARGET_CPU_COMPFLAG_p = -!endif -!if "$(TARGET_CPU)" == "" && "$(VISUALSTUDIOPLATFORM)" == "X64" -__TARGET_CPU_COMPFLAG_p = -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__NDEBUG_DEFINE_p = /DNDEBUG -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__NDEBUG_DEFINE_p = /DNDEBUG -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_CAIRO)" == "1" -____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p) -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(USE_CAIRO)" == "1" -__CAIRO_LIB_p = cairo.lib -!endif -!if "$(USE_CAIRO)" == "1" -____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(__execmon___depname) - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe - -if exist $(OBJS)\execmon.ilk del $(OBJS)\execmon.ilk - -if exist $(OBJS)\execmon.pdb del $(OBJS)\execmon.pdb - -!if "$(USE_XRC)" == "1" -$(OBJS)\execmon.exe: $(EXECMON_OBJECTS) - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\execmon.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< - $(EXECMON_OBJECTS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib -<< -!endif - -$(OBJS)\execmon_execmon.obj: .\execmon.cpp - $(CXX) /c /nologo /TP /Fo$@ $(EXECMON_CXXFLAGS) .\execmon.cpp - diff --git a/utils/utils.bkl b/utils/utils.bkl index 0318209a85..2661528a19 100644 --- a/utils/utils.bkl +++ b/utils/utils.bkl @@ -7,16 +7,6 @@ all - - emulator/src - no - - - - execmon - yes - - helpview/src no