diff options
-rw-r--r-- | tools/mhmake/src/curdir.cpp | 2 | ||||
-rw-r--r-- | tools/mhmake/src/rule.cpp | 3 | ||||
-rw-r--r-- | tools/mhmake/src/util.cpp | 3 | ||||
-rw-r--r-- | tools/mhmake/src/util.h | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/tools/mhmake/src/curdir.cpp b/tools/mhmake/src/curdir.cpp index d2b43ab52..252c0c81d 100644 --- a/tools/mhmake/src/curdir.cpp +++ b/tools/mhmake/src/curdir.cpp @@ -27,6 +27,8 @@ fileinfos g_FileInfos; // declare here since it is important that it is constructed before m_pcurrentdir
curdir::initcurdir curdir::m_pCurrentDir;
+makecommand g_MakeCommand; // Order is important since sm_Statics is using g_MakeCommand
+const string g_QuoteString("\""); // Order is important since sm_Statics is using g_QuoteString
loadedmakefile::loadedmakefile_statics loadedmakefile::sm_Statics; // Declare this here because this constructor is using g_FileInfos and m_pCurrentDir
LOADEDMAKEFILES g_LoadedMakefiles; // Declare it here otherwize problems in the destructor (still using items from g_FileInfos)
diff --git a/tools/mhmake/src/rule.cpp b/tools/mhmake/src/rule.cpp index b3f682e95..f529c1760 100644 --- a/tools/mhmake/src/rule.cpp +++ b/tools/mhmake/src/rule.cpp @@ -30,9 +30,6 @@ refptr<rule> NullRule; set<rule*> IMPLICITRULE::m_ImplicitRuleRecurseDetStack;
vector<implicitrule_t> IMPLICITRULE::m_ImplicitRules;
-makecommand g_MakeCommand; // Order is important since sm_Statics is using g_MakeCommand
-const string g_QuoteString("\""); // Order is important since sm_Statics is using g_QuoteString
-
///////////////////////////////////////////////////////////////////////////////
static bool FindDep(fileinfo *pTarget, implicitruledep_t *pImplicitRule,refptr<rule> &Rule)
{
diff --git a/tools/mhmake/src/util.cpp b/tools/mhmake/src/util.cpp index e1fcf0d27..ae8610a1b 100644 --- a/tools/mhmake/src/util.cpp +++ b/tools/mhmake/src/util.cpp @@ -338,6 +338,9 @@ refptr<loadedmakefile> LOADEDMAKEFILES::find(const loadedmakefile &ToSearch) ///////////////////////////////////////////////////////////////////////////////
bool loadedmakefile::loadedmakefile_statics::GetSvnRevision(void)
{
+ if (getenv("nosvn"))
+ return true;
+
// Get the revision of the working copy
// We do it with the svn info command (do it without path arguments, only current directory, to avoid problems with path names and junctions/links
diff --git a/tools/mhmake/src/util.h b/tools/mhmake/src/util.h index 01e766520..3c6f0e146 100644 --- a/tools/mhmake/src/util.h +++ b/tools/mhmake/src/util.h @@ -50,7 +50,7 @@ #define PLATFORM "linux"
#endif
-#define MHMAKEVER "3.0.25"
+#define MHMAKEVER "3.0.27"
class makecommand
{
|