From 6d4d5978107e2dad2f6ee4af7d78b3539b870df8 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 25 Jun 2007 17:20:01 +0100
Subject: minor cleaning of rant file
---
Rantfile | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
(limited to 'Rantfile')
diff --git a/Rantfile b/Rantfile
index 1b15420d..bb733a6e 100644
--- a/Rantfile
+++ b/Rantfile
@@ -88,22 +88,23 @@ include FileUtils
@dir[:proj]='sisu'
Version=` pwd | grep -o "[0-9]+\.[0-9]+\.[0-9]+$" | grep -o "^[0-9]+\.[0-9]+"` #%% NOTE placing version number permits fine grained removal of version directories if used in lib and conf / etc
#%% system configuration
+@env=Config::CONFIG
PKG_VERSION=Version
@dir[:version]=Version
-@host=Config::CONFIG['host']
-@dir[:arch]=Config::CONFIG['archdir']
-@dir[:sitearch]=Config::CONFIG['sitearchdir']
-@dir[:bin]=Config::CONFIG['bindir']
-#@dir_lib=Config::CONFIG['rubylibdir']
-@dir[:lib]=Config::CONFIG['sitelibdir']
-#@dir_lib='/usr/local/lib/site_ruby/1.9' #Config::CONFIG['sitelibdir']
-@dir[:data]=Config::CONFIG['datadir']
-@dir[:share]="#{Config::CONFIG['datadir']}/sisu"
-@dir[:conf]=Config::CONFIG['sysconfdir'] #etc
-@dir[:man]=Config::CONFIG['mandir']
-@dir[:vim]="#{Config::CONFIG['datadir']}/sisu/vim"
-@dir[:out]="#{Config::CONFIG['localstatedir']}/#{@dir[:proj]}"
-@rubylib=Config::CONFIG['LIBRUBYARG_SHARED']
+@host=@env['host']
+@dir[:arch]=@env['archdir']
+@dir[:sitearch]=@env['sitearchdir']
+@dir[:bin]=@env['bindir']
+#@dir_lib=@env['rubylibdir']
+@dir[:lib]=@env['sitelibdir']
+#@dir_lib='/usr/local/lib/site_ruby/1.9' #@env['sitelibdir']
+@dir[:data]=@env['datadir']
+@dir[:share]="#{@env['datadir']}/sisu"
+@dir[:conf]=@env['sysconfdir'] #etc
+@dir[:man]=@env['mandir']
+@dir[:vim]="#{@env['datadir']}/sisu/vim"
+@dir[:out]="#{@env['localstatedir']}/#{@dir[:proj]}"
+@rubylib=@env['LIBRUBYARG_SHARED']
@pwd=Dir.pwd
def answer?(ask)
resp='redo'
@@ -508,7 +509,7 @@ task :system_info do #%% system info
rant_system_info
end
task :system_param do
- Config::CONFIG.each {|c| p c }
+ @env.each {|c| puts c.inspect }
end
task :project_help do #%% help
rant_project_help
--
cgit v1.2.3