From 55705e91d4ab0e0341c73e3104aecb4028910288 Mon Sep 17 00:00:00 2001
From: Shauren <none@none>
Date: Fri, 13 Aug 2010 13:53:33 +0200
Subject: [PATCH] Buildsystem: Modified genrev to properly generate build type
 string (Release/Debug etc.) Removed code that should not be there from
 previous revision

--HG--
branch : trunk
---
 src/genrevision/CMakeLists.txt                  |  4 ++--
 src/genrevision/genrevision.cpp                 | 13 ++++---------
 src/server/game/Achievements/AchievementMgr.cpp |  6 ------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/genrevision/CMakeLists.txt b/src/genrevision/CMakeLists.txt
index 06f7a6c4bd..60ec94f59d 100644
--- a/src/genrevision/CMakeLists.txt
+++ b/src/genrevision/CMakeLists.txt
@@ -18,13 +18,13 @@ add_executable(genrev
 if( CMAKE_GENERATOR MATCHES "Visual Studio" )
   add_custom_command(TARGET genrev
     POST_BUILD
-    COMMAND ${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/genrev ${CMAKE_SOURCE_DIR}
+    COMMAND ${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/genrev -m $(ConfigurationName) ${CMAKE_SOURCE_DIR}
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
   )
 else()
   add_custom_command(TARGET genrev
     POST_BUILD
-    COMMAND ${CMAKE_BINARY_DIR}/src/genrevision/genrev ${CMAKE_SOURCE_DIR}
+    COMMAND ${CMAKE_BINARY_DIR}/src/genrevision/genrev -m ${CMAKE_BUILD_TYPE} ${CMAKE_SOURCE_DIR}
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
   )
 endif()
diff --git a/src/genrevision/genrevision.cpp b/src/genrevision/genrevision.cpp
index 71ca155368..937810908f 100644
--- a/src/genrevision/genrevision.cpp
+++ b/src/genrevision/genrevision.cpp
@@ -24,7 +24,7 @@
 
 #pragma warning(disable:4996)
 
-std::string build_directive;
+std::string build_directive = "Unknown";
 
 struct RawData
 {
@@ -338,7 +338,7 @@ int main(int argc, char **argv)
     //    -s use svn prefered
     //    -r use only revision (without repo URL) (default)
     //    -u include repositire URL as commit URL or "rev at URL"
-    //    -d compile directive debug
+    //    -m build mode string
     for (int k = 1; k <= argc; ++k)
     {
         if(!argv[k] || !*argv[k])
@@ -375,8 +375,8 @@ int main(int argc, char **argv)
             case 'u':
                 use_url = true;
                 continue;
-            case 'd':
-                debug = true;
+            case 'm':
+                build_directive = argv[++k];
                 continue;
             default:
                 printf("Unknown option %s",argv[k]);
@@ -384,11 +384,6 @@ int main(int argc, char **argv)
         }
     }
 
-    if (debug)
-        build_directive = "Debug";
-    else
-        build_directive = "Release";
-
     /// new data extraction
     std::string newData;
 
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp
index dbdb9bc187..13df36dbc9 100644
--- a/src/server/game/Achievements/AchievementMgr.cpp
+++ b/src/server/game/Achievements/AchievementMgr.cpp
@@ -1822,12 +1822,6 @@ void AchievementMgr::RemoveCriteriaProgress(const AchievementCriteriaEntry *entr
     if (criteriaProgress == m_criteriaProgress.end())
         return;
 
-    CriteriaProgress progress = criteriaProgress->second;
-    //if (progress.counter)
-    //{
-    //    progress.counter = 0;
-    //    SendCriteriaUpdate(entry, &progress, entry->timeLimit, false);
-    //}
     WorldPacket data(SMSG_CRITERIA_DELETED,4);
     data << uint32(entry->ID);
     m_player->SendDirectMessage(&data);