pisi/actionsapi içerisindeki config.py, pisi/config.py'nin de olması nedeni ile kafa karıştırıyordu. actionsapi'de kullandığımız şey aslında global değerler. İsimlendirmeyi ona göre yaptım...

This commit is contained in:
Barış Metin
2005-07-02 00:55:34 +00:00
parent 2f97e978ca
commit ef46c0554a
4 changed files with 20 additions and 21 deletions
@@ -35,16 +35,15 @@ class Dirs:
class Flags:
"""General flags used in actions API"""
conf = pisi.config.config
host = conf.host
cflags = conf.cflags
cxxflags = conf.cflags
host = pisi.config.config.conf.build.host
cflags = pisi.config.config.conf.build.cflags
cxxflags = pisi.config.config.conf.build.cflags
class ActionsConfig(pisi.config.Config):
class ActionGlobals(pisi.config.Config):
const = pisi.constants.const
conf = pisi.config.config.conf
env = Env()
dirs = Dirs()
flags = Flags()
config = ActionsConfig()
glb = ActionGlobals()
+5 -5
View File
@@ -5,13 +5,13 @@
import os
# actions api modules
from config import config
from actionglobals import glb
def configure(parameters = ''):
''' FIXME: Düzgün hale getirilecek '''
''' parameters = '--with-nls --with-libusb --with-something-usefull '''
dirs = config.dirs
flags = config.flags
dirs = glb.dirs
flags = glb.flags
configure_string = './configure --prefix=/%s \
--host=%s \
@@ -38,10 +38,10 @@ def make():
def install():
''' FIXME: Düzgün hale getirilecek '''
''' dir_suffix = /var/tmp/pisi/ _paket_adı_ /image/ '''
dirs = config.dirs
dirs = glb.dirs
dir_suffix = os.path.dirname(os.path.dirname(os.getcwd())) + \
config.const.install_dir_suffix
glb.const.install_dir_suffix
install_string = 'make prefix=%(prefix)s/%(defaultprefix)s \
datadir=%(prefix)s/%(data)s \
+2 -2
View File
@@ -5,7 +5,7 @@
import os
# actions api modules
from config import config
from actionglobals import glb
# Global variables for compiling KDE programs...
kde_dir = os.getenv('KDEDIR')
@@ -36,7 +36,7 @@ def install():
''' dir_suffix = /var/tmp/pisi/ _paket_adı_ /image/ '''
dir_suffix = os.path.dirname(os.path.dirname(os.getcwd())) + \
config.const.install_dir_suffix
glb.const.install_dir_suffix
install_string = 'make prefix=%s/%s install' % (dir_suffix, kde_dir)
os.system(install_string)
+7 -7
View File
@@ -8,11 +8,11 @@ import gzip
from pisi.util import copy_file
# actions api modules
from config import config
from actionglobals import glb
def dodoc(*documentList):
env = config.env
dirs = config.dirs
env = glb.env
dirs = glb.dirs
srcTag = env.src_name + '-' \
+ env.src_version + '-' \
@@ -38,8 +38,8 @@ def dosed(filename, *sedPattern):
for pattern in sedPattern:
os.system('sed -i -e \'' + pattern + '\' ' + filename)
def dosbin(filename, destination=config.dirs.sbin):
env = config.env
def dosbin(filename, destination=glb.dirs.sbin):
env = glb.env
try:
os.makedirs(os.path.join(env.install_dir, destination))
@@ -53,8 +53,8 @@ def dosbin(filename, destination=config.dirs.sbin):
os.path.basename(filename)))
def doman(filename):
env = config.env
dirs = config.dirs
env = glb.env
dirs = glb.dirs
man, postfix = filename.split('.')
destDir = os.path.join(env.install_dir, dirs.man, "man" + postfix)