From 915408a199a2801280920de2ecc181833d9bf8c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Wed, 3 Aug 2005 19:34:54 +0000 Subject: [PATCH] * build.py: Build states set by functions, Little typo fix * toplevel.py: setStates calls removed * common.py and commands.py: build-do* calls renamed as build-* --- pisi/build.py | 14 ++++++++------ pisi/cli/commands.py | 34 +++++++++++++++------------------- pisi/cli/common.py | 10 +++++----- pisi/toplevel.py | 15 --------------- 4 files changed, 28 insertions(+), 45 deletions(-) diff --git a/pisi/build.py b/pisi/build.py index e54e61c2..04ac538d 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -108,12 +108,12 @@ class PisiBuild: if os.path.exists(self.ctx.pkg_dir()): util.clean_dir(self.ctx.pkg_dir()) + self.compileActionScript() + self.fetchSourceArchive() self.unpackSourceArchive() - self.compileActionScript() - self.solveBuildDependencies() # apply the patches and prepare a source directory for build. @@ -144,26 +144,28 @@ class PisiBuild: ui.info("Source archive is stored: %s/%s\n" %(self.ctx.archives_dir(), self.spec.source.archiveName)) - def unpackSourceArchive(self): ui.info("Unpacking archive...") self.sourceArchive.unpack() ui.info(" unpacked (%s)\n" % self.ctx.pkg_work_dir()) + self.setState("unpacked") def runSetupAction(self): # Run configure, build and install phase ui.action("Setting up source...\n") self.runActionFunction(const.setup_func) + self.setState("setupaction") def runBuildAction(self): ui.action("Building source...\n") self.runActionFunction(const.build_func) + self.setState("buildaction") def runInstallAction(self): - ui.action("Intalling...\n") + ui.action("Installing...\n") # install function is mandatory! self.runActionFunction(const.install_func, True) - + self.setState("installaction") def compileActionScript(self): """Compiles actions.py and sets the actionLocals and actionGlobals""" @@ -192,7 +194,6 @@ class PisiBuild: workdir = self.spec.source.name + "-" + self.spec.source.version return os.path.join(self.ctx.pkg_work_dir(), workdir) - def runActionFunction(self, func, mandatory=False): """Calls the corresponding function in actions.py. @@ -332,3 +333,4 @@ class PisiBuild: pkg.close() os.chdir(c) + self.setState("buildpackages") diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index 0e774332..34b9217f 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -23,11 +23,11 @@ def cmdObject(cmd, fail=False): commands = {"help": Help, "build": Build, "build-until": BuildUntil, - "build-dounpack": BuildDoUnpack, - "build-dosetup": BuildDoSetup, - "build-dobuild": BuildDoBuild, - "build-doinstall": BuildDoInstall, - "build-dopackage": BuildDoPackage, + "build-unpack": BuildUnpack, + "build-setup": BuildSetup, + "build-build": BuildBuild, + "build-install": BuildInstall, + "build-package": BuildPackage, "info": Info, "install": Install, "list-installed": ListInstalled, @@ -426,7 +426,7 @@ for you. for arg in self.args: pisi.toplevel.build_until(arg, state, self.authInfo) -class BuildDoUnpack(Command): +class BuildUnpack(Command): """Unpack the source archive Usage: @@ -435,7 +435,7 @@ class BuildDoUnpack(Command): TODO: desc. """ def __init__(self): - super(BuildDoUnpack, self).__init__() + super(BuildUnpack, self).__init__() def run(self): if not self.args: @@ -446,7 +446,7 @@ TODO: desc. pisi.toplevel.build_until(arg, "unpack", self.authInfo) -class BuildDoSetup(Command): +class BuildSetup(Command): """Setup the source Usage: @@ -455,7 +455,7 @@ class BuildDoSetup(Command): TODO: desc. """ def __init__(self): - super(BuildDoSetup, self).__init__() + super(BuildSetup, self).__init__() def run(self): if not self.args: @@ -466,7 +466,7 @@ TODO: desc. pisi.toplevel.build_until(arg, "setupaction", self.authInfo) -class BuildDoBuild(Command): +class BuildBuild(Command): """Setup the source Usage: @@ -475,7 +475,7 @@ class BuildDoBuild(Command): TODO: desc. """ def __init__(self): - super(BuildDoBuild, self).__init__() + super(BuildBuild, self).__init__() def run(self): if not self.args: @@ -485,7 +485,7 @@ TODO: desc. for arg in self.args: pisi.toplevel.build_until(arg, "buildaction", self.authInfo) -class BuildDoInstall(Command): +class BuildInstall(Command): """Install to the sandbox Usage: @@ -494,7 +494,7 @@ class BuildDoInstall(Command): TODO: desc. """ def __init__(self): - super(BuildDoInstall, self).__init__() + super(BuildInstall, self).__init__() def run(self): if not self.args: @@ -504,7 +504,7 @@ TODO: desc. for arg in self.args: pisi.toplevel.build_until(arg, "installaction", self.authInfo) -class BuildDoPackage(Command): +class BuildPackage(Command): """Setup the source Usage: @@ -513,7 +513,7 @@ class BuildDoPackage(Command): TODO: desc. """ def __init__(self): - super(BuildDoPackage, self).__init__() + super(BuildPackage, self).__init__() def run(self): if not self.args: @@ -522,7 +522,3 @@ TODO: desc. for arg in self.args: pisi.toplevel.build_until(arg, "buildpackages", self.authInfo) - - - - diff --git a/pisi/cli/common.py b/pisi/cli/common.py index d9ff2ca0..5167e328 100644 --- a/pisi/cli/common.py +++ b/pisi/cli/common.py @@ -15,11 +15,11 @@ where is one of: help build build-until -build-dounpack -build-dosetup -build-dobuild -build-doinstall -build-dopackage +build-unpack +build-setup +build-build +build-install +build-package index info install diff --git a/pisi/toplevel.py b/pisi/toplevel.py index ae75e138..1bacb076 100644 --- a/pisi/toplevel.py +++ b/pisi/toplevel.py @@ -238,40 +238,30 @@ def __buildState_unpack(pb): pb.unpackSourceArchive() pb.applyPatches() - pb.setState("unpack") - def __buildState_setupaction(pb, last): if order[last] < order["unpack"]: __buildState_unpack(pb) pb.runSetupAction() - pb.setState("setupaction") - def __buildState_buildaction(pb, last): if order[last] < order["setupaction"]: __buildState_setupaction(pb, last) pb.runBuildAction() - pb.setState("buildaction") - def __buildState_installaction(pb, last): if order[last] < order["buildaction"]: __buildState_buildaction(pb, last) pb.runInstallAction() - pb.setState("installaction") - def __buildState_buildpackages(pb, last): if order[last] < order["installaction"]: __buildState_installaction(pb, last) pb.buildPackages() - pb.setState("buildpackages") - def build_until(pspecfile, state, authInfo=None): pb = prepare_for_build(pspecfile, authInfo) pb.compileActionScript() @@ -294,12 +284,7 @@ def build_until(pspecfile, state, authInfo=None): return if state == "installaction": - print "blibli" __buildState_installaction(pb, last) return __buildState_buildpackages(pb, last) - - - -