[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/devtools/waf
From:       Thomas Nagy <tnagyemail-mail () yahoo ! fr>
Date:       2006-09-24 16:51:35
Message-ID: 1159116695.715040.16552.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 588012 by tnagy:

New variable WAF_HOME useful for packagers.


 M  +9 -5      waf-light  
 M  +4 -2      wafadmin/Params.py  


--- trunk/playground/devtools/waf/waf-light #588011:588012
@@ -14,9 +14,7 @@
 VERSION="0.9.2"
 cwd = os.getcwd()
 
-# ##########################################################################
-# first, we need wafdir otherwise we cannot parse the command-line arguments
-# or print the version number
+# first, we need wafdir otherwise we cannot parse the command-line arguments or print the version number
 
 wafdir = None
 
@@ -95,9 +93,15 @@
 		try_wafdir(os.environ['WAFDIR'])
 	if wafdir: return
 
+	homevar=''
+	for var in ['WAF_HOME', 'HOME', 'HOMEPATH']:
+		if var in os.environ:
+			homevar=os.environ[var]
+			break
+
 	# look at $HOME/.waf-version
 	if sys.platform != 'win32':
-		try_wafdir('%s/.waf-%s' % (os.environ['HOME'], VERSION))
+		try_wafdir('%s/.waf-%s' % (homevar, VERSION))
 	else:
 		try_wafdir('c:\\temp\\waf-%s\\' % VERSION)
 
@@ -117,7 +121,7 @@
 	# uncompress the local waf directory
 	if name[-5:] != 'light':
 		if sys.platform != 'win32':
-			uncompress_wafdir('%s/.waf-%s' % (os.environ['HOME'], VERSION))
+			uncompress_wafdir('%s/.waf-%s' % (homevar, VERSION))
 		else:
 			uncompress_wafdir('c:\\temp\\waf-%s\\' % VERSION)
 		if wafdir: return
--- trunk/playground/devtools/waf/wafadmin/Params.py #588011:588012
@@ -68,8 +68,10 @@
 "config cache directory"
 
 g_homedir=''
-try: g_homedir = os.environ['HOME']
-except: g_homedir = os.environ['HOMEPATH']
+for var in ['WAF_HOME', 'HOME', 'HOMEPATH']:
+	if var in os.environ:
+		g_homedir=os.environ[var]
+		break
 
 # allow different names for lockfile
 try: g_lockfile = os.environ['WAFLOCK']
[prev in list] [next in list] [prev in thread] [next in thread]