[openrtm-commit:01423] r2549 - trunk/OpenRTM-aist/build

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2014-04-04 02:06:13 +0900 (Fri, 04 Apr 2014)
New Revision: 2549

Modified:
   trunk/OpenRTM-aist/build/cmakeconfgen.py
Log:
[[compat,->RELENG_1_1] cmakeconfgen.py has been updated to replace COIL/RTM/OMG version numbers.

Modified: trunk/OpenRTM-aist/build/cmakeconfgen.py
===================================================================
--- trunk/OpenRTM-aist/build/cmakeconfgen.py	2014-04-03 17:04:54 UTC (rev 2548)
+++ trunk/OpenRTM-aist/build/cmakeconfgen.py	2014-04-03 17:06:13 UTC (rev 2549)
@@ -153,6 +153,7 @@
 
 
 if __name__ == '__main__':
+    import os
     if len(sys.argv) < 2:
         print "please specify vsprops file"
         sys.exit(1)
@@ -176,6 +177,22 @@
         value = value.replace("\\", "/")
         value = value.replace("\"", "")
         value = re.sub("(SolutionDir)", "%RTM_ROOT%", value)
+        envs = [
+            "COIL_DLLVER",
+            "COIL_VERSION",
+            "COIL_SHORTVER",
+            "RTM_DLLVER",
+            "RTM_VERSION",
+            "RTM_SHORTVER",
+            "OMNI_DLLVER",
+            "OMNI_VERSION",
+            "OMNI_SHORTVER",
+            "OMNITHREAD_DLLVER",
+            "OMNITHREAD_VERSION",
+            ]
+        for env_str in envs:
+            env_var = "%" + env_str + "%"
+            value = re.sub(env_var, os.environ[env_str], value)
         dict[name] = value
     dict["user_lib"] = ""
     dict["user_libd"] = ""