From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 5 Sep 2024 14:31:38 +0000 (+0200)
Subject: maketgz: move from / into scripts
X-Git-Tag: curl-8_10_0~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c14d696feecf66dcbc7987c14d0ab7f3f08da7a;p=thirdparty%2Fcurl.git

maketgz: move from / into scripts

Closes #14797
---

diff --git a/.github/workflows/distcheck.yml b/.github/workflows/distcheck.yml
index ad89871fc6..a4590174a2 100644
--- a/.github/workflows/distcheck.yml
+++ b/.github/workflows/distcheck.yml
@@ -40,7 +40,7 @@ jobs:
 
       - name: 'maketgz'
         run: |
-          SOURCE_DATE_EPOCH=1711526400 ./maketgz 99.98.97
+          SOURCE_DATE_EPOCH=1711526400 ./scripts/maketgz 99.98.97
 
       - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
         with:
diff --git a/Dockerfile b/Dockerfile
index e2e51a3474..08944148ce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@
 #   docker run --rm -it -u $(id -u):$(id -g) -v $(pwd):/usr/src -w /usr/src curl/curl autoreconf -fi
 #   docker run --rm -it -u $(id -u):$(id -g) -v $(pwd):/usr/src -w /usr/src curl/curl ./configure --without-ssl --without-libpsl
 #   docker run --rm -it -u $(id -u):$(id -g) -v $(pwd):/usr/src -w /usr/src curl/curl make
-#   docker run --rm -it -u $(id -u):$(id -g) -v $(pwd):/usr/src -w /usr/src curl/curl ./maketgz 8.7.1
+#   docker run --rm -it -u $(id -u):$(id -g) -v $(pwd):/usr/src -w /usr/src curl/curl ./scripts/maketgz 8.7.1
 #
 # or get into a shell in the build environment, for example
 #
@@ -21,7 +21,7 @@
 #   $ autoreconf -fi
 #   $ ./configure --without-ssl --without-libpsl
 #   $ make
-#   $ ./maketgz 8.7.1
+#   $ ./scripts/maketgz 8.7.1
 
 # To update, get the latest digest e.g. from https://hub.docker.com/_/debian/tags
 FROM debian:bookworm-slim@sha256:903d3225acecaa272bbdd7273c6c312c2af8b73644058838d23a8c9e6e5c82cf
diff --git a/Makefile.am b/Makefile.am
index ecbaf4d266..968825eea2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,7 +82,7 @@ PLAN9_DIST = plan9/include/mkfile \
  plan9/src/mkfile.inc             \
  plan9/src/mkfile
 
-EXTRA_DIST = CHANGES.md COPYING maketgz Makefile.dist curl-config.in    \
+EXTRA_DIST = CHANGES.md COPYING Makefile.dist curl-config.in    \
  RELEASE-NOTES libcurl.pc.in $(CMAKE_DIST) $(VC_DIST) $(WINBUILD_DIST)  \
  $(PLAN9_DIST) lib/libcurl.vers.in buildconf.bat Dockerfile
 
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 198273d7b7..546041074e 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -24,7 +24,7 @@
 
 EXTRA_DIST = coverage.sh completion.pl firefox-db2pem.sh checksrc.pl    \
  mk-ca-bundle.pl schemetable.c cd2nroff nroff2cd cdall cd2cd managen \
- dmaketgz release-tools.sh verify-release cmakelint.sh
+ dmaketgz maketgz release-tools.sh verify-release cmakelint.sh
 
 ZSH_FUNCTIONS_DIR = @ZSH_FUNCTIONS_DIR@
 FISH_FUNCTIONS_DIR = @FISH_FUNCTIONS_DIR@
diff --git a/scripts/dmaketgz b/scripts/dmaketgz
index 88efb1c0f5..e585442753 100755
--- a/scripts/dmaketgz
+++ b/scripts/dmaketgz
@@ -51,4 +51,4 @@ docker run --rm -u "$(id -u):$(id -g)" \
   autoreconf -fi
   ./configure --without-ssl --without-libpsl
   make -sj8
-  ./maketgz $version"
+  ./scripts/maketgz $version"
diff --git a/maketgz b/scripts/maketgz
similarity index 100%
rename from maketgz
rename to scripts/maketgz
diff --git a/scripts/release-tools.sh b/scripts/release-tools.sh
index 86cde74902..faf5d32603 100755
--- a/scripts/release-tools.sh
+++ b/scripts/release-tools.sh
@@ -70,6 +70,6 @@ cat <<MOO
 ## Generate the tarball with the same timestamp
 
 - export SOURCE_DATE_EPOCH=$timestamp
-- ./maketgz [version]
+- ./scripts/maketgz [version]
 
 MOO