Changeset 3030

Timestamp:

25/10/2011 23:03:07 (7 months ago)

Author:

chris

Message:

Avoid recompiling everything on MSVC when BoxVersion?.h changes.

Location:

box/trunk/lib

Files:

• common/BannerText.h (modified) (1 diff)
• common/BoxPlatform.h (modified) (1 diff)
• common/MainHelper.h (modified) (2 diffs)
• common/Utils.cpp (modified) (1 diff)
• server/Daemon.cpp (modified) (1 diff)

box/trunk/lib/common/BannerText.h

@@ -11 +11 @@
 #define BANNERTEXT__H
 
+#ifdef NEED_BOX_VERSION_H
+#       include "BoxVersion.h"
+#endif
+
 #define BANNER_TEXT(UtilityName) \
         "Box " UtilityName " v" BOX_VERSION ", (c) Ben Summers and " \
-        "contributors 2003-2010"
+        "contributors 2003-2011"
 
 #endif // BANNERTEXT__H

box/trunk/lib/common/BoxPlatform.h

@@ -24 +24 @@
 #ifdef _MSC_VER
 #include "BoxConfig-MSVC.h"
-#include "BoxVersion.h"
+#define NEED_BOX_VERSION_H
 #else
 #include "BoxConfig.h"

box/trunk/lib/common/MainHelper.h

@@ -13 +13 @@
 #include <stdio.h>
 
+#ifdef NEED_BOX_VERSION_H
+#       include "BoxVersion.h"
+#endif
+
 #include "BoxException.h"
 #include "Logging.h"
@@ -22 +26 @@
         MEMLEAKFINDER_START                                                                             \
         try {
+
 #define MAINHELPER_END                                                                                                                          \
         } catch(std::exception &e) {                                                                                                    \

box/trunk/lib/common/Utils.cpp

@@ -29 +29 @@
 #endif
 
-#include "Utils.h"
+#ifdef NEED_BOX_VERSION_H
+#       include "BoxVersion.h"
+#endif
+
 #include "CommonException.h"
 #include "Logging.h"
+#include "Utils.h"
 
 #include "MemLeakFindOn.h"

box/trunk/lib/server/Daemon.cpp

@@ -33 +33 @@
 #include <iostream>
 
+#ifdef NEED_BOX_VERSION_H
+#       include "BoxVersion.h"
+#endif
+
+#include "Configuration.h"
 #include "Daemon.h"
-#include "Configuration.h"
+#include "FileModificationTime.h"
+#include "Guards.h"
+#include "Logging.h"
 #include "ServerException.h"
-#include "Guards.h"
 #include "UnixUser.h"
-#include "FileModificationTime.h"
-#include "Logging.h"
 #include "Utils.h"