Changed: Set official Ryzom client version and identifiers for OS X bundle

--HG--
branch : compatibility

code/ryzom/client/src/CMakeLists.txt

@@ -48,12 +48,19 @@ SOURCE_GROUP("r2" FILES ${SRC_R2})
 
 # on Mac, create a .App Bundle
 if(APPLE)
-  SET(MACOSX_BUNDLE_INFO_STRING "Ryzom Core Client")
+  SET(RYZOM_VERSION_SHORT "2.1.0")
+  SET(RYZOM_VERSION_LONG "2.1.0")
+
+  IF(REVISION)
+    SET(RYZOM_VERSION_LONG "${RYZOM_VERSION_LONG}.${REVISION}")
+  ENDIF()
+
+  SET(MACOSX_BUNDLE_INFO_STRING "Ryzom")
   SET(MACOSX_BUNDLE_ICON_FILE "ryzom.icns")
-  SET(MACOSX_BUNDLE_GUI_IDENTIFIER "")
+  SET(MACOSX_BUNDLE_GUI_IDENTIFIER "com.winchgate.Ryzom")
-  SET(MACOSX_BUNDLE_LONG_VERSION_STRING ${NL_VERSION})
+  SET(MACOSX_BUNDLE_LONG_VERSION_STRING ${RYZOM_VERSION_LONG})
-  SET(MACOSX_BUNDLE_BUNDLE_NAME "Ryzom Core Client")
+  SET(MACOSX_BUNDLE_BUNDLE_NAME "Ryzom")
-  SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "0.8")
+  SET(MACOSX_BUNDLE_SHORT_VERSION_STRING ${RYZOM_VERSION_SHORT})
   SET(MACOSX_BUNDLE_BUNDLE_VERSION "1.0")
   SET(MACOSX_BUNDLE_COPYRIGHT "Winchgate and The Ryzom Core Community")
   SET(RYZOM_OUTPUT_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${MACOSX_BUNDLE_BUNDLE_NAME}.app)
@@ -116,7 +123,7 @@ ENDIF(APPLE)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} ${LUABIND_DEFINITIONS})
 
-NL_DEFAULT_PROPS(ryzom_client "Ryzom, Client: Ryzom Core Client")
+NL_DEFAULT_PROPS(ryzom_client "Ryzom, Client: Ryzom Client")
 NL_ADD_RUNTIME_FLAGS(ryzom_client)
 
 NL_ADD_LIB_SUFFIX(ryzom_client)

code/ryzom/common/src/game_share/ryzom_version.h

@@ -17,7 +17,7 @@
 #ifndef RYZOM_VERSION_H
 #define RYZOM_VERSION_H
 
-#define RYZOM_VERSION	"RYZOM CORE"
+#define RYZOM_VERSION	"2.1.0"
 
 #endif // RYZOM_VERSION_H