Remove the remaining references to svn.

This commit is contained in:
Thomas Nagy 2011-09-10 21:25:03 +02:00
parent 91c492b60f
commit 2efa1ed844
8 changed files with 34 additions and 38 deletions

52
DEVEL
View File

@ -1,41 +1,37 @@
branches
--------
trunk the current branch (waf 1.6)
branches/waf-1.5 waf 1.5 (currently waf 1.5.19)
branches/waf-1.6 waf 1.6.0 (before waf 1.6)
tags a tag is created each time a release is made
docs/apidocs located at the repository root - contains the apidocs
the files have svn properties so they are browsable online from
http://waf.googlecode.com/svn/docs/apidocs/index.html
docs/wafbook the waf book of waf 1.6, browsable online from
http://waf.googlecode.com/svn/docs/wafbook/single.html
docs/ the waf book of waf 1.5, browsable online from
http://waf.googlecode.com/svn/docs/single.html
other branches contain experimental things, most are unused now
folders in trunk/
previous branches
-----------------
trunk contains the source code which is being worked on (currently waf 1.6.3)
old svn repository http://waf.googlecode.com/svn/trunk/ (unused)
branch for waf 1.5 http://waf.googlecode.com/svn/branches/waf-1.5/ (read-only, should be moved to git)
Main repository for waf 1.6 on http://waf.googlecode.com/git/
-------------------------------------------------------------
waflib the core library
waflib/Tools essential waf tools
waflib/extras tools which are not included in the waf file
by default, except for the tool "compat15"
build_system_kit examples of build systems that can be created
from waf
tests unit tests, most are unused
waflib/extras contributed tools which are not included in the
waf file by default (except "compat15")
build_system_kit examples of build systems that can be created from waf
tests various unit tests, most are unused anymore
playground experiments and integration tests for the tools in
the folder waflib/extras
demos integration tests - the folder can be configured
as a standalone project
demos/* integration tests and examples used as documentation
docs documentation
docs/sphinx extract docstrings from the source code to extract
the apidocs, they are put in the folder "docs/apidocs"
at the root of the repository
docs/sphinx project extracting the docstrings from the source code to
create the apidocs
Documentation repository on http://docs.waf.googlecode.com/git/
---------------------------------------------------------------
Contains the documentation:
API documentation http://docs.waf.googlecode.com/git/apidocs_16/index.html
The Waf Book http://docs.waf.googlecode.com/git/book_16/single.html
The Waf Book for Waf 1.5 (deprecated) http://docs.waf.googlecode.com/git/book_15/single.html
Wiki documentation on http://wiki.waf.googlecode.com/git/
---------------------------------------------------------
Not much to see yet

4
README
View File

@ -3,8 +3,8 @@ WHAT YOU WILL FIND HERE
Waf (1.6)
For the manual: http://waf.googlecode.com/svn/docs/wafbook/single.html
For the api docs: http://waf.googlecode.com/svn/docs/apidocs/index.html
For the manual: http://docs.waf.googlecode.com/git/book_16/single.html
For the api docs: http://docs.waf.googlecode.com/git/apidocs_16/index.html
For the examples: see the folder demos/
HOW TO CREATE THE WAF SCRIPT

View File

@ -5,7 +5,7 @@ def configure(conf):
conf.load('gcc gas')
def build(bld):
# http://waf.googlecode.com/svn/docs/apidocs/tools/asm.html
# http://docs.waf.googlecode.com/git/apidocs_16/tools/asm.html
bld.program(
source = 'main.c test.S',
target = 'asmtest')

View File

@ -3,7 +3,7 @@
"""
waf configure clean build -j4 --dwidth=800 --dtitle='Parallel build representation for "waf -j4"'
for this to work, make sure to either use waf svn or to create waf with './waf-light --make-waf --tools=compat15,parallel_debug'
for this to work, make sure to either use waf git or to create waf with './waf-light --make-waf --tools=compat15,parallel_debug'
"""
def options(ctx):

View File

@ -3,7 +3,7 @@
"""
waf configure clean build -j4 --dwidth=800 --dtitle='Parallel build representation for "waf -j4"'
for this to work, make sure to either use waf svn or to create waf with './waf-light --make-waf --tools=compat15,parallel_debug'
for this to work, make sure to either use waf git or to create waf with './waf-light --make-waf --tools=compat15,parallel_debug'
"""
def options(ctx):

View File

@ -17,7 +17,7 @@ HEXVERSION=0x1060800
WAFVERSION="1.6.8"
"""Constant updated on new releases"""
WAFREVISION="11517"
WAFREVISION="8"
"""Constant updated on new releases"""
ABI = 98
@ -55,7 +55,7 @@ waf_dir = ''
local_repo = ''
"""Local repository containing additional Waf tools (plugins)"""
remote_repo = 'http://waf.googlecode.com/svn/'
remote_repo = 'http://waf.googlecode.com/git/'
"""
Remote directory containing downloadable waf tools. The missing tools can be downloaded by using::

View File

@ -63,7 +63,7 @@ def check_same_targets(self):
if not dupe:
for (k, v) in uids.items():
if len(v) > 1:
Logs.error('* Several tasks use the same identifier. Please check the information on\n http://waf.googlecode.com/svn/docs/apidocs/Task.html#waflib.Task.Task.uid')
Logs.error('* Several tasks use the same identifier. Please check the information on\n http://waf.googlecode.com/git/docs/apidocs/Task.html#waflib.Task.Task.uid')
for tsk in v:
Logs.error(' - object %r (%r) defined in %r' % (tsk.__class__.__name__, tsk, tsk.generator))

View File

@ -61,7 +61,7 @@ def init(*k, **kw):
pats.append(('^HEXVERSION(.*)', 'HEXVERSION=%s' % hexver))
try:
rev = k[0].cmd_and_log('svnversion').strip().replace('M', '')
rev = k[0].cmd_and_log('git log | grep "^commit" | wc -l', quiet=0).strip()
pats.append(('^WAFREVISION(.*)', 'WAFREVISION="%s"' % rev))
except:
pass
@ -222,7 +222,7 @@ def sfilter(path):
if cnt.find('set(') > -1:
cnt = 'import sys\nif sys.hexversion < 0x020400f0: from sets import Set as set\n' + cnt
cnt = '#! /usr/bin/env python\n# encoding: utf-8\n# WARNING! Do not edit! http://waf.googlecode.com/svn/docs/wafbook/single.html#_obtaining_the_waf_file\n\n' + cnt
cnt = '#! /usr/bin/env python\n# encoding: utf-8\n# WARNING! Do not edit! http://waf.googlecode.com/git/docs/wafbook/single.html#_obtaining_the_waf_file\n\n' + cnt
return (io.BytesIO(cnt.encode('utf-8')), len(cnt), cnt)