Merge pull request #3734 from bdbaddog/restore_scons_local

Add sepearat pypi README-package.rst for pypi's long description text

7 files changed, 151 insertions, 15 deletions

diff --git a/README-package.rst b/README-package.rst
new file mode 100755
index 000000000..605e5fe29
--- /dev/null
+++ b/README-package.rst
@@ -0,0 +1,134 @@
+SCons - a software construction tool
+####################################
+
+.. image:: https://img.shields.io/badge/IRC-scons-blue.svg
+   :target: http://webchat.freenode.net/?channels=%23scons&uio=d4
+   :alt: IRC
+
+.. image:: https://img.shields.io/sourceforge/dm/scons.svg
+   :target: https://sourceforge.net/projects/scons
+   :alt: Sourceforge Monthly Downloads
+
+.. image:: https://img.shields.io/sourceforge/dt/scons.svg
+   :target: https://sourceforge.net/projects/scons
+   :alt: Sourceforge Total Downloads
+
+.. image:: https://travis-ci.org/SCons/scons.svg?branch=master
+   :target: https://travis-ci.org/SCons/scons
+   :alt: Travis CI build status
+
+.. image:: https://ci.appveyor.com/api/projects/status/github/SCons/scons?svg=true&branch=master
+   :target: https://ci.appveyor.com/project/SCons/scons
+   :alt: AppVeyor CI build Status
+
+.. image:: https://codecov.io/gh/SCons/scons/branch/master/graph/badge.svg
+   :target: https://codecov.io/gh/SCons/scons
+   :alt: CodeCov Coverage Status
+
+About SCons
+-----------
+
+This is SCons, a tool for building software (and other files).  SCons is
+implemented in Python, and its "configuration files" are actually Python
+scripts, allowing you to use the full power of a real scripting language
+to solve build problems.  You do not, however, need to know Python to
+use SCons effectively.
+
+Documentation
+-------------
+
+Documentation for SCons is available at:
+
+        http://www.scons.org/documentation.html
+
+Requirements
+------------
+
+Running SCons requires Python 3.5 or higher. There should be no other
+dependencies or requirements to run SCons, although the pywin32 Python
+package is strongly recommended if running on Windows systems.
+
+
+By default, SCons knows how to search for available programming tools on
+various systems--see the SCons man page for details.  You may, of course,
+override the default SCons choices made by appropriate configuration of
+Environment construction variables.
+
+
+Licensing
+=========
+
+SCons is distributed under the MIT license, a full copy of which is available
+in the LICENSE file.
+
+
+Reporting Bugs
+==============
+
+The SCons project welcomes bug reports and feature requests.
+
+Please make sure you send email with the problem or feature request to
+the SCons users mailing list:
+
+        Join via: http://two.pairlist.net/mailman/listinfo/scons-users
+
+Or the SCons Discord server #scons-help channel
+
+        Server URL: https://discord.gg/bXVpWAy
+
+Once you have discussed your issue on the users mailing list and the
+community has confirmed that it is either a new bug or a duplicate of an
+existing bug, then please follow the instructions the community provides
+to file a new bug or to add yourself to the CC list for an existing bug
+
+You can explore the list of existing bugs, which may include workarounds
+for the problem you've run into on GitHub Issues:
+
+        https://github.com/SCons/scons/issues
+
+
+Mailing Lists
+=============
+
+An active mailing list for developers of SCons is available.  You may
+send questions or comments to the list at:
+
+        scons-dev@scons.org
+
+You may subscribe to the developer's mailing list using form on this page:
+
+        http://two.pairlist.net/mailman/listinfo/scons-dev
+
+Subscription to the developer's mailing list is by approval.  In practice, no
+one is refused list membership, but we reserve the right to limit membership
+in the future and/or weed out lurkers.
+
+There are other mailing lists available for SCons users, for notification of
+SCons code changes, and for notification of updated bug reports and project
+documents.  Please see our mailing lists page for details.
+
+
+Donations
+=========
+
+If you find SCons helpful, please consider making a donation (of cash,
+software, or hardware) to support continued work on the project.  Information
+is available at:
+
+    http://www.scons.org/donate.html
+
+or via GitHub Sponsors button on
+
+    https://github.com/scons/scons
+
+
+For More Information
+====================
+
+Check the SCons web site at:
+
+        http://www.scons.org/
+
+
+Copyright (c) 2001 - 2020 The SCons Foundation
+
diff --git a/SCons/__init__.py b/SCons/__init__.py
index 8520fe0a4..af01bf783 100644
--- a/SCons/__init__.py
+++ b/SCons/__init__.py
@@ -1,9 +1,9 @@
-__version__="3.9.9a996"
+__version__="3.9.9a998"
 __copyright__="Copyright (c) 2001 - 2020 The SCons Foundation"
 __developer__="bdbaddog"
-__date__="2020-06-30 23:00:35"
+__date__="2020-07-04 19:53:36"
 __buildsys__="ProDog2020"
-__revision__="8e18d0c324c2605936198e64d349c89082b1463d"
-__build__="8e18d0c324c2605936198e64d349c89082b1463d"
+__revision__="ecb9741551fa0276fccd7d8d6f1df03a4e338082"
+__build__="ecb9741551fa0276fccd7d8d6f1df03a4e338082"
 # make sure compatibility is always in place
 import SCons.compat # noqa
\ No newline at end of file
diff --git a/SConstruct b/SConstruct
index a143c9306..0ced773fb 100644
--- a/SConstruct
+++ b/SConstruct
@@ -37,7 +37,7 @@ month_year = strftime('%B %Y')
 
 
 project = 'scons'
-default_version = '3.9.9a996'
+default_version = '3.9.9a998'
 copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
 
 #
@@ -200,8 +200,8 @@ env.Command('$DISTDIR/SCons-${VERSION}-py3-none-any.whl', ['setup.cfg', 'setup.p
 
 env.Command('$DISTDIR/SCons-${VERSION}.zip', ['setup.cfg', 'setup.py', 'SCons/__init__.py'],
             '$PYTHON setup.py sdist --format=zip')
-env.Command('$DISTDIR/SCons-${VERSION}.tar.bz2', ['setup.cfg', 'setup.py', 'SCons/__init__.py'],
-            '$PYTHON setup.py sdist --format=bztar')
+env.Command('$DISTDIR/SCons-${VERSION}.tar.gz', ['setup.cfg', 'setup.py', 'SCons/__init__.py'],
+            '$PYTHON setup.py sdist --format=gztar')
 
 # TODO add auto copyright date to README.rst, LICENSE
 # TODO build API DOCS
diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml
index 5db645909..cd09c1007 100644
--- a/doc/generated/examples/caching_ex-random_1.xml
+++ b/doc/generated/examples/caching_ex-random_1.xml
@@ -1,8 +1,8 @@
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-cc -o f2.o -c f2.c
 cc -o f3.o -c f3.c
-cc -o f4.o -c f4.c
-cc -o f5.o -c f5.c
 cc -o f1.o -c f1.c
+cc -o f5.o -c f5.c
+cc -o f2.o -c f2.c
+cc -o f4.o -c f4.c
 cc -o prog f1.o f2.o f3.o f4.o f5.o
 </screen>
diff --git a/doc/generated/examples/troubleshoot_Dump_2.xml b/doc/generated/examples/troubleshoot_Dump_2.xml
index 0eb0f98e8..508082269 100644
--- a/doc/generated/examples/troubleshoot_Dump_2.xml
+++ b/doc/generated/examples/troubleshoot_Dump_2.xml
@@ -91,7 +91,7 @@ scons: Reading SConscript files ...
   'SHCXXCOM': '${TEMPFILE("$SHCXX $_MSVC_OUTPUT_FLAG /c $CHANGED_SOURCES '
               '$SHCXXFLAGS $SHCCFLAGS $_CCCOMCOM","$SHCXXCOMSTR")}',
   'SHCXXFLAGS': ['$CXXFLAGS'],
-  'SHELL': None,
+  'SHELL': 'command',
   'SHLIBPREFIX': '',
   'SHLIBSUFFIX': '.dll',
   'SHOBJPREFIX': '$OBJPREFIX',
diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml
index 98a2d1307..4e53d5e67 100644
--- a/doc/generated/examples/troubleshoot_explain1_3.xml
+++ b/doc/generated/examples/troubleshoot_explain1_3.xml
@@ -2,5 +2,5 @@
 cp file.in file.oout
 
 scons: warning: Cannot find target file.out after building
-File "/home/mats/github/scons/scripts/scons.py", line 96, in &lt;module&gt;
+File "/Users/bdbaddog/devel/scons/git/scons-bugfixes-2/scripts/scons.py", line 96, in &lt;module&gt;
 </screen>
diff --git a/setup.cfg b/setup.cfg
index c3c396e28..1577010a5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,10 +1,9 @@
 [metadata]
 name = SCons
-;version=3.9.9a993
 license = MIT
 author = William Deegan
 author_email =bill@baddogconsulting.com
-long_description = file: README.rst
+long_description = file: README-package.rst
 long_description_content_type = text/x-rst
 description = Open Source next-generation build tool.
 group = Development/Tools
@@ -41,7 +40,10 @@ classifiers =
 [options]
 zip_safe = False
 python_requires = >=3.5
-install_requires = setuptools
+install_requires =
+    setuptools
+    pywin32 >= 1.0;platform_system=="Windows"
+
 setup_requires = setuptools
 include_package_data = True
 packages = find: