summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2019-07-13 18:36:51 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2019-07-13 18:36:51 (GMT)
commit2f38ee65e95cdcea441f028d7c3ce9d1b4746862 (patch)
tree24962747dbc7e79c20cdc12b103bc439afb98131
parent26dc1670b9d7fc67e70912bb4a74783c299483c6 (diff)
downloadSCons-2f38ee65e95cdcea441f028d7c3ce9d1b4746862.zip
SCons-2f38ee65e95cdcea441f028d7c3ce9d1b4746862.tar.gz
SCons-2f38ee65e95cdcea441f028d7c3ce9d1b4746862.tar.bz2
[ci skip] re-add generation of src-tar-gz and src-zip files as they're used by debian scons packager
-rw-r--r--SConstruct11
-rwxr-xr-xbin/upload-release-files.sh12
2 files changed, 14 insertions, 9 deletions
diff --git a/SConstruct b/SConstruct
index dc9ee5d..d4b3e00 100644
--- a/SConstruct
+++ b/SConstruct
@@ -204,6 +204,10 @@ 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")
@@ -851,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 014134a..9a09206 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 \