Changeset 4112

Timestamp:

Apr 27, 2012 9:47:20 AM (13 years ago)

Author:

bennylp

Message:

Changed version to 2.0-rc

Location:

pjproject/trunk

Files:

• pjlib/include/pj/config.h (modified) (1 diff)
• pjlib/src/pj/config.c (modified) (1 diff)
• version.mak (modified) (1 diff)

pjproject/trunk/pjlib/include/pj/config.h

@@ -1164 +1164 @@
  * web release version.
  */
-#define PJ_VERSION_NUM_EXTRA    "-beta-svn"
+#define PJ_VERSION_NUM_EXTRA    "-rc"
 
 /**

pjproject/trunk/pjlib/src/pj/config.c

@@ -24 +24 @@
 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
 
 /*

pjproject/trunk/version.mak

@@ -2 +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)