Rename gensvnrevision and related files and references to genrevision/etc.

Also svn_revision.h renmaed to revision.h and defines in to it also renamed. MaNGOS code updated.
Other projects using this genrevison tool need to be updated in similar way.
This commit is contained in:
VladimirMangos 2008-10-25 15:31:10 +04:00
parent 3dc4e40e34
commit 643f6af8c7
20 changed files with 119 additions and 118 deletions

View file

@ -298,7 +298,7 @@ AC_CONFIG_FILES([
sql/updates/Makefile sql/updates/Makefile
src/Makefile src/Makefile
src/tools/Makefile src/tools/Makefile
src/tools/gensvnrevision/Makefile src/tools/genrevision/Makefile
src/framework/Makefile src/framework/Makefile
src/shared/Makefile src/shared/Makefile
src/shared/Auth/Makefile src/shared/Auth/Makefile

View file

@ -687,7 +687,9 @@ enum MangosStrings
// FREE IDS 1200-9999 // FREE IDS 1200-9999
// Use for not-in-svn patches 10000-10999 // Use for not-in-offcial-sources patches
// 10000-10999
// Use for custom patches 11000-11999 // Use for custom patches 11000-11999
// NOT RESERVED IDS 12000- // NOT RESERVED IDS 12000-

View file

@ -29,7 +29,7 @@
#include "Language.h" #include "Language.h"
#include "AccountMgr.h" #include "AccountMgr.h"
#include "SystemConfig.h" #include "SystemConfig.h"
#include "svn_revision.h" #include "revision.h"
#include "Util.h" #include "Util.h"
bool ChatHandler::HandleHelpCommand(const char* args) bool ChatHandler::HandleHelpCommand(const char* args)
@ -95,9 +95,9 @@ bool ChatHandler::HandleInfoCommand(const char* /*args*/)
char const* full; char const* full;
if(m_session) if(m_session)
full = _FULLVERSION(SVN_DATE,SVN_TIME,"|cffffffff|Hurl:" SVN_REVISION "|h" SVN_REVISION "|h|r"); full = _FULLVERSION(REVISION_DATE,REVISION_TIME,"|cffffffff|Hurl:" REVISION_ID "|h" REVISION_ID "|h|r");
else else
full = _FULLVERSION(SVN_DATE,SVN_TIME,SVN_REVISION); full = _FULLVERSION(REVISION_DATE,REVISION_TIME,REVISION_ID);
PSendSysMessage(full); PSendSysMessage(full);
PSendSysMessage(LANG_CONNECTED_USERS, activeClientsNum, maxActiveClientsNum, queuedClientsNum, maxQueuedClientsNum); PSendSysMessage(LANG_CONNECTED_USERS, activeClientsNum, maxActiveClientsNum, queuedClientsNum, maxQueuedClientsNum);

View file

@ -32,7 +32,7 @@
#include "Timer.h" #include "Timer.h"
#include "Policies/SingletonImp.h" #include "Policies/SingletonImp.h"
#include "SystemConfig.h" #include "SystemConfig.h"
#include "svn_revision.h" #include "revision.h"
#include "Config/ConfigEnv.h" #include "Config/ConfigEnv.h"
#include "Database/DatabaseEnv.h" #include "Database/DatabaseEnv.h"
#include "CliRunnable.h" #include "CliRunnable.h"
@ -196,7 +196,7 @@ Master::~Master()
/// Main function /// Main function
int Master::Run() int Master::Run()
{ {
sLog.outString( "%s [world-daemon]", _FULLVERSION(SVN_DATE,SVN_TIME,SVN_REVISION) ); sLog.outString( "%s [world-daemon]", _FULLVERSION(REVISION_DATE,REVISION_TIME,REVISION_ID) );
sLog.outString( "<Ctrl-C> to stop.\n\n" ); sLog.outString( "<Ctrl-C> to stop.\n\n" );
sLog.outTitle( "MM MM MM MM MMMMM MMMM MMMMM"); sLog.outTitle( "MM MM MM MM MMMMM MMMM MMMMM");

View file

@ -29,7 +29,7 @@
#include "sockets/ListenSocket.h" #include "sockets/ListenSocket.h"
#include "AuthSocket.h" #include "AuthSocket.h"
#include "SystemConfig.h" #include "SystemConfig.h"
#include "svn_revision.h" #include "revision.h"
#include "Util.h" #include "Util.h"
#ifdef WIN32 #ifdef WIN32
@ -150,7 +150,7 @@ extern int main(int argc, char **argv)
while (pause > clock()) {} while (pause > clock()) {}
} }
sLog.outString( "%s [realm-daemon]", _FULLVERSION(SVN_DATE,SVN_TIME,SVN_REVISION) ); sLog.outString( "%s [realm-daemon]", _FULLVERSION(REVISION_DATE,REVISION_TIME,REVISION_ID) );
sLog.outString( "<Ctrl-C> to stop.\n" ); sLog.outString( "<Ctrl-C> to stop.\n" );
/// realmd PID file creation /// realmd PID file creation

View file

@ -11,4 +11,4 @@
# #
SystemConfig.h SystemConfig.h
svn_revision.h revision.h

View file

@ -46,18 +46,18 @@ libmangosshared_a_SOURCES = \
Util.cpp \ Util.cpp \
Util.h \ Util.h \
WorldPacket.h \ WorldPacket.h \
svn_revision.h revision.h
# Get svn revision # Get revision (git or svn)
SVN_REVISION_FILE = svn_revision.h REVISION_FILE = revision.h
BUILT_SOURCES = $(SVN_REVISION_FILE) BUILT_SOURCES = $(REVISION_FILE)
CLEANFILES = $(SVN_REVISION_FILE) CLEANFILES = $(REVISION_FILE)
FORCE: FORCE:
$(SVN_REVISION_FILE) : $(top_builddir)/src/tools/gensvnrevision/gensvnrevision FORCE $(REVISION_FILE) : $(top_builddir)/src/tools/genrevision/genrevision FORCE
$(top_builddir)/src/tools/gensvnrevision/gensvnrevision $(top_srcdir) $(top_builddir)/src/tools/genrevision/genrevision $(top_srcdir)
## Additional files to include when running 'make dist' ## Additional files to include when running 'make dist'
# Disabled packet logger # Disabled packet logger

View file

@ -14,7 +14,7 @@
#define _NO_CVCONST_H #define _NO_CVCONST_H
#include <dbghelp.h> #include <dbghelp.h>
#include "WheatyExceptionReport.h" #include "WheatyExceptionReport.h"
#include "svn_revision.h" #include "revision.h"
#define CrashFolder _T("Crashs") #define CrashFolder _T("Crashs")
//#pragma comment(linker, "/defaultlib:dbghelp.lib") //#pragma comment(linker, "/defaultlib:dbghelp.lib")
@ -385,7 +385,7 @@ PEXCEPTION_POINTERS pExceptionInfo )
GetLocalTime(&systime); GetLocalTime(&systime);
// Start out with a banner // Start out with a banner
_tprintf(_T("Revision: %s\r\n"), SVN_REVISION); _tprintf(_T("Revision: %s %s %s\r\n"), REVISION_DATE, REVISION_TIME, REVISION_ID);
_tprintf(_T("Date %u:%u:%u. Time %u:%u \r\n"), systime.wDay, systime.wMonth, systime.wYear, systime.wHour, systime.wMinute); _tprintf(_T("Date %u:%u:%u. Time %u:%u \r\n"), systime.wDay, systime.wMonth, systime.wYear, systime.wHour, systime.wMinute);
PEXCEPTION_RECORD pExceptionRecord = pExceptionInfo->ExceptionRecord; PEXCEPTION_RECORD pExceptionRecord = pExceptionInfo->ExceptionRecord;

View file

@ -17,7 +17,7 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
## Sub-directories to parse ## Sub-directories to parse
SUBDIRS = gensvnrevision SUBDIRS = genrevision
## Additional files to include when running 'make dist' ## Additional files to include when running 'make dist'
# Nothing yet. # Nothing yet.

View file

@ -20,13 +20,13 @@
AM_CPPFLAGS = -I$(srcdir) AM_CPPFLAGS = -I$(srcdir)
## Build world list daemon as standalone program ## Build world list daemon as standalone program
bin_PROGRAMS = gensvnrevision bin_PROGRAMS = genrevision
gensvnrevision_SOURCES = \ genrevision_SOURCES = \
gensvnrevision.cpp genrevision.cpp
## Link world daemon against the shared library ## Link world daemon against the shared library
gensvnrevision_LDADD = genrevision_LDADD =
gensvnrevision_LDFLAGS = -L$(libdir) genrevision_LDFLAGS = -L$(libdir)
## Additional files to include when running 'make dist' ## Additional files to include when running 'make dist'
# Include world daemon configuration # Include world daemon configuration

View file

@ -172,12 +172,12 @@ bool extractDataFromGit(std::string filename, std::string path, bool url, RawDat
std::string generateHeader(char const* rev_str, char const* date_str, char const* time_str) std::string generateHeader(char const* rev_str, char const* date_str, char const* time_str)
{ {
std::ostringstream newData; std::ostringstream newData;
newData << "#ifndef __SVN_REVISION_H__" << std::endl; newData << "#ifndef __REVISION_H__" << std::endl;
newData << "#define __SVN_REVISION_H__" << std::endl; newData << "#define __REVISION_H__" << std::endl;
newData << " #define SVN_REVISION \"" << rev_str << "\"" << std::endl; newData << " #define REVISION_ID \"" << rev_str << "\"" << std::endl;
newData << " #define SVN_DATE \"" << date_str << "\"" << std::endl; newData << " #define REVISION_DATE \"" << date_str << "\"" << std::endl;
newData << " #define SVN_TIME \"" << time_str << "\""<< std::endl; newData << " #define REVISION_TIME \"" << time_str << "\""<< std::endl;
newData << "#endif // __SVN_REVISION_H__" << std::endl; newData << "#endif // __REVISION_H__" << std::endl;
return newData.str(); return newData.str();
} }
@ -263,7 +263,7 @@ int main(int argc, char **argv)
/// get existed header data for compare /// get existed header data for compare
std::string oldData; std::string oldData;
if(FILE* HeaderFile = fopen("svn_revision.h","rb")) if(FILE* HeaderFile = fopen("revision.h","rb"))
{ {
while(!feof(HeaderFile)) while(!feof(HeaderFile))
{ {
@ -279,7 +279,7 @@ int main(int argc, char **argv)
/// update header only if different data /// update header only if different data
if(newData != oldData) if(newData != oldData)
{ {
if(FILE* OutputFile = fopen("svn_revision.h","wb")) if(FILE* OutputFile = fopen("revision.h","wb"))
{ {
fprintf(OutputFile,"%s",newData.c_str()); fprintf(OutputFile,"%s",newData.c_str());
fclose(OutputFile); fclose(OutputFile);

View file

@ -2,9 +2,9 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="7.10" Version="7.10"
Name="gensvnrevision" Name="genrevision"
ProjectGUID="{803F488E-4C5A-4866-8D5C-1E6C03C007C2}" ProjectGUID="{803F488E-4C5A-4866-8D5C-1E6C03C007C2}"
RootNamespace="gensvnrevision" RootNamespace="genrevision"
Keyword="Win32Proj" Keyword="Win32Proj"
TargetFrameworkVersion="196613" TargetFrameworkVersion="196613"
> >
@ -18,8 +18,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="1"
> >
@ -89,8 +89,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="1"
WholeProgramOptimization="1" WholeProgramOptimization="1"
@ -166,7 +166,7 @@
</References> </References>
<Files> <Files>
<File <File
RelativePath="..\..\src\tools\gensvnrevision\gensvnrevision.cpp" RelativePath="..\..\src\tools\genrevision\genrevision.cpp"
> >
</File> </File>
</Files> </Files>

View file

@ -429,28 +429,26 @@
RelativePath="..\..\src\shared\ServiceWin32.h"> RelativePath="..\..\src\shared\ServiceWin32.h">
</File> </File>
<File <File
RelativePath="..\..\src\shared\svn_revision.h"> RelativePath="..\..\src\shared\revision.h">
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Extract SVN revision" Description="Extract revision"
CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot; CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot;&#x0D;&#x0A;&quot;$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe&quot; &quot;..\..&quot;
&quot;$(TargetDir)\..\gensvnrevision__$(PlatformName)_$(ConfigurationName)\gensvnrevision.exe&quot; &quot;..\..&quot;
" "
AdditionalDependencies="$(SolutionDir)../.svn/entries" AdditionalDependencies="$(SolutionDir)../.svn/entries;$(SolutionDir)../.git/FETCH_HEAD"
Outputs="svn_revision.h"/> Outputs="revision.h"/>
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Debug|Win32"> Name="Debug|Win32">
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Extract SVN revision" Description="Extract revision"
CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot; CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot;&#x0D;&#x0A;&quot;$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe&quot; &quot;..\..&quot;
&quot;$(TargetDir)\..\gensvnrevision__$(PlatformName)_$(ConfigurationName)\gensvnrevision.exe&quot; &quot;..\..&quot;
" "
AdditionalDependencies="$(SolutionDir)../.svn/entries" AdditionalDependencies="$(SolutionDir)../.svn/entries;$(SolutionDir)../.git/FETCH_HEAD"
Outputs="svn_revision.h"/> Outputs="revision.h"/>
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File

View file

@ -2,9 +2,9 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="8,00"
Name="gensvnrevision" Name="genrevision"
ProjectGUID="{803F488E-4C5A-4866-8D5C-1E6C03C007C2}" ProjectGUID="{803F488E-4C5A-4866-8D5C-1E6C03C007C2}"
RootNamespace="gensvnrevision" RootNamespace="genrevision"
Keyword="Win32Proj" Keyword="Win32Proj"
TargetFrameworkVersion="196613" TargetFrameworkVersion="196613"
> >
@ -21,8 +21,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="1"
> >
@ -92,8 +92,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="1"
WholeProgramOptimization="1" WholeProgramOptimization="1"
@ -166,8 +166,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
OutputDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="1"
> >
@ -238,8 +238,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
OutputDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="1"
WholeProgramOptimization="1" WholeProgramOptimization="1"
@ -316,7 +316,7 @@
</References> </References>
<Files> <Files>
<File <File
RelativePath="..\..\src\tools\gensvnrevision\gensvnrevision.cpp" RelativePath="..\..\src\tools\genrevision\genrevision.cpp"
> >
</File> </File>
</Files> </Files>

View file

@ -762,17 +762,17 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\shared\svn_revision.h" RelativePath="..\..\src\shared\revision.h"
> >
<FileConfiguration <FileConfiguration
Name="Release|Win32" Name="Release|Win32"
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Extract SVN revision" Description="Extract revision"
CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot;&#x0D;&#x0A;&quot;$(TargetDir)\..\gensvnrevision__$(PlatformName)_$(ConfigurationName)\gensvnrevision.exe&quot; &quot;..\..&quot;&#x0D;&#x0A;" CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot;&#x0D;&#x0A;&quot;$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe&quot; &quot;..\..&quot;&#x0D;&#x0A;"
AdditionalDependencies="$(SolutionDir)../.svn/entries" AdditionalDependencies="$(SolutionDir)../.svn/entries;$(SolutionDir)../.git/FETCH_HEAD"
Outputs="svn_revision.h" Outputs="revision.h"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
@ -780,10 +780,10 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Extract SVN revision" Description="Extract revision"
CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot;&#x0D;&#x0A;&quot;$(TargetDir)\..\gensvnrevision__$(PlatformName)_$(ConfigurationName)\gensvnrevision.exe&quot; &quot;..\..&quot;&#x0D;&#x0A;" CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot;&#x0D;&#x0A;&quot;$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe&quot; &quot;..\..&quot;&#x0D;&#x0A;"
AdditionalDependencies="$(SolutionDir)../.svn/entries" AdditionalDependencies="$(SolutionDir)../.svn/entries;$(SolutionDir)../.git/FETCH_HEAD"
Outputs="svn_revision.h" Outputs="revision.h"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
@ -791,10 +791,10 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Extract SVN revision" Description="Extract revision"
CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot;&#x0D;&#x0A;&quot;$(TargetDir)\..\gensvnrevision__$(PlatformName)_$(ConfigurationName)\gensvnrevision.exe&quot; &quot;..\..&quot;&#x0D;&#x0A;" CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot;&#x0D;&#x0A;&quot;$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe&quot; &quot;..\..&quot;&#x0D;&#x0A;"
AdditionalDependencies="$(SolutionDir)../.svn/entries" AdditionalDependencies="$(SolutionDir)../.svn/entries;$(SolutionDir)../.git/FETCH_HEAD"
Outputs="svn_revision.h" Outputs="revision.h"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
@ -802,10 +802,10 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Extract SVN revision" Description="Extract revision"
CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot;&#x0D;&#x0A;&quot;$(TargetDir)\..\gensvnrevision__$(PlatformName)_$(ConfigurationName)\gensvnrevision.exe&quot; &quot;..\..&quot;&#x0D;&#x0A;" CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot;&#x0D;&#x0A;&quot;$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe&quot; &quot;..\..&quot;&#x0D;&#x0A;"
AdditionalDependencies="$(SolutionDir)../.svn/entries" AdditionalDependencies="$(SolutionDir)../.svn/entries;$(SolutionDir)../.git/FETCH_HEAD"
Outputs="svn_revision.h" Outputs="revision.h"
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>

View file

@ -2,9 +2,9 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="9,00" Version="9,00"
Name="gensvnrevision" Name="genrevision"
ProjectGUID="{803F488E-4C5A-4866-8D5C-1E6C03C007C2}" ProjectGUID="{803F488E-4C5A-4866-8D5C-1E6C03C007C2}"
RootNamespace="gensvnrevision" RootNamespace="genrevision"
Keyword="Win32Proj" Keyword="Win32Proj"
TargetFrameworkVersion="0" TargetFrameworkVersion="0"
> >
@ -21,8 +21,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="1"
> >
@ -94,8 +94,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
OutputDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="1"
> >
@ -168,8 +168,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="1"
WholeProgramOptimization="1" WholeProgramOptimization="1"
@ -244,8 +244,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
OutputDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="1"
WholeProgramOptimization="1" WholeProgramOptimization="1"
@ -324,7 +324,7 @@
</References> </References>
<Files> <Files>
<File <File
RelativePath="..\..\src\tools\gensvnrevision\gensvnrevision.cpp" RelativePath="..\..\src\tools\genrevision\genrevision.cpp"
> >
</File> </File>
</Files> </Files>

View file

@ -6,6 +6,7 @@
ProjectGUID="{90297C34-F231-4DF4-848E-A74BCC0E40ED}" ProjectGUID="{90297C34-F231-4DF4-848E-A74BCC0E40ED}"
RootNamespace="shared" RootNamespace="shared"
Keyword="Win32Proj" Keyword="Win32Proj"
TargetFrameworkVersion="0"
> >
<Platforms> <Platforms>
<Platform <Platform
@ -757,25 +758,17 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\shared\ServiceWin32.cpp" RelativePath="..\..\src\shared\revision.h"
>
</File>
<File
RelativePath="..\..\src\shared\ServiceWin32.h"
>
</File>
<File
RelativePath="..\..\src\shared\svn_revision.h"
> >
<FileConfiguration <FileConfiguration
Name="Release|Win32" Name="Release|Win32"
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Extract SVN revision" Description="Extract revision"
CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot;&#x0D;&#x0A;&quot;$(TargetDir)\..\gensvnrevision__$(PlatformName)_$(ConfigurationName)\gensvnrevision.exe&quot; &quot;..\..&quot;&#x0D;&#x0A;" CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot;&#x0D;&#x0A;&quot;$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe&quot; &quot;..\..&quot;&#x0D;&#x0A;"
AdditionalDependencies="$(SolutionDir)../.svn/entries" AdditionalDependencies="$(SolutionDir)../.svn/entries;$(SolutionDir)../.git/FETCH_HEAD"
Outputs="svn_revision.h" Outputs="revision.h"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
@ -783,10 +776,10 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Extract SVN revision" Description="Extract revision"
CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot;&#x0D;&#x0A;&quot;$(TargetDir)\..\gensvnrevision__$(PlatformName)_$(ConfigurationName)\gensvnrevision.exe&quot; &quot;..\..&quot;&#x0D;&#x0A;" CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot;&#x0D;&#x0A;&quot;$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe&quot; &quot;..\..&quot;&#x0D;&#x0A;"
AdditionalDependencies="$(SolutionDir)../.svn/entries" AdditionalDependencies="$(SolutionDir)../.svn/entries;$(SolutionDir)../.git/FETCH_HEAD"
Outputs="svn_revision.h" Outputs="revision.h"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
@ -794,10 +787,10 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Extract SVN revision" Description="Extract revision"
CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot;&#x0D;&#x0A;&quot;$(TargetDir)\..\gensvnrevision__$(PlatformName)_$(ConfigurationName)\gensvnrevision.exe&quot; &quot;..\..&quot;&#x0D;&#x0A;" CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot;&#x0D;&#x0A;&quot;$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe&quot; &quot;..\..&quot;&#x0D;&#x0A;"
AdditionalDependencies="$(SolutionDir)../.svn/entries" AdditionalDependencies="$(SolutionDir)../.svn/entries;$(SolutionDir)../.git/FETCH_HEAD"
Outputs="svn_revision.h" Outputs="revision.h"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
@ -805,13 +798,21 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Extract SVN revision" Description="Extract revision"
CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot;&#x0D;&#x0A;&quot;$(TargetDir)\..\gensvnrevision__$(PlatformName)_$(ConfigurationName)\gensvnrevision.exe&quot; &quot;..\..&quot;&#x0D;&#x0A;" CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot;&#x0D;&#x0A;&quot;$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe&quot; &quot;..\..&quot;&#x0D;&#x0A;"
AdditionalDependencies="$(SolutionDir)../.svn/entries" AdditionalDependencies="$(SolutionDir)../.svn/entries;$(SolutionDir)../.git/FETCH_HEAD"
Outputs="svn_revision.h" Outputs="revision.h"
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath="..\..\src\shared\ServiceWin32.cpp"
>
</File>
<File
RelativePath="..\..\src\shared\ServiceWin32.h"
>
</File>
<File <File
RelativePath="..\..\src\shared\SystemConfig.h.in" RelativePath="..\..\src\shared\SystemConfig.h.in"
> >

View file

@ -57,7 +57,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sockets", "VC71\sockets.vcp
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gensvnrevision", "VC71\gensvnrevision.vcproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrevision", "VC71\genrevision.vcproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
EndProjectSection EndProjectSection
EndProject EndProject

View file

@ -44,7 +44,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "VC80\g3dlite.vcp
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sockets", "VC80\sockets.vcproj", "{04BAF755-0D67-46F8-B1C6-77AE5368F3CB}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sockets", "VC80\sockets.vcproj", "{04BAF755-0D67-46F8-B1C6-77AE5368F3CB}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gensvnrevision", "VC80\gensvnrevision.vcproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrevision", "VC80\genrevision.vcproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACEWraper", "VC80\ACE_vc8.vcproj", "{AD537C9A-FECA-1BAD-6757-8A6348EA12C8}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACEWraper", "VC80\ACE_vc8.vcproj", "{AD537C9A-FECA-1BAD-6757-8A6348EA12C8}"
EndProject EndProject

View file

@ -44,7 +44,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "VC90\g3dlite.vcp
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sockets", "VC90\sockets.vcproj", "{04BAF755-0D67-46F8-B1C6-77AE5368F3CB}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sockets", "VC90\sockets.vcproj", "{04BAF755-0D67-46F8-B1C6-77AE5368F3CB}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gensvnrevision", "VC90\gensvnrevision.vcproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrevision", "VC90\genrevision.vcproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACEWraper", "VC90\ACE_vc9.vcproj", "{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACEWraper", "VC90\ACE_vc9.vcproj", "{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}"
EndProject EndProject