diff options
| -rw-r--r-- | HOWTO/release.txt | 7 | ||||
| -rw-r--r-- | doc/MANIFEST | 1 | ||||
| -rw-r--r-- | doc/SConscript | 42 | ||||
| -rw-r--r-- | doc/design/MANIFEST | 13 | ||||
| -rw-r--r-- | doc/man/MANIFEST | 2 | ||||
| -rw-r--r-- | doc/python10/MANIFEST | 15 | ||||
| -rw-r--r-- | doc/reference/MANIFEST | 21 | ||||
| -rw-r--r-- | doc/user/MANIFEST | 31 | ||||
| -rw-r--r-- | src/CHANGES.txt | 6 | ||||
| -rw-r--r-- | src/RELEASE.txt | 15 |
10 files changed, 122 insertions, 31 deletions
diff --git a/HOWTO/release.txt b/HOWTO/release.txt index f769e2c4..348f2bf1 100644 --- a/HOWTO/release.txt +++ b/HOWTO/release.txt @@ -88,13 +88,6 @@ Things to do to release a new version of SCons: aecp src/setupTests.py vi src/setupTests.py - # Optionally, do the same in the following: - [optional] aecp HOWTO/change.txt - [optional] vi HOWTO/change.txt - - [optional] aecp HOWTO/release.txt - [optional] vi HOWTO/release.txt - # Read through and update the README files if necessary [optional] aecp README [optional] vi README diff --git a/doc/MANIFEST b/doc/MANIFEST new file mode 100644 index 00000000..008afabc --- /dev/null +++ b/doc/MANIFEST @@ -0,0 +1 @@ +scons.mod diff --git a/doc/SConscript b/doc/SConscript index e3b6eff5..b973fd45 100644 --- a/doc/SConscript +++ b/doc/SConscript @@ -82,11 +82,11 @@ def scansgml(node, env, target): for m in matches: file, format = m if format and file[-len(format):] != format: - file = file + format + file = file + '.' + format if not os.path.isabs(file): a = [] f = file - while 1: + while f: f, tail = os.path.split(f) if tail == 'doc': break @@ -97,7 +97,8 @@ def scansgml(node, env, target): return includes s = Scanner(name = 'sgml', function = scansgml, skeys = ['.sgml', '.mod']) -env = env.Copy(SCANNERS = [s]) +orig_env = env +env = orig_env.Copy(SCANNERS = [s]) if jw: # @@ -106,8 +107,8 @@ if jw: # rebuild all the docs every time just because the date changes. # date, ver, rev = env.Dictionary('DATE', 'VERSION', 'REVISION') - #version_sgml = File(os.path.join(build, "version.sgml")) - version_sgml = File("version.sgml") + version_sgml = File(os.path.join(build, "version.sgml")) + #version_sgml = File("version.sgml") verfile = str(version_sgml) try: os.unlink(verfile) @@ -165,17 +166,32 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. # We have to tell SCons to scan the top-level SGML files which # get included by the document SGML files in the subdirectories. # - included_sgml = [ - 'scons.mod', - 'copyright.sgml', - ] + manifest = File('MANIFEST').rstr() + src_files = map(lambda x: x[:-1], open(manifest).readlines()) + for s in src_files: + base, ext = os.path.splitext(s) + if ext in ['.fig', '.jpg']: + orig_env.Install(build, s) + else: + orig_env.SCons_revision(os.path.join(build, s), s) # # For each document, build the document itself in HTML, Postscript, # and PDF formats. # for doc in docs.keys(): - main = os.path.join(doc, 'main.sgml') + manifest = File(os.path.join(doc, 'MANIFEST')).rstr() + src_files = map(lambda x: x[:-1], + open(manifest).readlines()) + for s in src_files: + base, ext = os.path.splitext(s) + if ext in ['.fig', '.jpg']: + orig_env.Install(os.path.join(build, doc), os.path.join(doc, s)) + else: + orig_env.SCons_revision(os.path.join(build, doc, s), + os.path.join(doc, s)) + + main = os.path.join(build, doc, 'main.sgml') out = 'main.out' # Hard-coding the scons-src path is a bit of a hack. This can @@ -218,7 +234,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. if fig2dev: for g in docs[doc].get('graphics', []): - fig = os.path.join(doc, '%s.fig' % g) + fig = os.path.join(build, doc, '%s.fig' % g) jpg = os.path.join(htmldir, '%s.jpg' % g) env.Command(jpg, fig, "%s -L jpeg -q 100 $SOURCES $TARGET" % fig2dev) @@ -241,7 +257,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. if fig2dev: for g in docs[doc].get('graphics', []): - fig = os.path.join(doc, '%s.fig' % g) + fig = os.path.join(build, doc, '%s.fig' % g) eps = os.path.join(build, 'PS', '%s.eps' % g) env.Command(eps, fig, "%s -L eps $SOURCES $TARGET" % fig2dev) env.Depends(ps, eps) @@ -308,7 +324,7 @@ for man in man_page_list: # for easy distribution to the web site. # if tar_deps: - tar_list = map(lambda x: x[11:], tar_list) + tar_list = string.join(map(lambda x: x[11:], tar_list)) env.Command(doc_tar_gz, tar_deps, "tar cf${TAR_HFLAG} - -C build/doc %s | gzip > $TARGET" % tar_list) Local(doc_tar_gz) diff --git a/doc/design/MANIFEST b/doc/design/MANIFEST new file mode 100644 index 00000000..72d78be4 --- /dev/null +++ b/doc/design/MANIFEST @@ -0,0 +1,13 @@ +acks.sgml +bground.sgml +copyright.sgml +engine.fig +engine.jpg +engine.sgml +goals.sgml +install.sgml +intro.sgml +issues.sgml +main.sgml +native.sgml +overview.sgml diff --git a/doc/man/MANIFEST b/doc/man/MANIFEST new file mode 100644 index 00000000..8e69d1c4 --- /dev/null +++ b/doc/man/MANIFEST @@ -0,0 +1,2 @@ +scons.1 +sconsign.1 diff --git a/doc/python10/MANIFEST b/doc/python10/MANIFEST new file mode 100644 index 00000000..56a94d46 --- /dev/null +++ b/doc/python10/MANIFEST @@ -0,0 +1,15 @@ +abstract.sgml +acks.sgml +arch.fig +builder.fig +copyright.sgml +design.sgml +future.sgml +install.sgml +intro.sgml +job-task.fig +main.sgml +node.fig +process.sgml +scanner.fig +sig.fig diff --git a/doc/reference/MANIFEST b/doc/reference/MANIFEST new file mode 100644 index 00000000..1ea958ee --- /dev/null +++ b/doc/reference/MANIFEST @@ -0,0 +1,21 @@ +Alias.sgml +CFile.sgml +CXXFile.sgml +Command.sgml +Install.sgml +InstallAs.sgml +Library.sgml +Object.sgml +PCH.sgml +PDF.sgml +PostScript.sgml +Program.sgml +RES.sgml +SharedLibrary.sgml +SharedObject.sgml +StaticLibrary.sgml +StaticObject.sgml +copyright.sgml +errors.sgml +main.sgml +preface.sgml diff --git a/doc/user/MANIFEST b/doc/user/MANIFEST new file mode 100644 index 00000000..134a24bb --- /dev/null +++ b/doc/user/MANIFEST @@ -0,0 +1,31 @@ +actions.sgml +alias.sgml +ant.sgml +builders-built-in.sgml +builders-commands.sgml +builders-writing.sgml +caching.sgml +cons.pl +cons.sgml +copyright.sgml +default.sgml +depends.sgml +environments.sgml +errors.sgml +example.sgml +help.sgml +hierarchy.sgml +install.sgml +libraries.sgml +main.sgml +make.sgml +precious.sgml +preface.sgml +repositories.sgml +run.sgml +scanners.sgml +separate.sgml +simple.sgml +sourcecode.sgml +troubleshoot.sgml +variants.sgml diff --git a/src/CHANGES.txt b/src/CHANGES.txt index bc51bfa5..db8ac76f 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -8,6 +8,12 @@ +RELEASE X.XX - XXX, XX XXX XXXX XX:XX:XX XXXXX + + From Steven Knight + + + RELEASE 0.91 - Thu, 14 Aug 2003 13:00:44 -0500 From Chad Austin: diff --git a/src/RELEASE.txt b/src/RELEASE.txt index 35c96c36..f1049111 100644 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -20,11 +20,13 @@ more effectively, please sign up for the scons-users mailing list at: -RELEASE 0.91 - Thu, 14 Aug 2003 13:00:44 -0500 +RELEASE X.XX - XXX, XX XXX XXXX XX:XX:XX XXXXX - This is the second beta release of SCons. Please consult the + This is the third beta release of SCons. Please consult the CHANGES.txt file for a list of specific changes since last release. + Please note the following important changes since release 0.91: + Please note the following important changes since release 0.90: - The spelling of the 'validater' keyword argument to the @@ -45,15 +47,6 @@ RELEASE 0.91 - Thu, 14 Aug 2003 13:00:44 -0500 This makes the SConscript() function's handling of file names consistent with the rest of SCons. - Please note the following important changes since release 0.14: - - - SCons now tries to verify that Microsoft Visual Studio (including - Visual C++) is actually installed before using it, by checking - that the program directory exists. If SCons cannot find your copy - of Visual Studio, it is probably because it installed itself in a - default directory that we have not seen before. If this is the - case, please let us know so that we can update future versions. - SCons is developed with an extensive regression test suite, and a rigorous development methodology for continually improving that suite. Because of this, SCons is of sufficient quality that you can use it |