From f25ba861bf276a30c984ef870e0ce76c3ff8bd7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= <caglar@pardus.org.tr>
Date: Wed, 15 Jun 2005 11:04:37 +0000
Subject: [PATCH] Popt pisi-build ile derlenip, install ediliyor...

---
 src/pisi/actionsapi/autotools.py  |  4 ++--
 src/pisi/actionsapi/libtoolize.py |  8 ++++----
 src/pisi/build.py                 | 23 ++++++++++++++++++-----
 src/samples/actions               | 17 +++++++++++++++++
 4 files changed, 41 insertions(+), 11 deletions(-)
 create mode 100644 src/samples/actions

diff --git a/src/pisi/actionsapi/autotools.py b/src/pisi/actionsapi/autotools.py
index 28a7d16f..6da2dc8b 100644
--- a/src/pisi/actionsapi/autotools.py
+++ b/src/pisi/actionsapi/autotools.py
@@ -32,5 +32,5 @@ def install():
                 mandir={D}/usr/share/man \
                 sysconfdir={D}/etc \
                 install'
-
-    os.system( install_string.replace( '{D}', os.path.dirname( os.getcwd()) + '/image' ))
+    
+    os.system( install_string.replace( '{D}', os.path.dirname( os.path.dirname( os.getcwd())) + '/image' ))
diff --git a/src/pisi/actionsapi/libtoolize.py b/src/pisi/actionsapi/libtoolize.py
index 43f9c125..3eb9a78e 100644
--- a/src/pisi/actionsapi/libtoolize.py
+++ b/src/pisi/actionsapi/libtoolize.py
@@ -3,12 +3,12 @@
 
 import os,sys
 
-sys.path.append('..')
-import config
+#sys.path.append('..')
+import pisi.config
 
 def libtoolize():
     ''' FIXME: Düzgün hale getirilecek '''
     ''' patch source with ltmain patches '''
 
-    os.system( 'patch -sN < ' + config.lib_dir() + '/portage-1.4.1.patch' )
-    os.system( 'patch -sN < ' + config.lib_dir() + '/sed-1.4.0.patch' )
+    os.system( 'patch -sN < ' + pisi.config.lib_dir() + '/portage-1.4.1.patch' )
+    os.system( 'patch -sN < ' + pisi.config.lib_dir() + '/sed-1.4.0.patch' )
diff --git a/src/pisi/build.py b/src/pisi/build.py
index 2781ac3a..caaa88e1 100644
--- a/src/pisi/build.py
+++ b/src/pisi/build.py
@@ -8,6 +8,7 @@ import os
 from specfile import SpecFile
 from fetcher import Fetcher
 from archive import Archive
+
 # import pisipackage
 import util
 import config
@@ -41,13 +42,22 @@ class PisiBuild:
         self.fetchArchive(displayProgress)
         ui.info("Source archive is stored: %s/%s\n"
                 %(config.archives_dir(), self.spec.source.archiveName))
-	# solveBuildDependencies()
+	
+	self.solveBuildDependencies()
+	
 	ui.info("Unpacking archive...\n")
         self.unpackArchive()
-        # applyPatches()
-        # buildSource()
-        # installTarget()
-        self.buildPackages()
+        
+	# applyPatches()
+
+	self.actionScript = open( os.path.dirname( self.pspecfile ) + '/' + 'actions' ).read()
+
+	os.chdir( config.build_work_dir( self.spec.source.name, self.spec.source.version, self.spec.source.release ) + "/" + self.spec.source.name + "-" + self.spec.source.version)
+	locals = globals = {}
+	exec compile( self.actionScript , "error", "exec" ) in locals,globals
+	locals['src_setup']()
+	locals['src_build']()
+	locals['src_install']()
 
     def fetchArchive(self, percentHook=None):
         """fetch an archive and store to config.archives_dir() 
@@ -71,6 +81,9 @@ class PisiBuild:
 	if percentHook:
 	    ui.info('\n')
 
+    def solveBuildDependencies(self):
+    	pass
+
     def unpackArchive(self):
 	type = self.spec.source.archiveType
 	fileName = self.spec.source.archiveName
diff --git a/src/samples/actions b/src/samples/actions
new file mode 100644
index 00000000..ddba1cdb
--- /dev/null
+++ b/src/samples/actions
@@ -0,0 +1,17 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+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 src_build():
+	make()
+
+def src_install():
+	install()