From b0f2bc55aec9df26426a1ed8db257cde2cba6db6 Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Wed, 30 Oct 2019 17:18:58 +0100
Subject: Remove verbosity for tar

---
 .gitignore          | 18 +++++++++++-------
 .gitlab-ci.yml      |  2 +-
 Configure.pl        |  4 ++--
 tools/star/Makefile | 12 +++++++++++-
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index a80f75d..3e45564 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,16 @@
+# Editor specific files
+*.swp
+*~
+\#*#
+
+# Temporary files used to build a new Rakudo Star release
 MANIFEST
-rakudo
-nqp
+Makefile
 MoarVM
-src
 config.status
-Makefile
 install
+nqp
 perl6
-*.swp
-*~
-\#*#
+rakudo
+release
+src
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7a60ba7..e243cfc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ moar:
   before_script:
     - apk add --no-cache bash build-base git perl
     - cd "$(mktemp -d)"
-    - tar xvf "$CI_PROJECT_DIR/release/rakudo-star-$CI_COMMIT_REF_NAME.tar.gz"
+    - tar xf "$CI_PROJECT_DIR/release/rakudo-star-$CI_COMMIT_REF_NAME.tar.gz"
   script:
     - cd "rakudo-star-$CI_COMMIT_REF_NAME"
     - perl Configure.pl --prefix=/usr/local --backend=moar --gen-moar
diff --git a/Configure.pl b/Configure.pl
index 0627b2f..42e053c 100644
--- a/Configure.pl
+++ b/Configure.pl
@@ -171,7 +171,7 @@ MAIN: {
     my @prefixes = sort map substr($_, 0, 1), keys %backends;
 
     # determine the version of NQP we want
-    my ($nqp_want) = split(' ', slurp('rakudo/tools/build/NQP_REVISION'));
+    my ($nqp_want) = split(' ', slurp('rakudo/tools/templates/NQP_REVISION'));
 
     my %binaries;
     my %impls = gen_nqp($nqp_want, prefix => $prefix, backends => join(',', sort keys %backends), %options);
@@ -239,7 +239,7 @@ MAIN: {
     }
     sorry(@errors) if @errors;
 
-    fill_template_file('tools/build/Makefile.in', 'Makefile', %config);
+    fill_template_file('tools/template/Makefile.in', 'Makefile', %config);
 
     unless ($options{'no-clean'}) {
         no warnings;
diff --git a/tools/star/Makefile b/tools/star/Makefile
index 0026a5c..afb49ec 100644
--- a/tools/star/Makefile
+++ b/tools/star/Makefile
@@ -77,8 +77,18 @@ patch:
 tarball: manifest
 	[ -n "$(VERSION)" ] || ( echo "\nTry '$(MAKE) release VERSION=yyyy.mm'\n\n"; exit 1 )
 	[ -d $(STAR_REL) ] || ln -s . $(STAR_REL)
+
 	mkdir -p "release"
-	$(PREFIX) $(STAR_REL)/ MANIFEST | $(TAR) -zcv -T - -f "release/$(STAR_TGZ)"
+
+	$(PREFIX) $(STAR_REL)/ MANIFEST \
+		| grep -Ev '^$(STAR_REL)/release/' \
+		| $(TAR) -zc -T - -f "release/$(STAR_TGZ)"
+
 	rm $(STAR_REL)
 
 release: tarball
+
+clean:
+	rm -fr rakudo
+	rm -fr nqp
+	rm -fr MoarVM
-- 
cgit v1.1