summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2019-01-01 10:31:40 -0800
committerWilliam Deegan <bill@baddogconsulting.com>2019-01-01 10:31:40 -0800
commit425375072d7b582a2df0db815c8eaeaa489468ab (patch)
tree9139ff91b7f8b8807e0bd4bc21a166b32816d98b
parent16778d084120c7c20e2ff6a5fe05145a2ad68441 (diff)
downloadscons-git-425375072d7b582a2df0db815c8eaeaa489468ab.tar.gz
Updates for 3.0.2
-rwxr-xr-xbin/upload-release-files.sh7
-rw-r--r--src/setup.py1
2 files changed, 1 insertions, 7 deletions
diff --git a/bin/upload-release-files.sh b/bin/upload-release-files.sh
index c853bdaa9..8206ed4f3 100755
--- a/bin/upload-release-files.sh
+++ b/bin/upload-release-files.sh
@@ -19,17 +19,10 @@ SF_TOPDIR='/home/frs/project/scons'
cd build/dist
cp -f ../../src/CHANGES.txt ../../src/RELEASE.txt ../../src/Announce.txt ../../src/README.txt .
-cp scons-$VERSION.win32.exe scons-$VERSION-setup.exe
-cp scons-$VERSION.win-amd64.exe scons-$VERSION-amd64-setup.exe
-
set -x
# Upload main scons release files:
$RSYNC $RSYNCOPTS \
- scons-$VERSION-1.noarch.rpm \
- scons-$VERSION-1.src.rpm \
- scons-$VERSION-setup.exe \
- scons-$VERSION-amd64-setup.exe \
scons-$VERSION.tar.gz \
scons-$VERSION.zip \
Announce.txt CHANGES.txt RELEASE.txt \
diff --git a/src/setup.py b/src/setup.py
index 273da18e5..c68d5668e 100644
--- a/src/setup.py
+++ b/src/setup.py
@@ -66,6 +66,7 @@ if not sys.platform == 'win32':
else:
is_win32 = 1
+import setuptools
import distutils
import distutils.core
import distutils.command.install