diff options
| author | Benny Prijono <bennylp@teluu.com> | 2012-05-14 11:04:46 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2012-05-14 11:04:46 +0000 |
| commit | 200f391a5150910e39b10e9a251b5e3fb2374b6e (patch) | |
| tree | 5869b6c0161dbe8223de3d7c51219c915be06b7b /pjsip-apps | |
| parent | 08ec20ea344b8f308cbd5fb322e55ab2a2996300 (diff) | |
Re #1509: backported r4112-4121
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4122 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps')
| -rw-r--r-- | pjsip-apps/src/python/setup-vc.py | 38 | ||||
| -rw-r--r-- | pjsip-apps/src/python/setup.py | 37 |
2 files changed, 63 insertions, 12 deletions
diff --git a/pjsip-apps/src/python/setup-vc.py b/pjsip-apps/src/python/setup-vc.py index 755058aa..82c5475a 100644 --- a/pjsip-apps/src/python/setup-vc.py +++ b/pjsip-apps/src/python/setup-vc.py @@ -24,17 +24,43 @@ import sys # 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 if not os.access('../../lib/_pjsua.pyd', os.R_OK): print 'Error: file "../../lib/_pjsua.pyd" does not exist!' diff --git a/pjsip-apps/src/python/setup.py b/pjsip-apps/src/python/setup.py index 43e4ef7e..6e3618d5 100644 --- a/pjsip-apps/src/python/setup.py +++ b/pjsip-apps/src/python/setup.py @@ -25,15 +25,40 @@ import platform # 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 + '"' |