[openrtm-commit:02516] r2964 - trunk/OpenRTM-aist/build

openrtm @ openrtm.org openrtm @ openrtm.org
2017年 3月 15日 (水) 11:21:22 JST


Author: miyamoto
Date: 2017-03-15 11:21:22 +0900 (Wed, 15 Mar 2017)
New Revision: 2964

Modified:
   trunk/OpenRTM-aist/build/slntool.py
Log:
[compat,bugfix,->RELENG_1_2] Modified slntool.py

Modified: trunk/OpenRTM-aist/build/slntool.py
===================================================================
--- trunk/OpenRTM-aist/build/slntool.py	2017-03-15 00:42:25 UTC (rev 2963)
+++ trunk/OpenRTM-aist/build/slntool.py	2017-03-15 02:21:22 UTC (rev 2964)
@@ -180,6 +180,8 @@
         i += 1
     return (vcversion, depfile, outfile, flist)
 
+
+
 def get_slnyaml(depfile, projfiles, vcversion="VC8"):
     depdict = get_dependencies(depfile)
     projs = []
@@ -227,8 +229,21 @@
             return -1
         return 0
 
-    projs.sort(depsort)
+    #projs.sort(depsort)
+    
+    def insertProj(pj, projs):
+        for num in range(0, len(projs)):
+            if depsort(pj, projs[num]) == -1:
+                projs.insert(num, pj)
+                return
+        projs.append(pj)
+
+    ret_projs = []
     for pj in projs:
+        insertProj(pj, ret_projs)
+    projs = ret_projs
+        
+    for pj in projs:
         list = """  - Name: %s
     FileName: %s
     GUID: &%s %s



openrtm-commit メーリングリストの案内