Changeset 4121 for pjproject

Timestamp:

May 14, 2012 10:42:56 AM (13 years ago)

Author:

bennylp

Message:

Misc fixes (re #1503): parsing PJ_VERSION in setup.py

Location:

pjproject/branches/1.x

Files:

• pjsip-apps/src/python/setup-vc.py (modified) (1 diff)
• pjsip-apps/src/python/setup.py (modified) (1 diff)
• version.mak (modified) (1 diff)

pjproject/branches/1.x/pjsip-apps/src/python/setup-vc.py

@@ -25 +25 @@
 # Find version
 pj_version=""
-f = open('../../../pjlib/src/pj/config.c', 'r')
+pj_version_major=""
+pj_version_minor=""
+pj_version_rev=""
+pj_version_suffix=""
+f = open('../../../version.mak', 'r')
 for line in f:
-    if line.find("PJ_VERSION") != -1:
-        pj_version = line.split("=")[1].strip('";\r\n ')
-        break
+    if line.find("export PJ_VERSION_MAJOR") != -1:
+        tokens=line.split("=")
+        if len(tokens)>1:
+                pj_version_major= tokens[1].strip()
+    elif line.find("export PJ_VERSION_MINOR") != -1:
+        tokens=line.split("=")
+        if len(tokens)>1:
+                pj_version_minor= line.split("=")[1].strip()
+    elif line.find("export PJ_VERSION_REV") != -1:
+        tokens=line.split("=")
+        if len(tokens)>1:
+                pj_version_rev= line.split("=")[1].strip()
+    elif line.find("export PJ_VERSION_SUFFIX") != -1:
+        tokens=line.split("=")
+        if len(tokens)>1:
+                pj_version_suffix= line.split("=")[1].strip()
+
 f.close()
-if pj_version=="":
-    print 'Unable to get PJ_pj_version'
+if not pj_version_major:
+    print 'Unable to get PJ_VERSION_MAJOR'
     sys.exit(1)
+
+pj_version = pj_version_major + "." + pj_version_minor
+if pj_version_rev:
+        pj_version += "." + pj_version_rev
+if pj_version_suffix:
+        pj_version += "-" + pj_version_suffix
+
 #print 'PJ_VERSION = "'+ pj_version + '"'
+
 
 # Check that extension has been built

pjproject/branches/1.x/pjsip-apps/src/python/setup.py

@@ -26 +26 @@
 # find pjsip version
 pj_version=""
-f = open('../../../pjlib/src/pj/config.c', 'r')
+pj_version_major=""
+pj_version_minor=""
+pj_version_rev=""
+pj_version_suffix=""
+f = open('../../../version.mak', 'r')
 for line in f:
-    if line.find("PJ_VERSION") != -1:
-        pj_version= line.split(" = ")[1].strip('";\r\n')
-        break
+    if line.find("export PJ_VERSION_MAJOR") != -1:
+        tokens=line.split("=")
+        if len(tokens)>1:
+                pj_version_major= tokens[1].strip()
+    elif line.find("export PJ_VERSION_MINOR") != -1:
+        tokens=line.split("=")
+        if len(tokens)>1:
+                pj_version_minor= line.split("=")[1].strip()
+    elif line.find("export PJ_VERSION_REV") != -1:
+        tokens=line.split("=")
+        if len(tokens)>1:
+                pj_version_rev= line.split("=")[1].strip()
+    elif line.find("export PJ_VERSION_SUFFIX") != -1:
+        tokens=line.split("=")
+        if len(tokens)>1:
+                pj_version_suffix= line.split("=")[1].strip()
+
 f.close()
-if pj_version=="":
-    print 'Unable to get PJ_VERSION'
+if not pj_version_major:
+    print 'Unable to get PJ_VERSION_MAJOR'
     sys.exit(1)
+
+pj_version = pj_version_major + "." + pj_version_minor
+if pj_version_rev:
+        pj_version += "." + pj_version_rev
+if pj_version_suffix:
+        pj_version += "-" + pj_version_suffix
+
 #print 'PJ_VERSION = "'+ pj_version + '"'
 

pjproject/branches/1.x/version.mak

@@ +1 @@
+# Don't change the "export PJ_VERSION_xxx" style, they are parsed by setup.py
 export PJ_VERSION_MAJOR  := 1
 export PJ_VERSION_MINOR  := 14