FIX #64 - Get rid of the SVN $HeadURL keyword expansions

Remove all $HeadURL entries in the code.
Use BUILD_TAG in place of any $HeadURL: output to logs.
Update include paths and include build-info.h as needed.
Clean up some unnecessary blank lines.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

common/commonext/thorport.cpp

@@ -36,8 +36,6 @@
 #include "portlist.h"
 #include "thorport.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/thorlcr/shared/thorport.cpp $ $Id: thorport.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 #define WATCHDOGINC        1
 
 static CriticalSection *portallocsection;

common/deftype/deftype.cpp

@@ -43,8 +43,6 @@
  #define new new(_NORMAL_BLOCK, __FILE__, __LINE__)
 #endif
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/common/deftype/deftype.cpp $ $Id: deftype.cpp 65583 2011-06-20 13:29:24Z ghalliday $");
-
 //#define DATA_STRING_COMPATIBLE
 #define HASHFIELD(p) hashcode = hashc((unsigned char *) &p, sizeof(p), hashcode)
 

common/deftype/defvalue.cpp

@@ -35,8 +35,6 @@
  #define new new(_NORMAL_BLOCK, __FILE__, __LINE__)
 #endif
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/common/deftype/defvalue.cpp $ $Id: defvalue.cpp 65491 2011-06-16 07:42:49Z ghalliday $");
-
 BoolValue *BoolValue::trueconst;
 BoolValue *BoolValue::falseconst;
 static _ATOM asciiAtom;

common/environment/dalienv.cpp

@@ -32,10 +32,6 @@
 #include "dalienv.hpp"
 #include "rmtfile.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/common/environment/dalienv.cpp $ $Id: dalienv.cpp 62376 2011-02-04 21:59:58Z sort $");
-
-
-
 struct CIpInstance
 {
     unsigned hash;

common/remote/rmtfile.cpp

@@ -30,8 +30,6 @@
 #include "rmtfile.hpp"
 #include "remoteerr.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/common/remote/rmtfile.cpp $ $Id: rmtfile.cpp 64457 2011-05-09 17:28:42Z yma $");
-
 //----------------------------------------------------------------------------
 
 //#define TEST_DAFILESRV_FOR_UNIX_PATHS     // probably not needed

common/remote/rmtpass.cpp

@@ -30,8 +30,6 @@
 #include "rmtfile.hpp"
 #include "rmtpass.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/common/remote/rmtpass.cpp $ $Id: rmtpass.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 void CachedPasswordProvider::addPasswordForFilename(const char * filename)
 {
     RemoteFilename remote;

common/remote/rmtsmtp.cpp

@@ -25,10 +25,6 @@
 
 #include "rmtsmtp.hpp"
 
-
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/common/remote/rmtsmtp.cpp $ $Id: rmtfile.cpp 59036 2010-08-31 17:54:39Z nhicks $");
-
-
 class CSMTPValidator
 {
 public:

common/remote/rmtspawn.cpp

@@ -30,8 +30,6 @@
 
 
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/common/remote/rmtspawn.cpp $ $Id: rmtspawn.cpp 64028 2011-04-14 14:28:10Z nhicks $");
-
 LogMsgCategory MCdetailDebugInfo(MCdebugInfo(1000));
 
 /*

common/remote/rmtssh.cpp

@@ -33,9 +33,6 @@
 #include <wordexp.h>
 #endif
 
-
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/common/remote/rmtssh.cpp $ $Id: rmtssh.cpp 64028 2011-04-14 14:28:10Z nhicks $");
-
 //----------------------------------------------------------------------------
 
 //#define PLINK_USE_CMD

common/remote/sockfile.cpp

@@ -38,8 +38,6 @@
 
 #include "remoteerr.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/common/remote/sockfile.cpp $ $Id: sockfile.cpp 62595 2011-02-17 14:30:45Z rchapman $");
-
 #define SOCKET_CACHE_MAX 500
 
 #define MAX_THREADS             100
@@ -163,14 +161,12 @@ struct dummyReadWrite
 // backward compatible modes
 typedef enum { compatIFSHnone, compatIFSHread, compatIFSHwrite, compatIFSHexec, compatIFSHall} compatIFSHmode;
 
-
 static const char *VERSTRING= "DS V1.7e - 6 "       // dont forget FILESRV_VERSION in header
 #ifdef _WIN32
-"Windows "
+"Windows ";
 #else
-"Linux "
+"Linux ";
 #endif
-"$HeadURL: https://svn.br.seisint.com/ecl/trunk/common/remote/sockfile.cpp $ $Id: sockfile.cpp 62595 2011-02-17 14:30:45Z rchapman $";
 
 typedef unsigned char RemoteFileCommandType;
 typedef int RemoteFileIOHandle;

common/thorhelper/csvsplitter.cpp

@@ -28,11 +28,6 @@
 #include "csvsplitter.hpp"
 #include "eclrtl.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/common/thorhelper/csvsplitter.cpp $ $Id: csvsplitter.cpp 62567 2011-02-16 16:01:41Z rchapman $");
-
-//=====================================================================================================
-
-
 CSVSplitter::CSVSplitter()
 {
     lengths = NULL;

common/thorhelper/thorstep.cpp

@@ -28,8 +28,6 @@
 #define CHECK_CONSISTENCY
 #endif
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/common/thorhelper/thorstep.cpp $ $Id: thorstep.cpp 65884 2011-06-29 11:25:52Z ghalliday $");
-
 const static SmartStepExtra knownLowestFrequencyTermStepExtra(SSEFreadAhead, NULL);
 const static SmartStepExtra unknownFrequencyTermStepExtra(SSEFreturnMismatches, NULL);
 const static SmartStepExtra nonSeekStepExtra(SSEFreturnUnbufferedMatches, NULL);                    // if doing next() instead of nextGE()

common/thorhelper/thorstep2.cpp

@@ -23,8 +23,6 @@
 #include "thorcommon.hpp"
 #include "thorstep2.ipp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/common/thorhelper/thorstep2.cpp $ $Id: thorstep2.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 //------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 const static SmartStepExtra knownLowestFrequencyTermStepExtra(SSEFreadAhead, NULL);

common/thorhelper/thorxmlread.cpp

@@ -24,7 +24,6 @@
 #include "jfile.hpp"
 #include "jlog.hpp"
 
-
 #include "csvsplitter.hpp"
 #include "thorcerror.hpp"
 #include "thorxmlread.hpp"
@@ -33,11 +32,8 @@
 
 #include "jptree.ipp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/common/thorhelper/thorxmlread.cpp $ $Id: thorxmlread.cpp 65310 2011-06-10 08:37:45Z ghalliday $");
-
 #define XMLTAG_CONTENT "<>"
 
-
 //=====================================================================================================
 XmlColumnIterator::XmlColumnIterator(IPropertyTreeIterator * _iter) : iter(_iter)
 {

common/workunit/wujobq.cpp

@@ -26,8 +26,6 @@
 #include "dautils.hpp"
 #include "portlist.h"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/common/workunit/wujobq.cpp $ $Id: wujobq.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 #include "dacoven.hpp"
 #include "daclient.hpp"
 #include "dasds.hpp"

dali/base/daclient.cpp

@@ -23,8 +23,6 @@
 #include "jptree.hpp"
 #include "jtime.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/base/daclient.cpp $ $Id: daclient.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 #include "mpcomm.hpp"
 #include "mplog.hpp"
 #include "dasess.hpp"

dali/base/dacoven.cpp

@@ -27,13 +27,8 @@
 #include "mputil.hpp"
 #include "jmisc.hpp"
 #include "daclient.hpp"
-
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/base/dacoven.cpp $ $Id: dacoven.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 #include "daserver.hpp"
-
 #include "dacoven.hpp"
-
 #include "mpcomm.hpp"
 
 extern void closedownDFS();

dali/base/dacsds.cpp

@@ -22,11 +22,7 @@
 #include "jlib.hpp"
 #include "javahash.hpp"
 #include "javahash.tpp"
-
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/base/dacsds.cpp $ $Id: dacsds.cpp 62962 2011-03-04 11:10:12Z jsmith $");
-
 #include "jptree.ipp"
-
 #include "mpbuff.hpp"
 #include "mpcomm.hpp"
 #include "mputil.hpp"
@@ -36,7 +32,6 @@ static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/ba
 #include "daclient.hpp"
 
 #include "dasds.ipp" // common header for client/server sds
-
 #include "dacsds.ipp"
 
 #define CLIENT_THROTTLE_LIMIT 10

dali/base/dadfs.cpp

@@ -37,12 +37,8 @@
 #include "danqs.hpp"
 #include "mputil.hpp"
 #include "rmtfile.hpp"
-
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/base/dadfs.cpp $ $Id: dadfs.cpp 63465 2011-03-25 10:43:19Z nhicks $");
-
 #include "dadfs.hpp"
 
-
 #ifdef _DEBUG
 //#define EXTRA_LOGGING
 //#define TRACE_LOCKS

dali/base/dadiags.cpp

@@ -19,9 +19,6 @@
 #define da_decl __declspec(dllexport)
 #include "platform.h"
 #include "jlib.hpp"
-
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/base/dadiags.cpp $ $Id: dadiags.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 #include "dacoven.hpp"
 #include "daclient.hpp"
 #include "mpbuff.hpp"
@@ -31,7 +28,6 @@ static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/ba
 #include "daserver.hpp"
 #include "dasds.hpp"
 #include "dasubs.ipp"
-
 #include "dadiags.hpp"
 
 #ifdef _MSC_VER

dali/base/danqs.cpp

@@ -20,9 +20,6 @@
 #include "platform.h"
 #include "jlib.hpp"
 #include "jsuperhash.hpp"
-
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/base/danqs.cpp $ $Id: danqs.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 #include "dacoven.hpp"
 #include "daclient.hpp"
 #include "dasds.hpp"
@@ -31,7 +28,6 @@ static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/ba
 #include "mputil.hpp"
 #include "mputil.hpp"
 #include "daserver.hpp"
-
 #include "danqs.hpp"
 
 #ifdef _MSC_VER

dali/base/dasds.cpp

@@ -30,8 +30,6 @@
 #include "jptree.ipp"
 #include "jqueue.tpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/base/dasds.cpp $ $Id: dasds.cpp 63291 2011-03-18 16:21:00Z jsmith $");
-
 #define DEBUG_DIR "debug"
 #define DEFAULT_KEEP_LASTN_STORES 1
 #define MAXDELAYS 5

dali/base/dasess.cpp

@@ -23,10 +23,6 @@
 #include "jsuperhash.hpp"
 #include "jmisc.hpp"
 #include "jencrypt.hpp"
-
-
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/base/dasess.cpp $ $Id: dasess.cpp 64657 2011-05-18 11:46:07Z jsmith $");
-
 #include "dacoven.hpp"
 #include "mpbuff.hpp"
 #include "mpcomm.hpp"

dali/base/dasubs.cpp

@@ -28,8 +28,6 @@
 //#define SUPRESS_REMOVE_ABORTED
 #define TRACE_QWAITING
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/base/dasubs.cpp $ $Id: dasubs.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 #include "dacoven.hpp"
 #include "mpbuff.hpp"
 #include "mpcomm.hpp"

dali/dafilesrv/dafilesrv.cpp

@@ -26,9 +26,6 @@
 #include "jlog.hpp"
 #include "jmisc.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/dafilesrv/dafilesrv.cpp $ $Id: dafilesrv.cpp 62376 2011-02-04 21:59:58Z sort $");
-
-
 #ifdef _MSC_VER
 #pragma warning (disable : 4355)
 #endif

dali/dfu/dfuutil.cpp

@@ -31,13 +31,9 @@
 #include "dfuerror.hpp"
 #include "dautils.hpp"
 #include "dalienv.hpp"
-
 #include "rmtfile.hpp"
-
 #include "dfuutil.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/dfu/dfuutil.cpp $ $Id: dfuutil.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 // savemap
 // superkey functions
 // (logical) directory functions

dali/dfuXRefLib/dfurdir.cpp

@@ -20,10 +20,6 @@
 #include "mpbase.hpp"
 #include "rmtfile.hpp"
 
-
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/dfuXRefLib/dfurdir.cpp $ $Id: dfurdir.cpp 62376 2011-02-04 21:59:58Z sort $");
-
-
 #define REMOVE_DUPLICATE_DIRS
 //#define LOGERRORS
 

dali/dfuXRefLib/dfuxreflib.cpp

@@ -23,9 +23,6 @@
 #include "jptree.hpp"
 #include "mpbase.hpp"
 #include "mpcomm.hpp"
-
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/dfuXRefLib/dfuxreflib.cpp $ $Id: dfuxreflib.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 #include "daclient.hpp"
 #include "dadiags.hpp"
 #include "danqs.hpp"

dali/dfuXRefLib/dfuxrenv.cpp

@@ -24,9 +24,6 @@
 #include "mpbase.hpp"
 #include "mpcomm.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/dfuXRefLib/dfuxrenv.cpp $ $Id: dfuxrenv.cpp 62376 2011-02-04 21:59:58Z sort $");
-
-
 #include "daclient.hpp"
 #include "dadiags.hpp"
 #include "danqs.hpp"

dali/dfuplus/CMakeLists.txt

@@ -51,6 +51,8 @@ include_directories (
          ./../../esp/bindings 
          ./../../common/workunit 
          ./../../common/remote 
+         ${CMAKE_BINARY_DIR}
+         ${CMAKE_BINARY_DIR}/oss
     )
 
 set_source_files_properties (../../common/remote/rmtfile.cpp PROPERTIES COMPILE_FLAGS -DDAFILESRV_LOCAL)

dali/dfuplus/main.cpp

@@ -17,6 +17,7 @@
 ############################################################################## */
 
 #pragma warning (disable : 4786)
+#include <build-config.h>
 #include "daftcfg.hpp"
 #include "dfuerror.hpp"
 #include "dfuplus.hpp"
@@ -24,14 +25,9 @@
 #include "termios.h"
 #endif
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/dfuplus/main.cpp $ $Id: main.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 void printVersion()
 {
-    StringBuffer buildVersion;
-    CBuildVersion::toString(buildVersion);
-    if (buildVersion.length() == 0) buildVersion.append("\n");
-    printf("DFU Version: %d %s", DAFT_VERSION, buildVersion.str());
+    printf("DFU Version: %d %s\n", DAFT_VERSION, BUILD_TAG);
 }
 
 void handleSyntax()

dali/dfuxref/dfuxrefmain.cpp

@@ -24,8 +24,6 @@
 #include "dalienv.hpp"
 #include "daclient.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/dfuxref/dfuxrefmain.cpp $ $Id: dfuxrefmain.cpp 62561 2011-02-16 13:59:53Z nhicks $");
-
 static bool AddCompleteOrphans = false;
 static bool DeleteEmptyFiles = false;
 static bool fixSizes = false;

dali/ft/daft.cpp

@@ -37,9 +37,6 @@
 #include "daft.ipp"
 #include "daftmc.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/ft/daft.cpp $ $Id: daft.cpp 62376 2011-02-04 21:59:58Z sort $");
-
-
 CDistributedFileSystem::CDistributedFileSystem()
 {
 }

dali/ft/daftdir.cpp

@@ -32,8 +32,6 @@
 #include <glob.h>
 #endif
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/ft/daftdir.cpp $ $Id: daftdir.cpp 64047 2011-04-15 09:01:54Z nhicks $");
-
 #ifdef _WIN32
 #define DEFAULT_DRIVE       "c:"                    // What about solaris machines.
 #else

dali/ft/daftformat.cpp

@@ -37,8 +37,6 @@
 #include "daftformat.ipp"
 #include "junicode.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/ft/daftformat.cpp $ $Id: daftformat.cpp 62850 2011-03-01 18:12:54Z nhicks $");
-
 //----------------------------------------------------------------------------
 
 /*

dali/ft/daftmc.cpp

@@ -20,8 +20,6 @@
 
 #include "daftmc.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/ft/daftmc.cpp $ $Id: daftmc.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 const LogMsgCategory MCdebugInfoDetail(MCdebugInfo(1000));
 const LogMsgCategory MCdebugProgressDetail(MCdebugProgress(1000));
 

dali/ft/daftprogress.cpp

@@ -44,8 +44,6 @@
 #include "jlog.hpp"
 #include "daftprogress.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/ft/daftprogress.cpp $ $Id: daftprogress.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 DaftProgress::DaftProgress() 
 { 
     startTime = get_cycles_now(); 

dali/ft/daftsize.cpp

@@ -39,8 +39,6 @@
 #include "daftsize.hpp"
 #include "daftmc.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/ft/daftsize.cpp $ $Id: daftsize.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 bool processSizesCommand(ISocket *, MemoryBuffer & cmd, MemoryBuffer & result)
 {
     LOG(MCdebugProgress, unknownJob, "Start gather remote file sizes");

dali/ft/filecopy.cpp

@@ -43,15 +43,11 @@
 #include "jlog.hpp"
 #include "dalienv.hpp"
 
-
-
 #define DEFAULT_MAX_CONNECTIONS 25
 #define PARTITION_RECOVERY_LIMIT 1000
 #define EXPECTED_RESPONSE_TIME          (60 * 1000)
 #define RESPONSE_TIME_TIMEOUT           (60 * 60 * 1000)
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/ft/filecopy.cpp $ $Id: filecopy.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 //#define CLEANUP_RECOVERY
 
 //Use hash defines for properties so I can't mis-spell them....

dali/ft/ftbase.cpp

@@ -17,12 +17,9 @@
 ############################################################################## */
 
 #include "jliball.hpp"
-
 #include "platform.h"
-
 #include "jlib.hpp"
 #include "jio.hpp"
-
 #include "jmutex.hpp"
 #include "jfile.hpp"
 #include "jsocket.hpp"
@@ -38,8 +35,6 @@
 #include "dalienv.hpp"
 #include "rmtspawn.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/ft/ftbase.cpp $ $Id: ftbase.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 #define DEFAULT_MAX_CSV_SIZE     8096
 
 //Use hash defines for properties so I can't mis-spell them....

dali/ft/ftslave.cpp

@@ -17,12 +17,9 @@
 ############################################################################## */
 
 #include "jliball.hpp"
-
 #include "platform.h"
-
 #include "jlib.hpp"
 #include "jio.hpp"
-
 #include "jmutex.hpp"
 #include "jfile.hpp"
 #include "jsocket.hpp"
@@ -39,8 +36,6 @@
 #include "daftcfg.hpp"
 #include "mptag.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/ft/ftslave.cpp $ $Id: ftslave.cpp 64048 2011-04-15 12:44:57Z nhicks $");
-
 bool processPullCommand(ISocket * masterSocket, MemoryBuffer & msg)
 {
     srand((int)get_cycles_now());

dali/ft/fttransform.cpp

@@ -17,12 +17,9 @@
 ############################################################################## */
 
 #include "jliball.hpp"
-
 #include "platform.h"
-
 #include "jlib.hpp"
 #include "jio.hpp"
-
 #include "jmutex.hpp"
 #include "jfile.hpp"
 #include "jsocket.hpp"
@@ -31,13 +28,10 @@
 #include "dadfs.hpp"
 #include "daftcfg.hpp"
 #include "daftmc.hpp"
-
 #include "rmtspawn.hpp"
 #include "fttransform.ipp"
 #include "ftbase.ipp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/ft/fttransform.cpp $ $Id: fttransform.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 #define OPTIMIZE_COMMON_TRANSFORMS
 
 // A couple of options useful for debugging

dali/sasha/CMakeLists.txt

@@ -56,6 +56,8 @@ include_directories (
          ${HPCC_SOURCE_DIR}/system/jlib 
          ${HPCC_SOURCE_DIR}/common/remote 
          ${HPCC_SOURCE_DIR}/plugins/workunitservices 
+         ${CMAKE_BINARY_DIR}
+         ${CMAKE_BINARY_DIR}/oss
     )
 
 ADD_DEFINITIONS( -D_CONSOLE )

dali/sasha/packetstore.cpp

@@ -14,9 +14,6 @@
   get changed
 */
 
-
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/sasha/packetstore.cpp $ $Id: packetstore.cpp 36518 2007-03-09 00:15:14Z pkapp $");
-
 #include "mpbuff.hpp"
 #include "mpcomm.hpp"
 #include "mputil.hpp"

dali/sasha/saserver.cpp

@@ -1,3 +1,22 @@
+/*##############################################################################
+
+    Copyright (C) 2011 HPCC Systems.
+
+    All rights reserved. This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+############################################################################## */
+
+#include "build-config.h"
 #include "platform.h"
 #include "thirdparty.h"
 #include "portlist.h"
@@ -311,7 +330,7 @@ int main(int argc, const char* argv[])
         aliaslogname.append(".log");
         fileMsgHandler = getRollingFileLogMsgHandler(logname.str(), ".log", MSGFIELD_STANDARD, false, true, NULL, aliaslogname.str());
         queryLogMsgManager()->addMonitorOwn(fileMsgHandler, getCategoryLogMsgFilter(MSGAUD_all, MSGCLS_all, TopDetail));
-        CBuildVersion::log();
+        DBGLOG("Build %s", BUILD_TAG);
     }
 
     bool enableSNMP = false;

dali/sasha/saxref.cpp

@@ -24,8 +24,6 @@
 #include "sacoalescer.hpp"
 #include "sacmd.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/sasha/saxref.cpp $ $Id: saxref.cpp 61615 2011-01-07 15:01:55Z jsmith $");
-
 //#define _SINGLETHREAD
 #ifdef _SINGLETHREAD
 #define NUMTHREADS 1

dali/security/dacaplib.cpp

@@ -27,8 +27,6 @@
 #include "jarray.hpp"
 #include "jfile.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/security/dacaplib.cpp $ $Id: dacaplib.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 #include "dacaplib.hpp"
 #include "dasess.hpp"
 

dali/server/CMakeLists.txt

@@ -40,6 +40,8 @@ include_directories (
          ./../../system/security/shared 
          ./../../system/security/LdapSecurity 
          ./../../system/jlib 
+         ${CMAKE_BINARY_DIR}
+         ${CMAKE_BINARY_DIR}/oss
     )
 
 ADD_DEFINITIONS( -D_CONSOLE )

dali/server/daldap.cpp

@@ -22,8 +22,6 @@
 #include "jencrypt.hpp"
 #include "thirdparty.h"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/dali/server/daldap.cpp $ $Id: daldap.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 #include "dasds.hpp"
 #include "daldap.hpp"
 

dali/server/daserver.cpp

@@ -16,6 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ############################################################################## */
 
+#include "build-config.h"
 #include "platform.h"
 #include "thirdparty.h"
 #include "jlib.hpp"
@@ -193,8 +194,7 @@ int main(int argc, char* argv[])
         fileMsgHandler = getRollingFileLogMsgHandler(logName.str(), ".log", MSGFIELD_STANDARD, false, true, NULL, aliasLogName.str());
         queryLogMsgManager()->addMonitorOwn(fileMsgHandler, getCategoryLogMsgFilter(MSGAUD_all, MSGCLS_all, TopDetail));
 
-        CBuildVersion::log();
-
+        DBGLOG("Build %s", BUILD_TAG);
 
         if (serverConfig)
         {

ecl/eclagent/CMakeLists.txt

@@ -16,33 +16,35 @@
 ################################################################################
 
 
-# Component: eclagent 
+# Component: eclagent
 #####################################################
 # Description:
 # ------------
 #    Cmake Input File for eclagent
 #####################################################
 
-project( eclagent ) 
+project( eclagent )
 
-set ( SRCS 
-      eclagentmain.cpp 
+set ( SRCS
+      eclagentmain.cpp
     )
 
-include_directories ( 
-      .
-      ./../hthor 
-      ./../../system/jlib
-      ./../../system/include
-      ./../../rtl/include
+include_directories (
+         .
+         ${HPCC_SOURCE_DIR}/ecl/hthor
+         ${HPCC_SOURCE_DIR}/system/jlib
+         ${HPCC_SOURCE_DIR}/system/include
+         ${HPCC_SOURCE_DIR}/rtl/include
+         ${CMAKE_BINARY_DIR}
+         ${CMAKE_BINARY_DIR}/oss
     )
 
 ADD_DEFINITIONS( -DNO_SYBASE -D_CONSOLE )
 
 add_executable ( eclagent ${SRCS} )
 install ( TARGETS eclagent DESTINATION ${OSSDIR}/bin )
-target_link_libraries ( eclagent 
-      hthor            
+target_link_libraries ( eclagent
+      hthor           
       ${CPPUNIT_LIBRARIES}
     )
 

ecl/eclagent/eclagent.cpp

@@ -15,6 +15,8 @@
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ############################################################################## */
+
+#include "build-config.h"
 #include "jlib.hpp"
 #include "jmisc.hpp"
 #include "jdebug.hpp"
@@ -58,9 +60,6 @@
 
 #define MONITOR_ECLAGENT_STATUS     
  
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/eclagent/eclagent.cpp $ $Id: eclagent.cpp 66010 2011-07-06 13:36:28Z wwhitehead $");
-
-static const char buildTag[] = "$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/eclagent/eclagent.cpp $";
 static const char XMLHEADER[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
 
 //#define ROOT_DRIVE      "c:"
@@ -1842,7 +1841,7 @@ void EclAgent::doProcess()
             LOG(MCrunlock, unknownJob, "Obtained workunit lock");
             if (w->hasDebugValue("traceLevel"))
                 traceLevel = w->getDebugValueInt("traceLevel", 10);
-            w->setTracingValue("EclAgentBuild", buildTag);  
+            w->setTracingValue("EclAgentBuild", BUILD_TAG);  
             w->setDebugValue("EclAgentLog", logname.str(), true);
             if (checkVersion && ((w->getCodeVersion() > ACTIVITY_INTERFACE_VERSION) || (w->getCodeVersion() < MIN_ACTIVITY_INTERFACE_VERSION)))
                 failv(0, "Workunit was compiled for eclagent interface version %d, this eclagent requires version %d..%d", w->getCodeVersion(), MIN_ACTIVITY_INTERFACE_VERSION, ACTIVITY_INTERFACE_VERSION);
@@ -3076,11 +3075,11 @@ extern int HTHOR_API eclagent_main(int argc, const char *argv[], StringBuffer *
 
     if (logfilespec.length())
         appendLogFile(logfilespec.str());
-
-    if (globals->getPropInt("VERSIONS"))
-        CBuildVersion::log();   
     if (traceLevel)
+    {
         printStart(argc, argv);
+        DBGLOG("Build %s", BUILD_TAG);
+    }
 
     // Extract any params into stored - primarily for standalone case but handy for debugging eclagent sometimes too
     Owned<IPropertyTree> query;
@@ -3164,10 +3163,7 @@ extern int HTHOR_API eclagent_main(int argc, const char *argv[], StringBuffer *
                 MTIME_SECTION(timer, "Environment_Initialize");
                 setPasswordsFromSDS();
             }
-
-            if (strlen(buildTag) > 6)
-                PrintLog("ECLAGENT build %s", buildTag);
-
+            PrintLog("ECLAGENT build %s", BUILD_TAG);
             startLogMsgParentReceiver();    
             connectLogMsgManagerToDali();
             StringBuffer datadir;

ecl/eclccserver/eclccserver.cpp

@@ -31,8 +31,6 @@
 #include <dllserver.hpp>
 #include <thorplugin.hpp>
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/eclserver/eclserver.cpp $ $Id: eclserver.cpp 59036 2010-08-31 17:54:39Z sort $");
-
 static unsigned traceLevel;
 static StringAttr dllPath;
 Owned<IPropertyTree> globals;

ecl/eclplus/DeleteHelper.cpp

@@ -18,8 +18,6 @@
 #include "jlib.hpp"
 #include "DeleteHelper.ipp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/eclplus/DeleteHelper.cpp $ $Id: DeleteHelper.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 DeleteHelper::DeleteHelper(IProperties * _globals, IFormatType * _format) : globals(_globals), format(_format), wuclient(createWorkunitsClient(_globals))
 {
 }

ecl/eclplus/DumpHelper.cpp

@@ -18,8 +18,6 @@
 #include "jlib.hpp"
 #include "DumpHelper.ipp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/eclplus/DumpHelper.cpp $ $Id: DumpHelper.cpp 64954 2011-05-27 14:50:31Z jprichard $");
-
 DumpHelper::DumpHelper(IProperties * _globals, IFormatType * _format) : globals(_globals), format(_format), wuclient(createWorkunitsClient(_globals))
 {
 }

ecl/eclplus/ListHelper.cpp

@@ -20,8 +20,6 @@
 
 #define NUMCOLUMNS 4
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/eclplus/ListHelper.cpp $ $Id: ListHelper.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 static StringAttr columns[NUMCOLUMNS] = {"WUID", "OWNER", "JOBNAME", "STATUS"};
 
 ListHelper::ListHelper(IProperties * _globals, IFormatType * _format) : globals(_globals), format(_format), wuclient(createWorkunitsClient(_globals))

ecl/eclplus/QueryHelper.cpp

@@ -21,8 +21,6 @@
 #include "QueryHelper.ipp"
 #include "ViewHelper.ipp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/eclplus/QueryHelper.cpp $ $Id: QueryHelper.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 QueryHelper::QueryHelper(IProperties * _globals, IFormatType * _format) : globals(_globals), format(_format), wuclient(createWorkunitsClient(_globals))
 {
 }

ecl/eclplus/ViewHelper.cpp

@@ -20,8 +20,6 @@
 #include "jmisc.hpp"
 #include "ViewHelper.ipp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/eclplus/ViewHelper.cpp $ $Id: ViewHelper.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 #define DEFAULT_PAGESIZE 500
 
 SCMStringBuffer resultName;

ecl/eclplus/eclplus.cpp

@@ -25,8 +25,6 @@
 #include "ws_workunits.hpp"
 #include "bindutil.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/eclplus/eclplus.cpp $ $Id: eclplus.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 IClientWsWorkunits * createWorkunitsClient(IProperties * _globals)
 {
     Owned<IClientWsWorkunits> wuclient = createWsWorkunitsClient();

ecl/eclplus/main.cpp

@@ -36,9 +36,6 @@
 #define ERROR_NO_SERVER                   3
 #define ERROR_CODE_USAGE                  4
 
-
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/eclplus/main.cpp $ $Id: main.cpp 63912 2011-04-08 09:20:18Z rchapman $");
-
 //copied from workunit.dll to avoid a dependency.  Should possibly go in jlib.
 static bool localLooksLikeAWuid(const char * wuid)
 {

ecl/eclscheduler/eclscheduler.cpp

@@ -29,8 +29,6 @@
 #include <wujobq.hpp>
 #include "eventqueue.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/eclserver/eclserver.cpp $ $Id: eclserver.cpp 59036 2010-08-31 17:54:39Z sort $");
-
 static unsigned traceLevel;
 Owned<IPropertyTree> globals;
 

ecl/hql/hqlattr.cpp

@@ -38,8 +38,6 @@
 #include "hqlattr.hpp"
 #include "hqlmeta.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hql/hqlattr.cpp $ $Id: hqlattr.cpp 66009 2011-07-06 12:28:32Z ghalliday $");
-
 static CriticalSection * attributeCS;
 
 MODULE_INIT(INIT_PRIORITY_HQLINTERNAL)

ecl/hql/hqlerror.cpp

@@ -20,8 +20,6 @@
 #include "hqlerror.hpp"
 #include "hqlerrors.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hql/hqlerror.cpp $ $Id: hqlerror.cpp 66009 2011-07-06 12:28:32Z ghalliday $");
-
 void MultiErrorReceiver::reportError(int errNo, const char* msg, const char * filename, int lineno, int column, int position)
 {
     Owned<IECLError> err = createECLError(errNo,msg,filename,lineno,column,position);

ecl/hql/hqlexpr.cpp

@@ -47,8 +47,6 @@
 #include "hqlmeta.hpp"
 #include "workunit.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hql/hqlexpr.cpp $ $Id: hqlexpr.cpp 66009 2011-07-06 12:28:32Z ghalliday $");
-
 //This nearly works - but there are still some examples which have problems - primarily libraries, old parameter syntax, enums and other issues.
 
 //#define ANNOTATE_EXPR_POSITION

ecl/hql/hqlfold.cpp

@@ -35,9 +35,6 @@
 #include "hqlfold.hpp"
 #include "hqlthql.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hql/hqlfold.cpp $ $Id: hqlfold.cpp 66009 2011-07-06 12:28:32Z ghalliday $");
-
-
 //---------------------------------------------------------------------------
 // The following functions work purely on constant expressions - they do not attempt to process datasets.
 

ecl/hql/hqlgram.y

@@ -50,8 +50,6 @@
 #include "hqlattr.hpp"
 #include "hqlmeta.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hql/hqlgram.y $ $Id: hqlgram.y 66009 2011-07-06 12:28:32Z ghalliday $");
-
 #define REDEF_MSG(name)     StringBuffer msg;           \
                             msg.append(w"Identifier '"); \
                             msg.append(name.queryExpr()->queryName()->str()); \

ecl/hql/hqlgram2.cpp

@@ -54,8 +54,6 @@
 #define MANYFIELDS_THRESHOLD                        2000
 #define MAX_SENSIBLE_FIELD_LENGTH                   1000000000
 
-static CBuildVersion _bv1("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hql/hqlgram2.cpp $ $Id: hqlgram2.cpp 66009 2011-07-06 12:28:32Z ghalliday $");
-
 struct TokenMap
 {
     int lexToken;

ecl/hql/hqllex.l

@@ -67,8 +67,6 @@ extern void hex2str(char * target, const char * digits, unsigned len);
 #define RETURNHARD(sym) \
         setupdatepos; return sym;
 
-static CBuildVersion _bv1("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hql/hqllex.l $ $Id: hqllex.l 66009 2011-07-06 12:28:32Z ghalliday $");
-
 int HqlLex::lookupIdentifierToken(YYSTYPE & returnToken, HqlLex * lexer, bool lookup, const short * activeState, const char * tokenText)
 {
     if ((tokenText[0] == '$') && tokenText[1]==0)

ecl/hql/hqlopt.cpp

@@ -28,8 +28,6 @@
 #include "hqlattr.hpp"
 #include "hqlmeta.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hql/hqlopt.cpp $ $Id: hqlopt.cpp 66009 2011-07-06 12:28:32Z ghalliday $");
-
 #define MIGRATE_JOIN_CONDITIONS             // This works, but I doubt it is generally worth the effort. - maybe on a flag.
 //#define TRACE_USAGE
 

ecl/hql/hqlparse.cpp

@@ -32,8 +32,6 @@
 
 //#define TIMING_DEBUG
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hql/hqlparse.cpp $ $Id: hqlparse.cpp 66009 2011-07-06 12:28:32Z ghalliday $");
-
 #define  MAX_LOOP_TIMES 10000
 
 // =========================== local helper functions ===================================

ecl/hql/hqlrepository.cpp

@@ -23,8 +23,6 @@
 #include "eclrtl.hpp"
 #include "hqlexpr.ipp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hql/hqlrepository.cpp $ $Id: hqlrepository.cpp 66009 2011-07-06 12:28:32Z ghalliday $");
-
 bool isPluginDllScope(IHqlScope * scope)
 {
     if (!scope)

ecl/hql/hqlscope.cpp

@@ -27,8 +27,6 @@
 #include "hqlthql.hpp"
 #include "hqlerror.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hql/hqlscope.cpp $ $Id: hqlscope.cpp 66009 2011-07-06 12:28:32Z ghalliday $");
-
 static void getECL(IHqlExpression * expr, StringBuffer & s)
 {
     toUserECL(s, expr, false);

ecl/hql/hqlstack.cpp

@@ -19,8 +19,6 @@
 #include <string.h>
 #include "hqlstack.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hql/hqlstack.cpp $ $Id: hqlstack.cpp 65973 2011-07-04 15:37:51Z ghalliday $");
-
 FuncCallStack::FuncCallStack() {
     sp = 0;
     tos = DEFAULTSTACKSIZE;

ecl/hql/hqlthql.cpp

@@ -83,8 +83,6 @@ public:
 typedef CIArrayOf<StringBufferItem> StringBufferArray;
 MAKEPointerArray(HqlExprArray, HqlExprArrayArray);
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hql/hqlthql.cpp $ $Id: hqlthql.cpp 65973 2011-07-04 15:37:51Z ghalliday $");
-
 class HqltHql
 {
 public:

ecl/hql/hqlwuerr.cpp

@@ -18,9 +18,6 @@
 #include "jliball.hpp"
 #include "hqlwuerr.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hql/hqlwuerr.cpp $ $Id: hqlwuerr.cpp 62376 2011-02-04 21:59:58Z sort $");
-
-
 static void formatError(StringBuffer & out, int errNo, const char *msg, _ATOM modulename, _ATOM attributename, int lineno, int column)
 {
     out.append(modulename);

ecl/hql/hqlxmldb.cpp

@@ -21,9 +21,6 @@
 #include "jexcept.hpp"
 #include "jprop.hpp"
 
-
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hql/hqlxmldb.cpp $ $Id: hqlxmldb.cpp 65973 2011-07-04 15:37:51Z ghalliday $");
-
 class CXmlScope : public IXmlScope, public CInterface
 {
     friend class CXmlScopeIterator;

ecl/hqlcpp/hqlccommon.cpp

@@ -19,8 +19,6 @@
 #include "hqlexpr.hpp"
 #include "hqlcatom.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hqlcpp/hqlccommon.cpp $ $Id: hqlccommon.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 //===========================================================================
 
 IHqlExpression * activeActivityMarkerExpr;

ecl/hqlcpp/hqlcpp.cpp

@@ -53,8 +53,6 @@
 #include "hqlcse.ipp"
 #include "thorplugin.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hqlcpp/hqlcpp.cpp $ $Id: hqlcpp.cpp 66009 2011-07-06 12:28:32Z ghalliday $");
-
 #ifdef _DEBUG
 //#define ADD_ASSIGNMENT_COMMENTS
 //#define ADD_RESOURCE_AS_CPP_COMMENT

ecl/hqlcpp/hqlcppc.cpp

@@ -29,8 +29,6 @@
 #include "hqlwcpp.hpp"
 #include "hqlcpp.ipp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hqlcpp/hqlcppc.cpp $ $Id: hqlcppc.cpp 63158 2011-03-11 22:39:30Z ghalliday $");
-
 IHqlExpression * convertAddressToValue(IHqlExpression * address, ITypeInfo * columnType)
 {
     if (isTypePassedByAddress(columnType) && !columnType->isReference())

ecl/hqlcpp/hqlcppcase.cpp

@@ -34,8 +34,6 @@
 #include "hqlcatom.hpp"
 #include "hqlcerrors.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hqlcpp/hqlcppcase.cpp $ $Id: hqlcppcase.cpp 66009 2011-07-06 12:28:32Z ghalliday $");
-
 #define INTEGER_SEARCH_THRESHOLD                    30      // above this, a table search is generated.
 #define MAX_NUM_NOBREAK_CASE                        80      // maximum number of case: without a break - compiler workaround
 #define INLINE_COMPARE_THRESHOLD                    2       // above this, a loop is generated

ecl/hqlcpp/hqlcpputil.cpp

@@ -35,8 +35,6 @@
 #include "hqlcpp.ipp"
 #include "hqlcpputil.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hqlcpp/hqlcpputil.cpp $ $Id: hqlcpputil.cpp 65799 2011-06-27 14:07:27Z ghalliday $");
-
 //===========================================================================
 
 static ITypeInfo * cachedVoidType;

ecl/hqlcpp/hqlcset.cpp

@@ -41,8 +41,6 @@
 #include "hqlutil.hpp"
 #include "hqliter.ipp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hqlcpp/hqlcset.cpp $ $Id: hqlcset.cpp 66009 2011-07-06 12:28:32Z ghalliday $");
-
 #ifdef CREATE_DEAULT_ROW_IF_NULL
 #define CREATE_DEAULT_ROW_IF_NULL_VALUE 1
 #else

ecl/hqlcpp/hqlecl.cpp

@@ -15,6 +15,8 @@
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ############################################################################## */
+
+#include "build-config.h"
 #include "jliball.hpp"
 #include "jmisc.hpp"
 #include "jstream.hpp"
@@ -35,9 +37,6 @@
 #include "workunit.hpp"
 #include "thorplugin.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hqlcpp/hqlecl.cpp $ $Id: hqlecl.cpp 66009 2011-07-06 12:28:32Z ghalliday $");
-static const char buildTag[] = "$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hqlcpp/hqlecl.cpp $";
-
 #define MAIN_MODULE_TEMPLATE        "thortpl.cpp"
 #define HEADER_TEMPLATE             "thortpl.hpp"
 #define CHILD_MODULE_TEMPLATE       "childtpl.cpp"
@@ -545,7 +544,7 @@ extern HQLCPP_API unsigned getLibraryCRC(IHqlExpression * library)
 void setWorkunitHash(IWorkUnit * wu, IHqlExpression * expr)
 {
     //Assuming builds come from different branches this will change the crc for each one.
-    unsigned cacheCRC = crc32(buildTag, strlen(buildTag), ACTIVITY_INTERFACE_VERSION);
+    unsigned cacheCRC = crc32(BUILD_TAG, strlen(BUILD_TAG), ACTIVITY_INTERFACE_VERSION);
     cacheCRC += getExpressionCRC(expr);
 #ifdef _WIN32
     cacheCRC++; // make sure CRC is different in windows/linux

ecl/hqlcpp/hqliter.cpp

@@ -41,8 +41,6 @@
 #include "hqlcse.ipp"
 #include "hqliter.ipp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hqlcpp/hqliter.cpp $ $Id: hqliter.cpp 66009 2011-07-06 12:28:32Z ghalliday $");
-
 //===========================================================================
 
 bool isSequenceRoot(IHqlExpression * expr)

ecl/hqlcpp/hqlpopt.cpp

@@ -33,9 +33,6 @@
 #include "hqlcpp.ipp"
 #include "hqlpopt.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hqlcpp/hqlpopt.cpp $ $Id: hqlpopt.cpp 62376 2011-02-04 21:59:58Z sort $");
-
-
 //Optimize IF(a,b,c) op x to IF(a,b op x, c OP x)
 //But be careful because it uncommons attributes increasing the size of the queries.
 static IHqlExpression * peepholeOptimizeCompare(BuildCtx & ctx, IHqlExpression * expr)

ecl/hqlcpp/hqlres.cpp

@@ -27,8 +27,6 @@
 #include "bfd.h"
 #endif
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hqlcpp/hqlres.cpp $ $Id: hqlres.cpp 66009 2011-07-06 12:28:32Z ghalliday $");
-
 #define RESOURCE_BASE 101
 
 class ResourceItem : public CInterface

ecl/hqlcpp/hqlstmt.cpp

@@ -34,8 +34,6 @@
 #include "hqlcpputil.hpp"
 #include "hqlutil.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hqlcpp/hqlstmt.cpp $ $Id: hqlstmt.cpp 65973 2011-07-04 15:37:51Z ghalliday $");
-
 #define CLEAR_COPY_THRESHOLD            100
 
 //---------------------------------------------------------------------------

ecl/hqlcpp/hqlwcpp.cpp

@@ -34,8 +34,6 @@
 #include "hqlwcpp.hpp"
 #include "hqlwcpp.ipp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hqlcpp/hqlwcpp.cpp $ $Id: hqlwcpp.cpp 66009 2011-07-06 12:28:32Z ghalliday $");
-
 #define INDENT_SOURCE
 #define FILE_CHUNK_SIZE         65000
 #define PREFERRED_LINE_LIMIT    160

ecl/hthor/CMakeLists.txt

@@ -16,7 +16,7 @@
 ################################################################################
 
 
-# Component: hthor 
+# Component: hthor
 
 #####################################################
 # Description:
@@ -25,73 +25,75 @@
 #####################################################
 
 
-project( hthor ) 
+project( hthor )
 
-set (    SRCS 
-         hthor.cpp 
-         hthorkey.cpp 
-         hthorstep.cpp 
+set (    SRCS
+         hthor.cpp
+         hthorkey.cpp
+         hthorstep.cpp
          ../eclagent/eclagent.cpp
          ../eclagent/eclgraph.cpp
          sourcedoc.xml
     )
 
-set (    INCLUDES 
-         hthor.ipp 
+set (    INCLUDES
+         hthor.ipp
          hthor.hpp
-         hthorstep.ipp 
+         hthorstep.ipp
          ../eclagent/agentctx.hpp
          ../eclagent/eclagent.ipp
     )
 
-include_directories ( 
+include_directories (
          .
-         ./../../common/remote 
-         ./../../system/jhtree 
-         ./../../system/hrpc 
-         ./../../system/mp 
-         ./../../common/ns 
-         ./../../common/workunit 
-         ./../../system/icu/include 
-         ./../../common/deftype 
-         ./../../system/include 
-         ./../../dali/base 
-         ./../../rtl/include 
-         ./../../ecl/eclagent 
-         ./../../system/jlib 
-         ./../../common/thorhelper 
-         ./../../rtl/eclrtl 
-         ./../../roxie/roxiemem 
-         ./../../roxie/roxie
-         ./../../roxie/ccd
-         ./../../common/roxiehelper 
-         ./../../common/dllserver
-         ./../../common/environment
-         ./../schedulectrl
-         ./../../common/commonext
+         ${HPCC_SOURCE_DIR}/common/remote
+         ${HPCC_SOURCE_DIR}/system/jhtree
+         ${HPCC_SOURCE_DIR}/system/hrpc
+         ${HPCC_SOURCE_DIR}/system/mp
+         ${HPCC_SOURCE_DIR}/common/ns
+         ${HPCC_SOURCE_DIR}/common/workunit
+         ${HPCC_SOURCE_DIR}/system/icu/include
+         ${HPCC_SOURCE_DIR}/common/deftype
+         ${HPCC_SOURCE_DIR}/system/include
+         ${HPCC_SOURCE_DIR}/dali/base
+         ${HPCC_SOURCE_DIR}/rtl/include
+         ${HPCC_SOURCE_DIR}/ecl/eclagent
+         ${HPCC_SOURCE_DIR}/system/jlib
+         ${HPCC_SOURCE_DIR}/common/thorhelper
+         ${HPCC_SOURCE_DIR}/rtl/eclrtl
+         ${HPCC_SOURCE_DIR}/roxie/roxiemem
+         ${HPCC_SOURCE_DIR}/roxie/roxie
+         ${HPCC_SOURCE_DIR}/roxie/ccd
+         ${HPCC_SOURCE_DIR}/common/roxiehelper
+         ${HPCC_SOURCE_DIR}/common/dllserver
+         ${HPCC_SOURCE_DIR}/common/environment
+         ${HPCC_SOURCE_DIR}/ecl/schedulectrl
+         ${HPCC_SOURCE_DIR}/common/commonext
+         ${CMAKE_BINARY_DIR}
+         ${CMAKE_BINARY_DIR}/oss
     )
 
 ADD_DEFINITIONS( -D_USRDLL -DHTHOR_EXPORTS -DSTARTQUERY_EXPORTS )
 
 HPCC_ADD_LIBRARY( hthor SHARED ${SRCS} ${INCLUDES} )
 install ( TARGETS hthor DESTINATION ${OSSDIR}/lib )
-target_link_libraries ( hthor 
+target_link_libraries ( hthor
          jlib
-         mp 
-         hrpc 
-         remote 
-         dalibase 
-         environment 
-         dllserver 
-         nbcd 
-         eclrtl 
-         deftype 
-         workunit 
-         jhtree 
-         securesocket 
-         thorhelper 
-         roxiemem 
-         roxiehelper 
+         mp
+         hrpc
+         remote
+         dalibase
+         environment
+         dllserver
+         nbcd
+         eclrtl
+         deftype
+         workunit
+         jhtree
+         securesocket
+         thorhelper
+         roxiemem
+         roxiehelper
          commonext
          schedulectrl
     )

ecl/hthor/hthor.cpp

@@ -45,8 +45,6 @@
 
 #define EMPTY_LOOP_LIMIT 1000
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hthor/hthor.cpp $ $Id: hthor.cpp 66008 2011-07-06 09:31:54Z rchapman $");
-
 static unsigned const hthorReadBufferSize = 0x10000;
 static memsize_t const defaultHThorSpillThreshold = 512*1024*1024;  // MORE - should increase on 64-bit platform?
 static offset_t const defaultHThorDiskWriteSizeLimit = I64C(10*1024*1024*1024); //10 GB, per Nigel

ecl/hthor/hthorkey.cpp

@@ -27,8 +27,6 @@
 #include "thorstep.ipp"
 #include "roxiedebug.hpp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hthor/hthorkey.cpp $ $Id: hthorkey.cpp 63707 2011-04-01 14:24:52Z wwhitehead $");
-
 #define MAX_FETCH_LOOKAHEAD 1000
 #define IGNORE_FORMAT_CRC_MISMATCH_WHEN_NO_METADATA
 #define DEFAULT_KJ_PRESERVES_ORDER 1

ecl/hthor/hthorstep.cpp

@@ -37,8 +37,6 @@
 #include "thorparse.ipp"
 #include "hthorstep.ipp"
 
-static CBuildVersion _bv("$HeadURL: https://svn.br.seisint.com/ecl/trunk/ecl/hthor/hthorstep.cpp $ $Id: hthorstep.cpp 62376 2011-02-04 21:59:58Z sort $");
-
 //---------------------------------------------------------------------------
 
 CHThorSteppedInput::CHThorSteppedInput(IHThorInput * _input)

esp/platform/espcontext.cpp

@@ -648,7 +648,6 @@ const char* getBuildVersion()
 {
     return g_buildVersion.str();
 }
-
 static StringBuffer g_buildLevel;
 
 void setBuildLevel(const char* buildLevel)

esp/platform/espcontext.hpp

@@ -62,7 +62,6 @@ ESPHTTP_API const char* getCFD();
 
 ESPHTTP_API void setBuildVersion(const char* buildVersion);
 ESPHTTP_API const char* getBuildVersion();
-
 ESPHTTP_API void setBuildLevel(const char* buildLevel);
 ESPHTTP_API const char* getBuildLevel();
 #endif

esp/platform/espp.cpp

@@ -209,12 +209,12 @@ void openEspLogFile(const char* logdir, IPropertyTree* globals)
     queryLogMsgManager()->addMonitorOwn(getRollingFileLogMsgHandler(logbase.str(), ".log", MSGFIELD_STANDARD, false, true, NULL, alias.str()), getCategoryLogMsgFilter(MSGAUD_all, MSGCLS_all, DefaultDetail));
     if (globals->getPropBool("@enableSysLog", false))
         UseSysLogForOperatorMessages();
-    DBGLOG("Esp starting %s", "$HeadURL: https://svn.br.seisint.com/ecl/trunk/esp/platform/espp.cpp $");
+    DBGLOG("Esp starting %s", BUILD_TAG);
 }   
 
 static void usage()
 {
-    puts("ESP - Enterprise Service Platform server. (C) 2001-2005, Seisint Inc.");
+    puts("ESP - Enterprise Service Platform server. (C) 2001-2011, HPCC Systems.");
     puts("Usage:");
     puts("  esp [options]");
     puts("Options:");

plugins/auditlib/auditlib.cpp

@@ -19,8 +19,6 @@
 #include "jlog.hpp"
 #include "auditlib.hpp"
 
-static char buildVersion[] = "$HeadURL: https://svn.br.seisint.com/ecl/trunk/plugins/auditlib/auditlib.cpp $ $Id: auditlib.cpp 62376 2011-02-04 21:59:58Z sort $";
-
 #define AUDITLIB_VERSION "AUDITLIB 1.0.1"
 static const char * compatibleVersions[] = {
     "AUDITLIB 1.0.0 [29933bc38c1f07bcf70f938ad18775c1]", // linux version

plugins/debugservices/debugservices.cpp

@@ -19,8 +19,6 @@
 #include "platform.h"
 #include "debugservices.hpp"
 
-static char buildVersion[] = "$HeadURL: https://svn.br.seisint.com/ecl/trunk/plugins/debugservices/debugservices.cpp $ $Id: debugservices.cpp 62376 2011-02-04 21:59:58Z sort $";
-
 #define DEBUGSERVICES_VERSION "DEBUGSERVICES 1.0.1"
 
 const char * EclDefinition = 
@@ -50,7 +48,7 @@ DEBUGSERVICES_API bool getECLPluginDefinition(ECLPluginDefinitionBlock *pb)
 
 DEBUGSERVICES_API char * DEBUGSERVICES_CALL dsGetBuildInfo(void)
 { 
-    return strdup(buildVersion);
+    return strdup(DEBUGSERVICES_VERSION);
 }
 
 //-------------------------------------------------------------------------------------------------------------------------------------------

plugins/examplelib/examplelib.cpp

@@ -22,8 +22,6 @@
 #include <ctype.h>
 #include "examplelib.hpp"
 
-static char buildVersion[] = "$HeadURL: https://svn.br.seisint.com/ecl/trunk/plugins/examplelib/examplelib.cpp $ $Id: examplelib.cpp 62376 2011-02-04 21:59:58Z sort $";
-
 #define EXAMPLELIB_VERSION "EXAMPLELIB 1.0.00"
 
 const char * HoleDefinition = NULL;

plugins/fileservices/fileservices.cpp

@@ -39,8 +39,6 @@
 #define USE_DALIDFS
 #define SDS_LOCK_TIMEOUT  10000
 
-static char buildVersion[] = "$HeadURL: https://svn.br.seisint.com/ecl/trunk/plugins/fileservices/fileservices.cpp $ $Id: fileservices.cpp 64628 2011-05-17 13:19:55Z ghalliday $";
-
 #define FILESERVICES_VERSION "FILESERVICES 2.1.3"
 
 static const char * compatibleVersions[] = {
@@ -338,7 +336,7 @@ FILESERVICES_API void setPluginContext(IPluginContext * _ctx) { parentCtx = _ctx
 
 FILESERVICES_API char * FILESERVICES_CALL fsGetBuildInfo(void)
 {
-    return CTXSTRDUP(parentCtx, buildVersion);
+    return CTXSTRDUP(parentCtx, FILESERVICES_VERSION);
 }
 
 //-------------------------------------------------------------------------------------------------------------------------------------------