Merge commit '107ce3050fc37b9a13d8304ae1bb73fac9de5f61'

2 files changed, 78 insertions, 31 deletions

diff --git a/admin/nt/dist-build/build-dep-zips.py b/admin/nt/dist-build/build-dep-zips.py
index f0e96f43c8c..5698f5179c8 100755
--- a/admin/nt/dist-build/build-dep-zips.py
+++ b/admin/nt/dist-build/build-dep-zips.py
@@ -28,13 +28,33 @@ from subprocess import check_output
 ## Constants
 EMACS_MAJOR_VERSION="27"
 
+# This list derives from the features we want Emacs to compile with.
+PKG_REQ='''mingw-w64-x86_64-giflib
+mingw-w64-x86_64-gnutls
+mingw-w64-x86_64-lcms2
+mingw-w64-x86_64-libjpeg-turbo
+mingw-w64-x86_64-libpng
+mingw-w64-x86_64-librsvg
+mingw-w64-x86_64-libtiff
+mingw-w64-x86_64-libxml2
+mingw-w64-x86_64-xpm-nox'''.split()
+
 
 ## Options
 DRY_RUN=False
 
 ## Packages to fiddle with
-SKIP_PKGS=["mingw-w64-gcc-libs"]
-MUNGE_PKGS ={"mingw-w64-libwinpthread-git":"mingw-w64-winpthreads-git"}
+## Source for gcc-libs is part of gcc
+SKIP_SRC_PKGS=["mingw-w64-gcc-libs"]
+SKIP_DEP_PKGS=["mingw-w64-x86_64-glib2"]
+MUNGE_SRC_PKGS={"mingw-w64-libwinpthread-git":"mingw-w64-winpthreads-git"}
+MUNGE_DEP_PKGS={
+    "mingw-w64-i686-libwinpthread":"mingw-w64-i686-libwinpthread-git",
+    "mingw-w64-x86_64-libwinpthread":"mingw-w64-x86_64-libwinpthread-git",
+
+    "mingw-w64-x86_64-libtre": "mingw-w64-x86_64-libtre-git",
+    "mingw-w64-i686-libtre": "mingw-w64-i686-libtre-git"
+}
 
 ## Currently no packages seem to require this!
 ARCH_PKGS=[]
@@ -47,28 +67,40 @@ def check_output_maybe(*args,**kwargs):
     else:
         return check_output(*args,**kwargs)
 
+def immediate_deps(pkg):
+    package_info = check_output(["pacman", "-Si", pkg]).decode("utf-8").split("\n")
+
+    ## Extract the "Depends On" line
+    depends_on = [x for x in package_info if x.startswith("Depends On")][0]
+    ## Remove "Depends On" prefix
+    dependencies = depends_on.split(":")[1]
+
+    ## Split into dependencies
+    dependencies = dependencies.strip().split(" ")
+
+    ## Remove > signs TODO can we get any other punctation here?
+    dependencies = [d.split(">")[0] for d in dependencies if d]
+    dependencies = [d for d in dependencies if not d == "None"]
+
+    dependencies = [MUNGE_DEP_PKGS.get(d, d) for d in dependencies]
+    return dependencies
+
+
 def extract_deps():
 
     print( "Extracting deps" )
-    # This list derives from the features we want Emacs to compile with.
-    PKG_REQ='''mingw-w64-x86_64-giflib
-mingw-w64-x86_64-gnutls
-mingw-w64-x86_64-harfbuzz
-mingw-w64-x86_64-lcms2
-mingw-w64-x86_64-libjpeg-turbo
-mingw-w64-x86_64-libpng
-mingw-w64-x86_64-librsvg
-mingw-w64-x86_64-libtiff
-mingw-w64-x86_64-libxml2
-mingw-w64-x86_64-xpm-nox'''.split()
 
     # Get a list of all dependencies needed for packages mentioned above.
-    # Run `pactree -lu' for each element of $PKG_REQ.
-    pkgs = set()
-    for x in PKG_REQ:
-        pkgs.update(
-            check_output(["pactree", "-lu", x]).decode("utf-8").split()
-        )
+    pkgs = PKG_REQ[:]
+    print("Initial pkgs", pkgs)
+    n = 0
+    while n < len(pkgs):
+        subdeps = immediate_deps(pkgs[n])
+        for p in subdeps:
+            if not (p in pkgs or p in SKIP_DEP_PKGS):
+                print("adding", p)
+                pkgs.append(p)
+        n = n + 1
 
     return sorted(pkgs)
 
@@ -112,13 +144,20 @@ def gather_deps(deps, arch, directory):
 
 
 def download_source(tarball):
-    print("Downloading {}...".format(tarball))
-    check_output_maybe(
-        "wget -a ../download.log -O {} {}/{}/download"
-        .format(tarball, SRC_REPO, tarball),
-        shell=True
-    )
-    print("Downloading {}... done".format(tarball))
+    print("Acquiring {}...".format(tarball))
+
+    if os.path.exists("../emacs-src-cache/{}".format(tarball)):
+        print("Copying {} from local".format(tarball))
+        shutil.copyfile("../emacs-src-cache/{}".format(tarball),
+                        "{}".format(tarball))
+    else:
+        print("Downloading {}...".format(tarball))
+        check_output_maybe(
+            "wget -a ../download.log -O {} {}/{}/download"
+            .format(tarball, SRC_REPO, tarball),
+            shell=True
+        )
+        print("Downloading {}... done".format(tarball))
 
 def gather_source(deps):
 
@@ -146,7 +185,7 @@ def gather_source(deps):
         ## make a simple name to make lookup easier
         simple_pkg_name = re.sub(r"x86_64-","",pkg_name)
 
-        if(simple_pkg_name in SKIP_PKGS):
+        if(simple_pkg_name in SKIP_SRC_PKGS):
             continue
 
         ## Some packages have different source files for different
@@ -159,7 +198,7 @@ def gather_source(deps):
 
         for d in downloads:
             ## Switch names if necessary
-            d = MUNGE_PKGS.get(d,d)
+            d = MUNGE_SRC_PKGS.get(d,d)
 
             tarball = "{}-{}.src.tar.gz".format(d,pkg_version)
 
@@ -209,6 +248,9 @@ parser.add_argument("-c", help="clean only",
 parser.add_argument("-d", help="dry run",
                     action="store_true")
 
+parser.add_argument("-l", help="list dependencies only",
+                    action="store_true")
+
 args = parser.parse_args()
 do_all=not (args.c or args.r or args.f or args.t)
 
@@ -216,6 +258,11 @@ deps=extract_deps()
 
 DRY_RUN=args.d
 
+if( args.l ):
+    print("List of dependencies")
+    print( extract_deps() )
+    exit(0)
+
 if args.s:
     DATE="{}-".format(check_output(["date", "+%Y-%m-%d"]).decode("utf-8").strip())
 else:
diff --git a/admin/upload-manuals b/admin/upload-manuals
index 08b47d741d7..e37128a2076 100755
--- a/admin/upload-manuals
+++ b/admin/upload-manuals
@@ -87,6 +87,9 @@ OPTIND=1
 
 [ $# -eq 1 ] || usage
 
+[ -e html_mono/emacs.html ] && [ -e html_node/emacs/index.html ] || \
+    die "Current directory does not look like the manual/ directory"
+
 [ "$version$umessage" ] || \
     die "Could not get version to use for commit message"
 
@@ -95,9 +98,6 @@ webdir=$1
 [ -e $webdir/CVS/Entries ] && [ -e $webdir/refcards/pdf/refcard.pdf ] || \
     die "$webdir does not look like a checkout of the Emacs webpages"
 
-[ -e html_mono/emacs.html ] && [ -e html_node/emacs/index.html ] || \
-    die "Current directory does not like the manual/ directory"
-
 
 echo "Doing refcards..."