summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2015-09-21 18:10:58 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2015-09-21 18:10:58 (GMT)
commitc575e233bfdb9f2ce9a368cfe1ca70366fb02873 (patch)
tree54a816f30eec891b3ecc2e0028f487f1f2cad6a4 /bin
parent859dd4545a76e4f2d7bc90e8193a9175fbc0060b (diff)
parent07efb42b5d952fb628471601227144ca167d6313 (diff)
downloadSCons-c575e233bfdb9f2ce9a368cfe1ca70366fb02873.zip
SCons-c575e233bfdb9f2ce9a368cfe1ca70366fb02873.tar.gz
SCons-c575e233bfdb9f2ce9a368cfe1ca70366fb02873.tar.bz2
change tree back to development mode and bring back changes from release branch
Diffstat (limited to 'bin')
-rw-r--r--bin/update-release-info.py1
-rwxr-xr-xbin/upload-release-files.sh11
2 files changed, 10 insertions, 2 deletions
diff --git a/bin/update-release-info.py b/bin/update-release-info.py
index 59b3e84..896f54a 100644
--- a/bin/update-release-info.py
+++ b/bin/update-release-info.py
@@ -295,6 +295,7 @@ t = UpdateFile(os.path.join('src', 'Announce.txt'))
if DEBUG: t.file = '/tmp/Announce.txt'
t.sub('\nRELEASE .*', '\nRELEASE ' + version_string + ' - ' + t.new_date)
+
# Update SConstruct
t = UpdateFile('SConstruct')
diff --git a/bin/upload-release-files.sh b/bin/upload-release-files.sh
index 735f143..c853bda 100755
--- a/bin/upload-release-files.sh
+++ b/bin/upload-release-files.sh
@@ -17,9 +17,10 @@ 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 .
+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
@@ -28,7 +29,7 @@ $RSYNC $RSYNCOPTS \
scons-$VERSION-1.noarch.rpm \
scons-$VERSION-1.src.rpm \
scons-$VERSION-setup.exe \
- scons-$VERSION.win-amd64.exe \
+ scons-$VERSION-amd64-setup.exe \
scons-$VERSION.tar.gz \
scons-$VERSION.zip \
Announce.txt CHANGES.txt RELEASE.txt \
@@ -48,6 +49,12 @@ $RSYNC $RSYNCOPTS \
Announce.txt CHANGES.txt RELEASE.txt \
$SF_USER@$SF_MACHINE:$SF_TOPDIR/scons-src/$VERSION/
+# Readme
+$RSYNC $RSYNCOPTS \
+ README.txt \
+ $SF_USER@$SF_MACHINE:$SF_TOPDIR/
+
+
#
# scons.org stuff: