From 74cfe9885c8f083bf8d8cb7e4ee0ec98e81635b9 Mon Sep 17 00:00:00 2001
From: Matti Picus <matti.picus@gmail.com>
Date: Sat, 3 Oct 2020 20:33:35 +0300
Subject: simplify source repackaging via hg archive, creates .hg_archival.txt,
 issue 3315

---
 pypy/tool/release/repackage.sh | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

(limited to 'pypy/tool')

diff --git a/pypy/tool/release/repackage.sh b/pypy/tool/release/repackage.sh
index 0b7e9b7cc9..b6b4f801c2 100755
--- a/pypy/tool/release/repackage.sh
+++ b/pypy/tool/release/repackage.sh
@@ -106,32 +106,10 @@ function repackage_builds {
     fi
 }
 
-function create_archival {
-    if [ -e $1 ]; then
-        return 0;
-    fi
-    echo repo: 45eff22199974f85fd96138d25510f4660aba5a1 > $1
-    hg log -r $tagname -T 'node: {node}\n' >> $1
-    echo branch: $branchname >> $1
-    echo tag: $tagname >> $1
-}
-
 function repackage_source {
-    # Download source and repackage
-    # Requires a valid $tagname, note the untarred directory is pypy-pypy-<hash>
-    # so make sure there is not another one
-    if wget https://foss.heptapod.net/pypy/pypy/repository/$tagname/archive.tar.gz
-    then
-        tar -xf archive.tar.gz
-        rm archive.tar.gz
-        mv pypy-release-* $rel-src
-        create_archival  $rel-src/.hg_archival.txt
-        tar --owner=root --group=root --numeric-owner -cjf $rel-src.tar.bz2 $rel-src
-        zip -rq $rel-src.zip $rel-src
-        rm -rf $rel-src
-    else
-        echo source tarfile for $tagname not found on bitbucket, did you push the tag commit?
-    fi
+    # Requires a valid $tagname
+    hg archive -r $tagname $rel-src.tar.bz2
+    hg archive -r $tagname $rel-src.zip
 }
 
 function print_sha256 {
-- 
cgit v1.2.3-65-gdbad