[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 21:16:34
Message-ID: 1159132594.405815.10618.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 588079 by tnagy:

Install fix.


 M  +2 -3      waf-light  
 M  +0 -1      wafadmin/Scripting.py  
 M  +0 -1      wafadmin/Tools/gnome.py  
 M  +8 -8      wscript  


--- trunk/playground/devtools/waf/waf-light #588078:588079
@@ -85,12 +85,11 @@
 	global wafdir
 
 	# if wafadmin is in /usr/local/waf-x.x.x/ then use it directly
-	try_wafdir('/usr/local/waf-%s/' % VERSION)
+	try_wafdir('/usr/local/lib/waf-%s/' % VERSION)
 	if wafdir: return
 
 	# wafadmin may be in $WAFDIR, have a look
-	if 'WAFDIR' in os.environ:
-		try_wafdir(os.environ['WAFDIR'])
+	if 'WAFDIR' in os.environ: try_wafdir(os.environ['WAFDIR'])
 	if wafdir: return
 
 	homevar=''
--- trunk/playground/devtools/waf/wafadmin/Scripting.py #588078:588079
@@ -134,7 +134,6 @@
 	Runner.set_exec('noredir')
 
 	# compile the project and/or install the files
-	#bld = private_setup_build()
 	bld = Build.Build()
 	try:
 		file = open(g_lockfile, 'r')
--- trunk/playground/devtools/waf/wafadmin/Tools/gnome.py #588078:588079
@@ -31,7 +31,6 @@
 
 		doc_name = name+'.'+num
 
-		#print "@@@@@@@@@@@@@@@@@@@@@@@@@@ ", doc_name
 		return ([], [doc_name])
 
 sgml_scanner = sgml_man_scanner()
--- trunk/playground/devtools/waf/wscript #588078:588079
@@ -88,11 +88,11 @@
 		sys.exit(0)
 
 	prefix      = Params.g_options.prefix
-	binpath     = '%sbin/waf' % prefix
-	wafadmindir = '%swaf-%s/wafadmin/' % (prefix, VERSION)
-	toolsdir    = '%sTools/' % wafadmindir
+	binpath     = os.path.join(prefix, 'bin%swaf' % os.sep)
+	wafadmindir = os.path.join(prefix, 'lib%swaf-%s%swafadmin%s' % (os.sep, VERSION, os.sep, os.sep))
+	toolsdir    = os.path.join(wafadmindir, 'Tools' + os.sep)
 
-	try: os.makedirs('%sbin' % prefix)
+	try: os.makedirs(os.path.join(prefix, 'bin'))
 	except: pass
 
 	try: os.makedirs(toolsdir)
@@ -122,9 +122,9 @@
 
 def uninstall_waf():
 	print "uninstalling waf from the system"
-	prefix = Params.g_options.prefix
-	binpath = '%sbin/waf' % prefix
-	wafdir  = '%swaf-%s/' % (prefix, VERSION)
+	prefix  = Params.g_options.prefix
+	binpath = os.path.join(prefix, 'bin%swaf' % os.sep)
+	wafdir  = os.path.join(prefix, 'lib%swaf-%s' % (os.sep, VERSION))
 	try:
 		shutil.rmtree(wafdir)
 	except:
@@ -149,7 +149,7 @@
 		os.popen("""perl -pi -e 's/^g_version(.*)?$/g_version="%s"/' wafadmin/Params.py""" % ver).close()
 		sys.exit(0)
 	elif Params.g_options.install:
-		create_waf()
+		if len(sys.argv[0]) > 6 and sys.argv[0][-6:]=='-light': create_waf()
 		install_waf()
 		sys.exit(0)
 	elif Params.g_options.uninstall:
[prev in list] [next in list] [prev in thread] [next in thread]