Changed version to 2.0-rc

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@4112 74dad513-b988-da41-8d7b-12977e46ad98

pjlib/include/pj/config.h

@@ -1163,7 +1163,7 @@ PJ_BEGIN_DECL
  * Extra suffix for the version (e.g. "-trunk"), or empty for
  * web release version.
  */
-#define PJ_VERSION_NUM_EXTRA	"-beta-svn"
+#define PJ_VERSION_NUM_EXTRA	"-rc"
 
 /**
  * PJLIB version number consists of three bytes with the following format:

pjlib/src/pj/config.c

@@ -23,13 +23,22 @@
 
 static const char *id = "config.c";
 
-#define PJ_MAKE_VERSION1(a,b,c,d) 	#a "." #b "." #c d
-#define PJ_MAKE_VERSION2(a,b,c,d)	PJ_MAKE_VERSION1(a,b,c,d)
+#define PJ_MAKE_VERSION3_1(a,b,d) 	#a "." #b d
+#define PJ_MAKE_VERSION3_2(a,b,d)	PJ_MAKE_VERSION3_1(a,b,d)
 
-PJ_DEF_DATA(const char*) PJ_VERSION = PJ_MAKE_VERSION2(PJ_VERSION_NUM_MAJOR,
-						       PJ_VERSION_NUM_MINOR,
-						       PJ_VERSION_NUM_REV,
-						       PJ_VERSION_NUM_EXTRA);
+#define PJ_MAKE_VERSION4_1(a,b,c,d) 	#a "." #b "." #c d
+#define PJ_MAKE_VERSION4_2(a,b,c,d)	PJ_MAKE_VERSION4_1(a,b,c,d)
+
+#if PJ_VERSION_NUM_REV
+PJ_DEF_DATA(const char*) PJ_VERSION = PJ_MAKE_VERSION4_2(PJ_VERSION_NUM_MAJOR,
+						         PJ_VERSION_NUM_MINOR,
+						         PJ_VERSION_NUM_REV,
+						         PJ_VERSION_NUM_EXTRA);
+#else
+PJ_DEF_DATA(const char*) PJ_VERSION = PJ_MAKE_VERSION3_2(PJ_VERSION_NUM_MAJOR,
+						         PJ_VERSION_NUM_MINOR,
+						         PJ_VERSION_NUM_EXTRA);
+#endif
 
 /*
  * Get PJLIB version string.

version.mak

@@ -1,7 +1,7 @@
 export PJ_VERSION_MAJOR  := 2
 export PJ_VERSION_MINOR  := 0
 export PJ_VERSION_REV    :=
-export PJ_VERSION_SUFFIX := beta-svn
+export PJ_VERSION_SUFFIX := rc
 
 export PJ_VERSION := $(PJ_VERSION_MAJOR).$(PJ_VERSION_MINOR)