Changeset 3999 for pjproject/trunk/version.mak

Timestamp:

Mar 30, 2012 7:10:13 AM (13 years ago)

Author:

bennylp

Message:

Re #1474: Merged all changes from 1.12 - HEAD (from the 1.x branch)

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• version.mak (modified) (1 diff)

pjproject/trunk/version.mak

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