summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2019-07-13 14:25:08 -0400
committerWilliam Deegan <bill@baddogconsulting.com>2019-07-13 14:25:08 -0400
commit103260fce95bf5db1c35fb2371983087d85dd611 (patch)
treea82fb796eef1e817e74f3cd44f4708819219c60e
parenta56bbd8c09fb219ab8a9673330ffcd55279219d0 (diff)
downloadscons-git-rel_3.0.5.tar.gz
Re-add src packages3.0.5.1rel_3.0.5
-rw-r--r--SConstruct12
-rwxr-xr-xbin/upload-release-files.sh12
2 files changed, 15 insertions, 9 deletions
diff --git a/SConstruct b/SConstruct
index 590aedf32..7a95fbf7b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -202,6 +202,11 @@ packaging_flavors = [
('zip', "The normal .zip file for end-user installation."),
('local-zip', "A .zip file for dropping into other software " +
"for local use."),
+ ('src-tar-gz', "A .tar.gz file containing all the source " +
+ "(including tests and documentation)."),
+ ('src-zip', "A .zip file containing all the source " +
+ "(including tests and documentation)."),
+
]
test_tar_gz_dir = os.path.join(build_dir, "test-tar-gz")
@@ -850,10 +855,11 @@ SConscript('doc/SConscript')
#
-sfiles = None
+sfiles = [l.split()[-1] for l in git_status_lines]
if git_status_lines:
- slines = [l for l in git_status_lines if 'modified:' in l]
- sfiles = [l.split()[-1] for l in slines]
+ # slines = [l for l in git_status_lines if 'modified:' in l]
+ # sfiles = [l.split()[-1] for l in slines]
+ pass
else:
print("Not building in a Git tree; skipping building src package.")
diff --git a/bin/upload-release-files.sh b/bin/upload-release-files.sh
index 014134aea..9a09206cc 100755
--- a/bin/upload-release-files.sh
+++ b/bin/upload-release-files.sh
@@ -35,12 +35,12 @@ $RSYNC $RSYNCOPTS \
Announce.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 \
+ Announce.txt CHANGES.txt RELEASE.txt \
+ $SF_USER@$SF_MACHINE:$SF_TOPDIR/scons-src/$VERSION/
# Readme
$RSYNC $RSYNCOPTS \