From aa668d2b0f2cfaf123fff99e12adaeba45ec4fb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Metin?= <baris@pardus.org.tr>
Date: Thu, 16 Jun 2005 18:22:03 +0000
Subject: [PATCH] =?UTF-8?q?*=20sabit=20tan=C4=B1mlamas=C4=B1na=20devam.=20?=
 =?UTF-8?q?*=20actions=20i=C3=A7erisindeki=20fonksiyonlarda=20src=5F*=20pr?=
 =?UTF-8?q?efixlerini=20kullanmak=20istedi=C4=9Fimizi=20hat=C4=B1rlam?=
 =?UTF-8?q?=C4=B1yorum.=20D=C3=BCzelttim.=20*=20bir=20tak=C4=B1m=20daha=20?=
 =?UTF-8?q?indent=20d=C3=BCzeltmesi.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pisi/build.py           | 15 +++++++++------
 src/pisi/context.py         |  5 +++++
 src/samples/popt/actions.py | 16 ++++++++--------
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/pisi/build.py b/src/pisi/build.py
index 49d67c10..4bb6a3be 100644
--- a/src/pisi/build.py
+++ b/src/pisi/build.py
@@ -107,19 +107,22 @@ class PisiBuild:
         pass
 
     def configureSource(self, locals):
-	if 'src_setup' in locals:
+	func = self.ctx.const.setup_func
+	if func in locals:
 	    ui.info("Configuring %s...\n" % self.spec.source.name)
-	    locals['src_setup']()
+	    locals[func]()
 
     def buildSource(self, locals):
-	if 'src_build' in locals:
+	func = self.ctx.const.build_func
+	if func in locals:
 	    ui.info("Building %s...\n" % self.spec.source.name)
-	    locals['src_build']()
+	    locals[func]()
 
     def installSource(self, locals):
-	if 'src_install' in locals:
+	func = self.ctx.const.install_func
+	if func in locals:
 	    ui.info("Installing %s...\n" % self.spec.source.name)
-	    locals['src_install']()
+	    locals[func]()
 
     def buildPackages(self):
         for package in self.spec.packages:
diff --git a/src/pisi/context.py b/src/pisi/context.py
index ab2e99ce..50e7c645 100644
--- a/src/pisi/context.py
+++ b/src/pisi/context.py
@@ -38,6 +38,11 @@ class Constants:
 	self.c.actions_file = "actions.py"
 	self.c.files_dir = "files"
 
+	# functions in actions_file
+	self.c.setup_func = "setup"
+	self.c.build_func = "build"
+	self.c.install_func = "install"
+
     def __getattr__(self, attr):
  	return getattr(self.c, attr)
 
diff --git a/src/samples/popt/actions.py b/src/samples/popt/actions.py
index 3935ed5c..1e52afcc 100644
--- a/src/samples/popt/actions.py
+++ b/src/samples/popt/actions.py
@@ -5,13 +5,13 @@ from pisi.actionsapi.gnuconfig import *
 from pisi.actionsapi.libtoolize import *
 from pisi.actionsapi.autotools import *
 
-def src_setup():
-	gnuconfig_update()
-#	libtoolize()
-	configure( '--with-nls' )
+def setup():
+    gnuconfig_update()
+#    libtoolize()
+    configure( '--with-nls' )
 
-def src_build():
-	make()
+def build():
+    make()
 
-def src_install():
-	install()
+def install():
+    install()