diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-12-21 19:53:23 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-21 19:53:23 (GMT) |
| commit | c38aa33cb25810bcffa6ba4a8517b8f590596680 (patch) | |
| tree | 08cab42501e830c621fea872b26843ab9080aec4 | |
| parent | 5d5d17a311149a11f0c5428ea51063ea146c4ce0 (diff) | |
| parent | 62fe04852f687975ade38f61cc2b386bf4d3ad6b (diff) | |
| download | SCons-c38aa33cb25810bcffa6ba4a8517b8f590596680.zip SCons-c38aa33cb25810bcffa6ba4a8517b8f590596680.tar.gz SCons-c38aa33cb25810bcffa6ba4a8517b8f590596680.tar.bz2 | |
Merge branch 'master' into wip-manformat
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | src/CHANGES.txt | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index a593e1c..6a57b7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,9 @@ dist: trusty +language: python +python: + - "2.7" + - "3.5" + - "pypy" install: - sudo apt-get -y install clang gdc docbook-xml xsltproc libxml2-dev libxslt-dev python-pip python-dev fop docbook-xsl-doc-pdf texlive-full biber texmaker build-essential libpcre3-dev autoconf automake libtool bison subversion git @@ -77,4 +82,4 @@ jobs: env: BUILD_JOB_NUM=7 - <<: *coverage_jobs env: BUILD_JOB_NUM=8 -
\ No newline at end of file + diff --git a/src/CHANGES.txt b/src/CHANGES.txt index a9c84af..3ccb8a1 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -9,12 +9,17 @@ RELEASE 3.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE From Mats Wichmann: - Updated manpage scons.xml to fix a nested list problem + + From Andrew Featherstone + - Removed unused --warn options from the man page and source code. From Daniel Moody: - Updated Jar builder to handle nodes and directories better - Updated Jar builder to flatten source list which could contain embedded lists - Removed some magic numbers from jar.py on behalf of Mats Wichmann (mats@linux.com) +RELEASE 3.0.1 - Mon, 12 Nov 2017 15:31:33 -0700 + From Daniel Moody: - Jar can take multiple targets, and will make a duplicate jar from the sources for each target - Added some warnings in case the Jar builder makes an implicit target @@ -55,8 +60,6 @@ RELEASE 3.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE From Zachary Tessler: - Fix incorrect warning for repeated identical builder calls that use overrides - From Andrew Featherstone - - Removed unused --warn options from the man page and source code. RELEASE 3.0.0 - Mon, 18 Sep 2017 08:32:04 -0700 |