run as dbus session

[scm/meta/abs.git] / abs

diff --git a/abs b/abs
index d61b584..bafea7a 100755 (executable)
--- a/abs
+++ b/abs
@@ -108,7 +108,7 @@ class ErrorParser(object):
                                     '.*make.*: \*\*\* .*', \
                                     '.*make.*: Target (.*) not remade because of errors.', \
                                     '.*[Cc]ommand not found.*', \
-                                    'Error:\s*(.*)'], \
+                                    '^Error:\s*(.*)'], \
                        'TIZEN_NATIVE':['.*ninja: build stopped.*', \
                                        'edje_cc: Error..(.*):(\d).*', \
                                        'edje_cc: Error.*']}
@@ -158,12 +158,12 @@ class _Rootstrap(object):
         cmdline = self.tizen + ' list rootstrap'
         ret = Executor().run(cmdline, show=False)
         for x in ret.splitlines():
-            if re.search('(%s)-(2.4|3.0|4.0|5.0)-(device|emulator|device64|emulator64).core.*' % rs_prefix, x):
+            if re.search('(%s)-([0-9.]*)-(device.*|emulator.*).core.*' % rs_prefix, x):
                 if self.rootstrap_list == None:
                     self.rootstrap_list = []
                 self.rootstrap_list.append(x.split(' ')[0])
             else:
-                print 'No search result for %s' % '(%s)-(2.4|3.0|4.0|5.0)-(device|emulator|device64|emulator64).core.*' % rs_prefix
+                print 'No search result for %s' % '(%s)-([0-9.]*)-(device.*|emulator.*).core.*' % rs_prefix
         return self.rootstrap_list
 
     def check_rootstrap(self, rootstrap, show=True):
@@ -378,7 +378,7 @@ class Sdk(object):
                 print '\n\n BUILD NATIVE\n'
                 if jobs is not None:
                     b_args.extend(['-j', jobs])
-                b_args.extend(['-r', rootstrap, '-a', self.arch, '-C', conf, '-c', 'gcc'])
+                b_args.extend(['-r', rootstrap, '-a', self.arch, '-C', conf])
                 b_args.extend(['--', x['path']])
                 out = self._run('build-native', b_args, checker=True)
             logpath = os.path.join(source.output_dir, \
@@ -422,6 +422,7 @@ class Sdk(object):
 
         # Manual strip
         if manual_strip == True :
+            main_args.extend(['--strip', 'on'])
             strip_cmd='';
             if self.arch == None:
                 raise LocalError('Architecture is None')
@@ -488,9 +489,9 @@ class Sdk(object):
             elif x['web_app'] == True:
                 print '\n\n PACKAGE WEB\n'
                 out = '%s\n%s' % (out, \
-                      self._run('package', main_args_web + ['--', x['path']]))
+                      self._run('package', main_args_web + ['--', os.path.join(x['path'], '.buildResult')]))
                 try:
-                    final_app = list_files(x['path'], ext='wgt')[0]
+                    final_app = list_files(os.path.join(x['path'], '.buildResult'), ext='wgt')[0]
                 except:
                     raise LocalError('WGT file not generated for %s.' % x['APPNAME'])
                 x['out_package'] = final_app
@@ -500,11 +501,11 @@ class Sdk(object):
             print 'THIS IS MULTI PROJECT'
             for i, x in enumerate(source.project_list):
                 if x['out_package'] != final_app and x.get('type') == 'app':
-                    extra_args.extend(['-r', x['out_package']])
+                    extra_args.extend(['-r', '"%s"' % x['out_package']])
                 elif x.get('type') == 'sharedLib':
-                    extra_args.extend(['-r', x['out_package']])
+                    extra_args.extend(['-r', '"%s"' % x['out_package']])
 
-            extra_args.extend(['--', final_app])
+            extra_args.extend(['--', '"%s"' % final_app])
             if final_app.endswith('.tpk'):
                 out = self._run('package', main_args + extra_args)
             elif final_app.endswith('.wgt'):
@@ -513,13 +514,13 @@ class Sdk(object):
         #TODO: signature validation check failed : Invalid file reference. An unsigned file was found.
         if final_app.endswith('.tpk'):
             print 'Packaging final step again!'
-            out = self._run('package', main_args + ['--', final_app])
+            out = self._run('package', main_args + ['--', '"%s"' % final_app])
 
         #Append arch to web binary
-        if final_app.endswith('.wgt'):
-            final_app_with_arch = final_app.replace('.wgt', '-%s.wgt' % self.arch)
-            os.rename(final_app, final_app_with_arch)
-            final_app = final_app_with_arch
+        #if final_app.endswith('.wgt'):
+        #    final_app_with_arch = final_app.replace('.wgt', '-%s.wgt' % self.arch)
+        #    os.rename(final_app, final_app_with_arch)
+        #    final_app = final_app_with_arch
 
         #Copy tpk to output directory
         if conf == 'Debug' and manual_strip == False :