The new buildproject module will contain only BuildProject class a helper class for build source code.
The remaining classes TargetBuildProject and SDKBuildProject was move to runtime and sdk respectively. [YOCTO #10599] Signed-off-by: Aníbal Limón <[email protected]> Signed-off-by: Mariano Lopez <[email protected]> --- meta/lib/oeqa/runtime/utils/__init__.py | 0 meta/lib/oeqa/runtime/utils/targetbuildproject.py | 33 +++++++++++ meta/lib/oeqa/sdk/utils/__init__.py | 0 meta/lib/oeqa/sdk/utils/sdkbuildproject.py | 45 ++++++++++++++ .../oeqa/utils/{targetbuild.py => buildproject.py} | 68 +--------------------- 5 files changed, 79 insertions(+), 67 deletions(-) create mode 100644 meta/lib/oeqa/runtime/utils/__init__.py create mode 100644 meta/lib/oeqa/runtime/utils/targetbuildproject.py create mode 100644 meta/lib/oeqa/sdk/utils/__init__.py create mode 100644 meta/lib/oeqa/sdk/utils/sdkbuildproject.py rename meta/lib/oeqa/utils/{targetbuild.py => buildproject.py} (48%) diff --git a/meta/lib/oeqa/runtime/utils/__init__.py b/meta/lib/oeqa/runtime/utils/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/meta/lib/oeqa/runtime/utils/targetbuildproject.py b/meta/lib/oeqa/runtime/utils/targetbuildproject.py new file mode 100644 index 0000000..138b5ef --- /dev/null +++ b/meta/lib/oeqa/runtime/utils/targetbuildproject.py @@ -0,0 +1,33 @@ +# Copyright (C) 2016 Intel Corporation +# Released under the MIT license (see COPYING.MIT) + +from oeqa.utils.buildproject import BuildProject + +class TargetBuildProject(BuildProject): + + def __init__(self, target, d, uri, foldername=None): + self.target = target + self.targetdir = "~/" + BuildProject.__init__(self, d, uri, foldername, tmpdir="/tmp") + + def download_archive(self): + + self._download_archive() + + (status, output) = self.target.copy_to(self.localarchive, self.targetdir) + if status != 0: + raise Exception("Failed to copy archive to target, output: %s" % output) + + (status, output) = self.target.run('tar xf %s%s -C %s' % (self.targetdir, self.archive, self.targetdir)) + if status != 0: + raise Exception("Failed to extract archive, output: %s" % output) + + #Change targetdir to project folder + self.targetdir = self.targetdir + self.fname + + # The timeout parameter of target.run is set to 0 to make the ssh command + # run with no timeout. + def _run(self, cmd): + return self.target.run(cmd, 0)[0] + + diff --git a/meta/lib/oeqa/sdk/utils/__init__.py b/meta/lib/oeqa/sdk/utils/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/meta/lib/oeqa/sdk/utils/sdkbuildproject.py b/meta/lib/oeqa/sdk/utils/sdkbuildproject.py new file mode 100644 index 0000000..1aa8a69 --- /dev/null +++ b/meta/lib/oeqa/sdk/utils/sdkbuildproject.py @@ -0,0 +1,45 @@ +# Copyright (C) 2016 Intel Corporation +# Released under the MIT license (see COPYING.MIT) + +import os +import subprocess + +from oeqa.utils.buildproject import BuildProject + +class SDKBuildProject(BuildProject): + + def __init__(self, testpath, sdkenv, d, uri, foldername=None): + self.sdkenv = sdkenv + self.testdir = testpath + self.targetdir = testpath + bb.utils.mkdirhier(testpath) + self.datetime = d.getVar('DATETIME', True) + self.testlogdir = d.getVar("TEST_LOG_DIR", True) + bb.utils.mkdirhier(self.testlogdir) + self.logfile = os.path.join(self.testlogdir, "sdk_target_log.%s" % self.datetime) + BuildProject.__init__(self, d, uri, foldername, tmpdir=testpath) + + def download_archive(self): + + self._download_archive() + + cmd = 'tar xf %s%s -C %s' % (self.targetdir, self.archive, self.targetdir) + subprocess.check_call(cmd, shell=True) + + #Change targetdir to project folder + self.targetdir = os.path.join(self.targetdir, self.fname) + + def run_configure(self, configure_args='', extra_cmds=' gnu-configize; '): + return super(SDKBuildProject, self).run_configure(configure_args=(configure_args or '$CONFIGURE_FLAGS'), extra_cmds=extra_cmds) + + def run_install(self, install_args=''): + return super(SDKBuildProject, self).run_install(install_args=(install_args or "DESTDIR=%s/../install" % self.targetdir)) + + def log(self, msg): + if self.logfile: + with open(self.logfile, "a") as f: + f.write("%s\n" % msg) + + def _run(self, cmd): + self.log("Running . %s; " % self.sdkenv + cmd) + return subprocess.call(". %s; " % self.sdkenv + cmd, shell=True) diff --git a/meta/lib/oeqa/utils/targetbuild.py b/meta/lib/oeqa/utils/buildproject.py similarity index 48% rename from meta/lib/oeqa/utils/targetbuild.py rename to meta/lib/oeqa/utils/buildproject.py index 59593f5..0e1ed8a 100644 --- a/meta/lib/oeqa/utils/targetbuild.py +++ b/meta/lib/oeqa/utils/buildproject.py @@ -1,4 +1,4 @@ -# Copyright (C) 2013 Intel Corporation +# Copyright (C) 2013-2016 Intel Corporation # # Released under the MIT license (see COPYING.MIT) @@ -67,69 +67,3 @@ class BuildProject(metaclass=ABCMeta): self._run('rm -rf %s' % self.targetdir) subprocess.call('rm -f %s' % self.localarchive, shell=True) pass - -class TargetBuildProject(BuildProject): - - def __init__(self, target, d, uri, foldername=None): - self.target = target - self.targetdir = "~/" - BuildProject.__init__(self, d, uri, foldername, tmpdir="/tmp") - - def download_archive(self): - - self._download_archive() - - (status, output) = self.target.copy_to(self.localarchive, self.targetdir) - if status != 0: - raise Exception("Failed to copy archive to target, output: %s" % output) - - (status, output) = self.target.run('tar xf %s%s -C %s' % (self.targetdir, self.archive, self.targetdir)) - if status != 0: - raise Exception("Failed to extract archive, output: %s" % output) - - #Change targetdir to project folder - self.targetdir = self.targetdir + self.fname - - # The timeout parameter of target.run is set to 0 to make the ssh command - # run with no timeout. - def _run(self, cmd): - return self.target.run(cmd, 0)[0] - - -class SDKBuildProject(BuildProject): - - def __init__(self, testpath, sdkenv, d, uri, foldername=None): - self.sdkenv = sdkenv - self.testdir = testpath - self.targetdir = testpath - bb.utils.mkdirhier(testpath) - self.datetime = d.getVar('DATETIME', True) - self.testlogdir = d.getVar("TEST_LOG_DIR", True) - bb.utils.mkdirhier(self.testlogdir) - self.logfile = os.path.join(self.testlogdir, "sdk_target_log.%s" % self.datetime) - BuildProject.__init__(self, d, uri, foldername, tmpdir=testpath) - - def download_archive(self): - - self._download_archive() - - cmd = 'tar xf %s%s -C %s' % (self.targetdir, self.archive, self.targetdir) - subprocess.check_call(cmd, shell=True) - - #Change targetdir to project folder - self.targetdir = os.path.join(self.targetdir, self.fname) - - def run_configure(self, configure_args='', extra_cmds=' gnu-configize; '): - return super(SDKBuildProject, self).run_configure(configure_args=(configure_args or '$CONFIGURE_FLAGS'), extra_cmds=extra_cmds) - - def run_install(self, install_args=''): - return super(SDKBuildProject, self).run_install(install_args=(install_args or "DESTDIR=%s/../install" % self.targetdir)) - - def log(self, msg): - if self.logfile: - with open(self.logfile, "a") as f: - f.write("%s\n" % msg) - - def _run(self, cmd): - self.log("Running . %s; " % self.sdkenv + cmd) - return subprocess.call(". %s; " % self.sdkenv + cmd, shell=True) -- 2.1.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
