From 074c847ad977b777f6b1580e24b14cf92b2f06d8 Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Sat, 4 Jul 2020 14:56:03 -0700
Subject: 4.0.0 release

---
 SCons/__init__.py           |  8 ++++----
 bin/upload-release-files.sh | 27 ++++++++++++++-------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/SCons/__init__.py b/SCons/__init__.py
index af01bf7..3a0fc80 100644
--- a/SCons/__init__.py
+++ b/SCons/__init__.py
@@ -1,9 +1,9 @@
-__version__="3.9.9a998"
+__version__="4.0.0"
 __copyright__="Copyright (c) 2001 - 2020 The SCons Foundation"
 __developer__="bdbaddog"
-__date__="2020-07-04 19:53:36"
+__date__="2020-07-04 21:25:16"
 __buildsys__="ProDog2020"
-__revision__="ecb9741551fa0276fccd7d8d6f1df03a4e338082"
-__build__="ecb9741551fa0276fccd7d8d6f1df03a4e338082"
+__revision__="d61fcebe8bdbdc576157109494d2a776ae134bc1"
+__build__="d61fcebe8bdbdc576157109494d2a776ae134bc1"
 # make sure compatibility is always in place
 import SCons.compat # noqa
\ No newline at end of file
diff --git a/bin/upload-release-files.sh b/bin/upload-release-files.sh
index b23b0a0..ffa5321 100755
--- a/bin/upload-release-files.sh
+++ b/bin/upload-release-files.sh
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 set -x
 
-if [ $# -lt 2 ]; then
+if [[ $# -lt 2 ]]; then
 	echo Usage: $0 VERSION SF_USERNAME
 	exit 1
 fi
@@ -17,13 +17,14 @@ SF_TOPDIR='/home/frs/project/scons'
 
 # the build products are here:
 cd build/dist
-cp -f ../../src/CHANGES.txt ../../src/RELEASE.txt ../../src/Announce.txt ../../src/README.txt .
+cp -f ../../CHANGES.txt ../../RELEASE.txt  .
+cp -f ../../README-sf.rst ./README.rst
 
 set -x
 
 # upload README
 $RSYNC $RSYNCOPTS\
-       README-SF.rst bdbaddog@frs.sourceforge.net:/home/frs/project/scons/ \
+       README.rst \
        $SF_USER@$SF_MACHINE:$SF_TOPDIR/scons/
 
 	
@@ -31,22 +32,22 @@ $RSYNC $RSYNCOPTS\
 $RSYNC $RSYNCOPTS \
   scons-$VERSION.tar.gz \
   scons-$VERSION.zip \
-  Announce.txt CHANGES.txt RELEASE.txt \
+  CHANGES.txt RELEASE.txt \
   $SF_USER@$SF_MACHINE:$SF_TOPDIR/scons/$VERSION/
 
 # Local packages:
 $RSYNC $RSYNCOPTS \
   scons-local-$VERSION.tar.gz \
   scons-local-$VERSION.zip \
-  Announce.txt CHANGES.txt RELEASE.txt \
+  CHANGES.txt RELEASE.txt \
   $SF_USER@$SF_MACHINE:$SF_TOPDIR/scons-local/$VERSION/
 
-# Source packages:
-$RSYNC $RSYNCOPTS \
- scons-src-$VERSION.tar.gz \
- scons-src-$VERSION.zip \
- Announce.txt CHANGES.txt RELEASE.txt \
- $SF_USER@$SF_MACHINE:$SF_TOPDIR/scons-src/$VERSION/
+## Source packages:
+#$RSYNC $RSYNCOPTS \
+# scons-src-$VERSION.tar.gz \
+# scons-src-$VERSION.zip \
+# CHANGES.txt RELEASE.txt \
+# $SF_USER@$SF_MACHINE:$SF_TOPDIR/scons-src/$VERSION/
 
 # Readme
 $RSYNC $RSYNCOPTS \
@@ -68,7 +69,7 @@ $RSYNC $RSYNCOPTS \
 # Note that Announce.txt gets copied over to RELEASE.txt.
 # This should be fixed at some point.
 $RSYNC $RSYNCOPTS \
-  Announce.txt \
+  RELEASE.txt \
   scons@scons.org:public_html/production/RELEASE.txt
 # Unpack the doc and repoint doc symlinks:
 ssh scons@scons.org "
-- 
cgit v0.12