diff --git a/configure.ac b/configure.ac index 691a9d0533d..c66547dbf50 100644 --- a/configure.ac +++ b/configure.ac @@ -353,6 +353,8 @@ AC_CONFIG_FILES([ doc/Makefile Makefile src/Makefile + src/tools/Makefile + src/tools/genrevision/Makefile src/framework/Makefile src/shared/Makefile src/shared/Auth/Makefile diff --git a/src/game/Level0.cpp b/src/game/Level0.cpp index 63a015f9802..ff7d58f8da1 100644 --- a/src/game/Level0.cpp +++ b/src/game/Level0.cpp @@ -31,6 +31,7 @@ #include "Language.h" #include "AccountMgr.h" #include "SystemConfig.h" +#include "revision.h" #include "Util.h" bool ChatHandler::HandleHelpCommand(const char* args) @@ -95,7 +96,7 @@ bool ChatHandler::HandleServerInfoCommand(const char* /*args*/) std::string str = secsToTimeString(sWorld.GetUptime()); uint32 updateTime = sWorld.GetUpdateTime(); - PSendSysMessage(_FULLVERSION); //char const* full; + PSendSysMessage(_FULLVERSION); //if(m_session) // full = _FULLVERSION(REVISION_DATE,REVISION_TIME,"|cffffffff|Hurl:" REVISION_ID "|h" REVISION_ID "|h|r"); //else diff --git a/src/shared/Makefile.am b/src/shared/Makefile.am index 54aef015e46..3a86f148521 100644 --- a/src/shared/Makefile.am +++ b/src/shared/Makefile.am @@ -104,7 +104,21 @@ $(srcdir)/Database/SqlDelayThread.h \ $(srcdir)/Database/SqlOperations.cpp \ $(srcdir)/Database/SqlOperations.h \ $(srcdir)/Database/dbcfile.cpp \ -$(srcdir)/Database/dbcfile.h +$(srcdir)/Database/dbcfile.h \ +$(srcdir)/revision.h + + +# Get HG revision +REVISION_FILE = revision.h + +BUILT_SOURCES = $(REVISION_FILE) +CLEANFILES = $(REVISION_FILE) + +FORCE: + +$(REVISION_FILE) : $(top_builddir)/src/tools/genrevision/genrevision FORCE + $(top_builddir)/src/tools/genrevision/genrevision $(top_srcdir) + cp $(top_builddir)/src/shared/revision.h $(top_srcdir)/src/shared ## Additional files to include when running 'make dist' # Disabled packet logger diff --git a/src/shared/SystemConfig.h b/src/shared/SystemConfig.h index 262aa9e6355..aeb38891c11 100644 --- a/src/shared/SystemConfig.h +++ b/src/shared/SystemConfig.h @@ -25,9 +25,27 @@ #define TRINITY_SYSTEMCONFIG_H #include "Platform/Define.h" +#include "revision.h" //-----here u are ------ _REVISION is the magic key -// THIS IS TEMP :) -#define _FULLVERSION "Trinity" + +#define _PACKAGENAME "TrinityCore " +#define _CODENAME "YUME" + +#if TRINITY_ENDIAN == TRINITY_BIGENDIAN +# define _ENDIAN_STRING "big-endian" +#else +# define _ENDIAN_STRING "little-endian" +#endif + +#if PLATFORM == PLATFORM_WINDOWS +# ifdef _WIN64 +# define _FULLVERSION _PACKAGENAME "Rev: " _REVISION " (Win64," _ENDIAN_STRING ")" +# else +# define _FULLVERSION _PACKAGENAME "Rev: " _REVISION " (Win32," _ENDIAN_STRING ")" +# endif +#else +# define _FULLVERSION _PACKAGENAME "Rev: " _REVISION " (Unix," _ENDIAN_STRING ")" +#endif #define DEFAULT_PLAYER_LIMIT 100 #define DEFAULT_WORLDSERVER_PORT 8085 //8129 diff --git a/src/shared/SystemConfig.h.in b/src/shared/SystemConfig.h.in index 262aa9e6355..aeb38891c11 100644 --- a/src/shared/SystemConfig.h.in +++ b/src/shared/SystemConfig.h.in @@ -25,9 +25,27 @@ #define TRINITY_SYSTEMCONFIG_H #include "Platform/Define.h" +#include "revision.h" //-----here u are ------ _REVISION is the magic key -// THIS IS TEMP :) -#define _FULLVERSION "Trinity" + +#define _PACKAGENAME "TrinityCore " +#define _CODENAME "YUME" + +#if TRINITY_ENDIAN == TRINITY_BIGENDIAN +# define _ENDIAN_STRING "big-endian" +#else +# define _ENDIAN_STRING "little-endian" +#endif + +#if PLATFORM == PLATFORM_WINDOWS +# ifdef _WIN64 +# define _FULLVERSION _PACKAGENAME "Rev: " _REVISION " (Win64," _ENDIAN_STRING ")" +# else +# define _FULLVERSION _PACKAGENAME "Rev: " _REVISION " (Win32," _ENDIAN_STRING ")" +# endif +#else +# define _FULLVERSION _PACKAGENAME "Rev: " _REVISION " (Unix," _ENDIAN_STRING ")" +#endif #define DEFAULT_PLAYER_LIMIT 100 #define DEFAULT_WORLDSERVER_PORT 8085 //8129 diff --git a/src/shared/WheatyExceptionReport.cpp b/src/shared/WheatyExceptionReport.cpp index 6a4276cca0f..5aa4a19d583 100644 --- a/src/shared/WheatyExceptionReport.cpp +++ b/src/shared/WheatyExceptionReport.cpp @@ -14,6 +14,8 @@ #define _NO_CVCONST_H #include #include "WheatyExceptionReport.h" +#include "SystemConfig.h" +#include "revision.h" #define CrashFolder _T("Crashes") //#pragma comment(linker, "/defaultlib:dbghelp.lib") @@ -329,22 +331,22 @@ void WheatyExceptionReport::PrintSystemInfo() //=========================================================================== void WheatyExceptionReport::printTracesForAllThreads() { - HANDLE hThreadSnap = INVALID_HANDLE_VALUE; - THREADENTRY32 te32; - + HANDLE hThreadSnap = INVALID_HANDLE_VALUE; + THREADENTRY32 te32; + DWORD dwOwnerPID = GetCurrentProcessId(); m_hProcess = GetCurrentProcess(); - // Take a snapshot of all running threads - hThreadSnap = CreateToolhelp32Snapshot( TH32CS_SNAPTHREAD, 0 ); - if( hThreadSnap == INVALID_HANDLE_VALUE ) - return; - - // Fill in the size of the structure before using it. - te32.dwSize = sizeof(THREADENTRY32 ); - + // Take a snapshot of all running threads + hThreadSnap = CreateToolhelp32Snapshot( TH32CS_SNAPTHREAD, 0 ); + if( hThreadSnap == INVALID_HANDLE_VALUE ) + return; + + // Fill in the size of the structure before using it. + te32.dwSize = sizeof(THREADENTRY32 ); + // Retrieve information about the first thread, // and exit if unsuccessful - if( !Thread32First( hThreadSnap, &te32 ) ) + if( !Thread32First( hThreadSnap, &te32 ) ) { CloseHandle( hThreadSnap ); // Must clean up the // snapshot object! @@ -354,8 +356,8 @@ void WheatyExceptionReport::printTracesForAllThreads() // Now walk the thread list of the system, // and display information about each thread // associated with the specified process - do - { + do + { if( te32.th32OwnerProcessID == dwOwnerPID ) { CONTEXT context; @@ -367,7 +369,7 @@ void WheatyExceptionReport::printTracesForAllThreads() } CloseHandle(threadHandle); } - } while( Thread32Next(hThreadSnap, &te32 ) ); + } while( Thread32Next(hThreadSnap, &te32 ) ); // Don't forget to clean up the snapshot object. CloseHandle( hThreadSnap ); @@ -385,6 +387,7 @@ PEXCEPTION_POINTERS pExceptionInfo ) GetLocalTime(&systime); // Start out with a banner + _tprintf(_T("Revision: %s\r\n"), _FULLVERSION); _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; diff --git a/src/shared/revision.h.in b/src/shared/revision.h.in new file mode 100644 index 00000000000..a84170529eb --- /dev/null +++ b/src/shared/revision.h.in @@ -0,0 +1,4 @@ +#ifndef __SVN_REVISION_H__ +#define __SVN_REVISION_H__ + #define _REVISION "794" //change this to your current revision +#endif // __SVN_REVISION_H__ diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am new file mode 100644 index 00000000000..333cba05861 --- /dev/null +++ b/src/tools/Makefile.am @@ -0,0 +1,2 @@ +## Sub-directories to parse +SUBDIRS = genrevision diff --git a/src/tools/genrevision/Makefile.am b/src/tools/genrevision/Makefile.am new file mode 100644 index 00000000000..faf5451f652 --- /dev/null +++ b/src/tools/genrevision/Makefile.am @@ -0,0 +1,17 @@ +## CPP flags for includes, defines, etc. +AM_CPPFLAGS = -I$(srcdir) + +## Build world list daemon as standalone program +bin_PROGRAMS = genrevision +genrevision_SOURCES = \ + genrevision.cpp + +## Link world daemon against the shared library +genrevision_LDADD = +genrevision_LDFLAGS = -L$(libdir) + +## Additional files to include when running 'make dist' +# Include world daemon configuration +#EXTRA_DIST = + +## Additional files to install diff --git a/src/tools/genrevision/genrevision.cpp b/src/tools/genrevision/genrevision.cpp new file mode 100644 index 00000000000..1c58e82f85d --- /dev/null +++ b/src/tools/genrevision/genrevision.cpp @@ -0,0 +1,264 @@ +/* + * Copyright (C) 2005-2008 MaNGOS + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include +#include +#include +#include + +#pragma warning(disable:4996) + +/* +struct RawData +{ + char rev_str[200]; + char date_str[200]; + char time_str[200]; +}; + +void extractDataFromSvn(FILE* EntriesFile, bool url, RawData& data) +{ + char buf[200]; + + char repo_str[200]; + char num_str[200]; + + fgets(buf,200,EntriesFile); + fgets(buf,200,EntriesFile); + fgets(buf,200,EntriesFile); + fgets(buf,200,EntriesFile); sscanf(buf,"%s",num_str); + fgets(buf,200,EntriesFile); sscanf(buf,"%s",repo_str); + fgets(buf,200,EntriesFile); + fgets(buf,200,EntriesFile); + fgets(buf,200,EntriesFile); + fgets(buf,200,EntriesFile); + fgets(buf,200,EntriesFile); sscanf(buf,"%10sT%8s",data.date_str,data.time_str); + + if(url) + sprintf(data.rev_str,"%s at %s",num_str,repo_str); + else + strcpy(data.rev_str,num_str); +} + +void extractDataFromGit(FILE* EntriesFile, std::string path, bool url, RawData& data) +{ + char buf[200]; + + char hash_str[200]; + char branch_str[200]; + char url_str[200]; + + bool found = false; + while(fgets(buf,200,EntriesFile)) + { + if(sscanf(buf,"%s\t\tbranch %s of %s",hash_str,branch_str,url_str)==3) + { + found = true; + break; + } + } + + if(!found) + { + strcpy(data.rev_str,"*"); + strcpy(data.date_str,"*"); + strcpy(data.time_str,"*"); + return; + } + + if(url) + { + char* host_str = NULL; + char* acc_str = NULL; + char* repo_str = NULL; + + // parse URL like git@github.com:mangos/mangos + char url_buf[200]; + int res = sscanf(url_str,"git@%s",url_buf); + if(res) + { + host_str = strtok(url_buf,":"); + acc_str = strtok(NULL,"/"); + repo_str = strtok(NULL," "); + } + else + { + res = sscanf(url_str,"git://%s",url_buf); + if(res) + { + host_str = strtok(url_buf,"/"); + acc_str = strtok(NULL,"/"); + repo_str = strtok(NULL,"."); + } + } + + // can generate nice link + if(res) + sprintf(data.rev_str,"http://%s/%s/%s/commit/%s",host_str,acc_str,repo_str,hash_str); + // unknonw URL format, use as-is + else + sprintf(data.rev_str,"%s at %s",hash_str,url_str); + } + else + strcpy(data.rev_str,hash_str); + + time_t rev_time = 0; + // extracting date/time + FILE* LogFile = fopen((path+".git/logs/HEAD").c_str(), "r"); + if(LogFile) + { + while(fgets(buf,200,LogFile)) + { + char buf2[200]; + char new_hash[200]; + int unix_time = 0; + int res2 = sscanf(buf,"%s %s %s %s %i",buf2,new_hash,buf2,buf2,&unix_time); + if(res2!=5) + continue; + + if(strcmp(hash_str,new_hash)) + continue; + + rev_time = unix_time; + break; + } + + fclose(LogFile); + + if(rev_time) + { + tm* aTm = localtime(&rev_time); + // YYYY year + // MM month (2 digits 01-12) + // DD day (2 digits 01-31) + // HH hour (2 digits 00-23) + // MM minutes (2 digits 00-59) + // SS seconds (2 digits 00-59) + sprintf(data.date_str,"%04d-%02d-%02d",aTm->tm_year+1900,aTm->tm_mon+1,aTm->tm_mday); + sprintf(data.time_str,"%02d:%02d:%02d",aTm->tm_hour,aTm->tm_min,aTm->tm_sec); + } + else + { + strcpy(data.date_str,"*"); + strcpy(data.time_str,"*"); + } + } + else + { + strcpy(data.date_str,"*"); + strcpy(data.time_str,"*"); + } +} + +bool extractDataFromSvn(std::string filename, bool url, RawData& data) +{ + FILE* EntriesFile = fopen(filename.c_str(), "r"); + if(!EntriesFile) + return false; + + extractDataFromSvn(EntriesFile,url,data); + fclose(EntriesFile); + return true; +} + +bool extractDataFromGit(std::string filename, std::string path, bool url, RawData& data) +{ + FILE* EntriesFile = fopen(filename.c_str(), "r"); + if(!EntriesFile) + return false; + + extractDataFromGit(EntriesFile,path,url,data); + fclose(EntriesFile); + return true; +} + +std::string generateHeader(char const* rev_str, char const* date_str, char const* time_str) +{ + std::ostringstream newData; + newData << "#ifndef __REVISION_H__" << std::endl; + newData << "#define __REVISION_H__" << std::endl; + newData << " #define REVISION_ID \"" << rev_str << "\"" << std::endl; + newData << " #define REVISION_DATE \"" << date_str << "\"" << std::endl; + newData << " #define REVISION_TIME \"" << time_str << "\""<< std::endl; + newData << "#endif // __REVISION_H__" << std::endl; + return newData.str(); +} +*/ +int main(int argc, char **argv) +{ + std::string path; + + if(argc >= 1 && argv[1] ) + { + path = argv[1]; + if(path.size() > 0 && (path[path.size()-1]!='/' || path[path.size()-1]!='\\')) + path += '/'; + } + + FILE* EntriesFile = fopen((path+".hg/branch.cache").c_str(), "r"); + if(!EntriesFile) + EntriesFile = fopen((path+"_hg/branch.cache").c_str(), "r"); + + std::ostringstream newData; + + if(!EntriesFile) + { + newData << "#ifndef __SVN_REVISION_H__" << std::endl; + newData << "#define __SVN_REVISION_H__" << std::endl; + newData << " #define _REVISION \"Unknown\"" << std::endl; + newData << "#endif // __SVN_REVISION_H__" << std::endl; + } + else + { + char revision[100]; + char temp[100]; + fscanf(EntriesFile,"%s%s",temp, &revision); + newData << "#ifndef __SVN_REVISION_H__" << std::endl; + newData << "#define __SVN_REVISION_H__" << std::endl; + newData << " #define _REVISION \"" << revision << "\"" << std::endl; + newData << "#endif // __SVN_REVISION_H__" << std::endl; + fclose(EntriesFile); + } + + std::string oldData; + + if(FILE* HeaderFile = fopen("revision.h","rb")) + { + while(!feof(HeaderFile)) + { + int c = fgetc(HeaderFile); + if(c < 0) + break; + oldData += (char)c; + } + + fclose(HeaderFile); + } + + if(newData.str() != oldData) + { + if(FILE* OutputFile = fopen("revision.h","wb")) + { + fprintf(OutputFile,"%s",newData.str().c_str()); + fclose(OutputFile); + } + } + + return 0; +} diff --git a/src/trinitycore/Main.cpp b/src/trinitycore/Main.cpp index a4bcf717d62..4c85ecd6d68 100644 --- a/src/trinitycore/Main.cpp +++ b/src/trinitycore/Main.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * Copyright (C) 2008 Trinity @@ -21,6 +21,8 @@ /// \addtogroup Trinityd Trinity Daemon /// @{ /// \file +#include "SystemConfig.h" +#include "revision.h" #include "Common.h" #include "Database/DatabaseEnv.h" @@ -62,6 +64,7 @@ uint32 realmID; ///< Id of the realm void usage(const char *prog) { sLog.outString("Usage: \n %s []\n" + " --version print version and exist\n\r" " -c config_file use config_file as configuration file\n\r" #ifdef WIN32 " Running as service functions:\n\r" @@ -92,6 +95,12 @@ extern int main(int argc, char **argv) cfg_file = argv[c]; } + if( strcmp(argv[c],"--version") == 0) + { + printf("%s\n", _FULLVERSION); + return 0; + } + #ifdef WIN32 //////////// //Services// @@ -138,7 +147,7 @@ extern int main(int argc, char **argv) return 1; } sLog.outString("Using configuration file %s.", cfg_file); - + uint32 confVersion = sConfig.GetIntDefault("ConfVersion", 0); if (confVersion < _TRINITY_CORE_CONFVER) { diff --git a/src/trinityrealm/Main.cpp b/src/trinityrealm/Main.cpp index e74cd5144d3..3e2739ec6b5 100644 --- a/src/trinityrealm/Main.cpp +++ b/src/trinityrealm/Main.cpp @@ -31,6 +31,7 @@ #include "sockets/ListenSocket.h" #include "AuthSocket.h" #include "SystemConfig.h" +#include "revision.h" #include "Util.h" // Format is YYYYMMDDRR where RR is the change in the conf file @@ -70,6 +71,7 @@ DatabaseType LoginDatabase; ///< Accessor to the void usage(const char *prog) { sLog.outString("Usage: \n %s []\n" + " --version print version and exist\n\r" " -c config_file use config_file as configuration file\n\r" #ifdef WIN32 " Running as service functions:\n\r" @@ -100,6 +102,12 @@ extern int main(int argc, char **argv) cfg_file = argv[c]; } + if( strcmp(argv[c],"--version") == 0) + { + printf("%s\n", _FULLVERSION); + return 0; + } + #ifdef WIN32 //////////// //Services// diff --git a/win/TrinityCore&Script VC71.sln b/win/TrinityCore&Script VC71.sln index 0da06b199fd..2fc147a72cc 100644 --- a/win/TrinityCore&Script VC71.sln +++ b/win/TrinityCore&Script VC71.sln @@ -47,15 +47,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TrinityRealm", "VC71\Trinit {04BAF755-0D67-46F8-B1C6-77AE5368F3CB} = {04BAF755-0D67-46F8-B1C6-77AE5368F3CB} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ScriptsFull", "..\src\bindings\scripts\VC71\71ScriptDev2.vcproj", "{4295C8A9-79B7-4354-8064-F05FB9CA0C96}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TrinityScript", "..\src\bindings\scripts\VC71\71ScriptDev2.vcproj", "{4295C8A9-79B7-4354-8064-F05FB9CA0C96}" ProjectSection(ProjectDependencies) = postProject {D1EA3EE9-4DCF-4CB9-BA6E-B9321E0D552A} = {D1EA3EE9-4DCF-4CB9-BA6E-B9321E0D552A} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_Wraper", "VC71\ACE_vc71.vcproj", "{7C74F49E-FECA-1BAD-6757-8A6348EA12C8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACEWrappers", "VC71\ACE_vc71.vcproj", "{7C74F49E-FECA-1BAD-6757-8A6348EA12C8}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrevision", "VC71\genrevision.vcproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}" + EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug @@ -108,6 +110,14 @@ Global {7C74F49E-FECA-1BAD-6757-8A6348EA12C8}.Debug.Build.0 = Debug|Win32 {7C74F49E-FECA-1BAD-6757-8A6348EA12C8}.Release.ActiveCfg = Release|Win32 {7C74F49E-FECA-1BAD-6757-8A6348EA12C8}.Release.Build.0 = Release|Win32 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.ActiveCfg = Debug|Win32 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.Build.0 = Debug|Win32 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|x64.ActiveCfg = Debug|x64 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|x64.Build.0 = Debug|x64 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|Win32.ActiveCfg = Release|Win32 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|Win32.Build.0 = Release|Win32 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.ActiveCfg = Release|x64 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/win/TrinityCore&Script VC80.sln b/win/TrinityCore&Script VC80.sln index e5f59ada33c..504f37e342b 100644 --- a/win/TrinityCore&Script VC80.sln +++ b/win/TrinityCore&Script VC80.sln @@ -45,6 +45,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TrinityScript", "..\src\bin EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACEWrappers", "VC80\ACE_vc8.vcproj", "{AD537C9A-FECA-1BAD-6757-8A6348EA12C8}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrevision", "VC80\genrevision.vcproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}" + EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -141,6 +143,14 @@ Global {AD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|Win32.Build.0 = Release|Win32 {AD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|x64.ActiveCfg = Release|x64 {AD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|x64.Build.0 = Release|x64 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.ActiveCfg = Debug|Win32 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.Build.0 = Debug|Win32 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|x64.ActiveCfg = Debug|x64 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|x64.Build.0 = Debug|x64 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|Win32.ActiveCfg = Release|Win32 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|Win32.Build.0 = Release|Win32 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.ActiveCfg = Release|x64 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/win/TrinityCore&Script VC90.sln b/win/TrinityCore&Script VC90.sln index f320ab3f99f..5ae813e7610 100644 --- a/win/TrinityCore&Script VC90.sln +++ b/win/TrinityCore&Script VC90.sln @@ -38,12 +38,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TrinityRealm", "VC90\Trinit {04BAF755-0D67-46F8-B1C6-77AE5368F3CB} = {04BAF755-0D67-46F8-B1C6-77AE5368F3CB} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ScriptsFull", "..\src\bindings\scripts\VC90\90ScriptDev2.vcproj", "{4295C8A9-79B7-4354-8064-F05FB9CA0C96}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TrinityScript", "..\src\bindings\scripts\VC90\90ScriptDev2.vcproj", "{4295C8A9-79B7-4354-8064-F05FB9CA0C96}" ProjectSection(ProjectDependencies) = postProject {A3A04E47-43A2-4C08-90B3-029CEF558594} = {A3A04E47-43A2-4C08-90B3-029CEF558594} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACEWraper", "VC90\ACE_vc9.vcproj", "{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACEWrappers", "VC90\ACE_vc9.vcproj", "{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrevision", "VC90\genrevision.vcproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -141,6 +143,14 @@ Global {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|Win32.Build.0 = Release|Win32 {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|x64.ActiveCfg = Release|x64 {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|x64.Build.0 = Release|x64 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.ActiveCfg = Debug|Win32 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.Build.0 = Debug|Win32 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|x64.ActiveCfg = Debug|x64 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|x64.Build.0 = Debug|x64 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|Win32.ActiveCfg = Release|Win32 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|Win32.Build.0 = Release|Win32 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.ActiveCfg = Release|x64 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/win/VC71/genrevision.vcproj b/win/VC71/genrevision.vcproj new file mode 100644 index 00000000000..2b36151003e --- /dev/null +++ b/win/VC71/genrevision.vcproj @@ -0,0 +1,329 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win/VC71/shared.vcproj b/win/VC71/shared.vcproj index f464af14320..8033e045700 100644 --- a/win/VC71/shared.vcproj +++ b/win/VC71/shared.vcproj @@ -419,6 +419,54 @@ + + + + + + + + + + + + + + diff --git a/win/VC80/genrevision.vcproj b/win/VC80/genrevision.vcproj new file mode 100644 index 00000000000..2b36151003e --- /dev/null +++ b/win/VC80/genrevision.vcproj @@ -0,0 +1,329 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win/VC80/shared.vcproj b/win/VC80/shared.vcproj index 22252b69713..f7eec9c4300 100644 --- a/win/VC80/shared.vcproj +++ b/win/VC80/shared.vcproj @@ -753,6 +753,54 @@ RelativePath="..\..\src\shared\Common.h" > + + + + + + + + + + + + + + diff --git a/win/VC90/genrevision.vcproj b/win/VC90/genrevision.vcproj new file mode 100644 index 00000000000..2b36151003e --- /dev/null +++ b/win/VC90/genrevision.vcproj @@ -0,0 +1,329 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win/VC90/shared.vcproj b/win/VC90/shared.vcproj index ced77fe79af..b10a9781dfc 100644 --- a/win/VC90/shared.vcproj +++ b/win/VC90/shared.vcproj @@ -760,7 +760,55 @@ RelativePath="..\..\src\shared\Common.h" > - + + + + + + + + + + + + + +