[latex3-commits] [git/l3build] master: Retain doc/source struture in CTAN uploads (a998843)

[Joseph Wright]

Repository : https://github.com/latex3/l3build
On branch  : master
Link       : https://github.com/latex3/l3build/commit/a998843cbe7714a6e050bbc047c8dd5228bdb685

>---------------------------------------------------------------

commit a998843cbe7714a6e050bbc047c8dd5228bdb685
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sat Dec 9 17:07:02 2017 +0000

    Retain doc/source struture in CTAN uploads
    
    Presumably this  is the likely desire.


>---------------------------------------------------------------

a998843cbe7714a6e050bbc047c8dd5228bdb685
 l3build.lua |   17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/l3build.lua b/l3build.lua
index 1184198..3d94ddb 100644
--- a/l3build.lua
+++ b/l3build.lua
@@ -860,7 +860,11 @@ end
 
 -- Copy files to the main CTAN release directory
 function copyctan()
-  -- Do all of the copying in one go
+  local ctantarget = ctanpkg
+  if docfiledir ~= currentdir then
+    ctantarget = ctanpkg .. "/" .. gsub(docfiledir, "^%.*/", "")
+    print(ctantarget)
+  end
   for _,filetype in pairs(
       {
         bibfiles,
@@ -871,11 +875,18 @@ function copyctan()
       }
     ) do
     for _,file in pairs(filetype) do
-      cp(file, docfiledir, ctandir .. "/" .. ctanpkg)
+      cp(file, docfiledir, ctandir .. "/" .. ctantarget)
     end
   end
+  ctantarget = ctanpkg
+  if sourcefiledir ~= currentdir then
+    ctantarget = ctanpkg .. "/" .. gsub(sourcefiledir, "^%.*/", "")
+    print(ctantarget)
+  end
   for _,file in pairs(sourcefiles) do
-    cp(file, sourcefiledir, ctandir .. "/" .. ctanpkg)
+    if sourcedir ~= currentdir then
+    end
+    cp(file, sourcefiledir, ctandir .. "/" .. ctantarget)
   end
   for _,file in pairs(textfiles) do
     cp(file, currentdir, ctandir .. "/" .. ctanpkg)