Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/waf-01-path.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 2580 e2a5c470102b
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2580
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
     1
 
diff -burNp waf-1.5.13/waf-light waf-1.5.13-dud/waf-light
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
     2
 
--- waf-1.5.13/waf-light	2010-02-16 22:42:45.000000000 +0100
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
     3
 
+++ waf-1.5.13-dud/waf-light	2010-03-02 23:37:42.640873759 +0100
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
     4
 
@@ -1,4 +1,4 @@
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
     5
 
-#!/usr/bin/env python
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
     6
 
+#!/usr/bin/python
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
     7
 
 # encoding: ISO8859-1
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
     8
 
 # Thomas Nagy, 2005-2010
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
     9
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
    10
 
@@ -127,7 +127,7 @@ def find_lib():
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
    11
 
 		if w: return w
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
    12
 
 		err("waf-light requires wafadmin -> export WAFDIR=/folder")
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
    13
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
    14
 
-	dir = "/lib/%s-%s-%s/" % (WAF, VERSION, REVISION)
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
    15
 
+	dir = "/lib/waf/"
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
    16
 
 	for i in [INSTALL,'/usr','/usr/local','/opt']:
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
    17
 
 		w = test(i+dir)
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
    18
 
 		if w: return w
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
    19
 
--- a/wscript	2010-05-05 03:57:41.990709182 +0800
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
    20
 
+++ b/wscript	2010-05-05 03:59:10.109421594 +0800
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
    21
 
@@ -340,7 +340,7 @@
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
    22
 
 		if val != True and val != "y": sys.exit(1)
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
    23
 
 		create_waf()
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
    24
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
    25
 
-	dir = os.path.join('lib', 'waf-%s-%s' % (VERSION, REVISION), 'wafadmin')
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
    26
 
+	dir = os.path.join('lib', 'waf', 'wafadmin')
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
    27
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
    28
 
 	wafadmin = bld(features = 'py')
e2a5c470102b init spec file of waf build system
simonjin
parents:
diff changeset 
    29
 
 	wafadmin.find_sources_in_dirs('wafadmin', exts=['.py'])
upstream/spec-files-extra