[ABS] Get default property file 11/214911/1
authorHyokeun Jeon <hyokeun.jeon@samsung.com>
Fri, 27 Sep 2019 10:20:12 +0000 (19:20 +0900)
committerHyokeun Jeon <hyokeun.jeon@samsung.com>
Fri, 27 Sep 2019 10:20:12 +0000 (19:20 +0900)
Change-Id: I64b382b8bebca91ce7dbae16a9721ad707aefe34

abs/job_abs_build.py

index e25605e..8cefc0c 100755 (executable)
@@ -272,8 +272,6 @@ def retrieve_project_property(src_git, tag):
 
         # As guided, the last is the main app from multi project listup.
         def_file_list = []
-        # Single project
-        def_file_list.append(os.path.join(src_root, 'tizen-manifest.xml'))
         # Multi project
         multiproject_list_f = os.path.join(src_root, 'WORKSPACE')
         if os.path.isfile(multiproject_list_f):
@@ -284,6 +282,12 @@ def retrieve_project_property(src_git, tag):
                             def_file_list.append(os.path.join(src_root, x.rstrip(), 'tizen-manifest.xml'))
                         elif os.path.isfile(os.path.join(src_root, x.rstrip(), 'config.xml')):
                             def_file_list.append(os.path.join(src_root, x.rstrip(), 'config.xml'))
+        else:
+            # Single project
+            if os.path.isfile(os.path.join(src_root, 'tizen-manifest.xml')):
+                def_file_list.append(os.path.join(src_root, 'tizen-manifest.xml'))
+            if os.path.isfile(os.path.join(src_root, 'config.xml')):
+                def_file_list.append(os.path.join(src_root, 'config.xml'))
 
         #for def_file in def_file_list:
         #TODO: Should be the last item