diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/context/lua/mtx-update.lua | 37 | ||||
| -rw-r--r-- | scripts/context/lua/mtxrun.lua | 12 | ||||
| -rw-r--r-- | scripts/context/stubs/mswin/mtxrun.lua | 12 | ||||
| -rw-r--r-- | scripts/context/stubs/mswin/setuptex.bat | 24 | ||||
| -rw-r--r-- | scripts/context/stubs/unix/mtxrun | 12 | 
5 files changed, 78 insertions, 19 deletions
| diff --git a/scripts/context/lua/mtx-update.lua b/scripts/context/lua/mtx-update.lua index 25a5ac527..1c586cb76 100644 --- a/scripts/context/lua/mtx-update.lua +++ b/scripts/context/lua/mtx-update.lua @@ -17,7 +17,7 @@ local helpinfo = [[   <metadata>    <entry name="name">mtx-update</entry>    <entry name="detail">ConTeXt Minimals Updater</entry> -  <entry name="version">0.31</entry> +  <entry name="version">1.01</entry>   </metadata>   <flags>    <category name="basic"> @@ -48,7 +48,7 @@ local helpinfo = [[  local application = logs.application {      name     = "mtx-update", -    banner   = "ConTeXt Minimals Updater 0.31", +    banner   = "ConTeXt Minimals Updater 1.01",      helpinfo = helpinfo,  } @@ -162,9 +162,16 @@ scripts.update.platforms = {      ["windows"]        = "mswin",      ["win32"]          = "mswin",      ["win"]            = "mswin", -    ["mswin-64"]       = "mswin-64", -    ["windows-64"]     = "mswin-64", -    ["win64"]          = "mswin-64", +-- ["mswin"]          = "win32", +-- ["windows"]        = "win32", +-- ["win32"]          = "win32", +-- ["win"]            = "win32", +-- ["mswin-64"]       = "mswin-64", +-- ["windows-64"]     = "mswin-64", +-- ["win64"]          = "mswin-64", +["mswin-64"]       = "win64", +["windows-64"]     = "win64", +["win64"]          = "win64",      ["linux"]          = "linux",      ["freebsd"]        = "freebsd",      ["freebsd-amd64"]  = "freebsd-amd64", @@ -191,6 +198,13 @@ scripts.update.platforms = {      ["solaris"]        = "solaris-sparc",  } + +local windowsplatform = { +    ["mswin"] = true, +    ["win32"] = true, +    ["win64"] = true, +} +  scripts.update.selfscripts = {      "mtxrun",   -- "luatools", @@ -328,17 +342,26 @@ function scripts.update.synchronize()          -- rsync://contextgarden.net/minimals/current/modules/ +        local available_platforms = get_list_of_files_from_rsync({"bin/luatex/"}) + +        report("available platforms: % t",table.sorted(available_platforms)) +          if modules and type(modules) == "table" then              -- fetch the list of available modules from rsync server -            local available_modules = get_list_of_files_from_rsync({"modules/"}) +         -- local available_modules = get_list_of_files_from_rsync({"modules/"})              -- hash of requested modules              -- local h = table.tohash(modules:split(",")) +            local available_modules = get_list_of_files_from_rsync({"modules/"})              local asked = table.copy(modules)              asked.all = nil +            report("available modules: %s",#available_modules)              for i=1,#available_modules do                  local s = available_modules[i]                  if modules.all or modules[s] then                      scripts.update.modules[#scripts.update.modules+1] = { format("modules/%s/",s), "texmf-modules" } +                    report("+ %s",s) +                else +                    report("  %s",s)                  end                  asked[s] = nil              end @@ -450,7 +473,7 @@ function scripts.update.synchronize()              platform = scripts.update.platforms[platform]              if platform then                  local command -                if platform == 'mswin' then +                if windowsplatform[platform] then                      bin = drive(bin)                      texroot = drive(texroot)                      command = format([[%s -t "%s/texmf-context/scripts/context/lua/%s.lua" "%s/texmf-mswin/bin/"]], bin, texroot, script, texroot) diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua index fcd72b029..a0e39e8db 100644 --- a/scripts/context/lua/mtxrun.lua +++ b/scripts/context/lua/mtxrun.lua @@ -2575,7 +2575,7 @@ do -- create closure to overcome 200 locals limit  package.loaded["l-os"] = package.loaded["l-os"] or true --- original size: 15800, stripped down to: 9551 +-- original size: 15915, stripped down to: 9551  if not modules then modules={} end modules ['l-os']={    version=1.001, @@ -16624,8 +16624,8 @@ end -- of closure  -- used libraries    : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua  -- skipped libraries : - --- original bytes    : 683243 --- stripped bytes    : 241891 +-- original bytes    : 683358 +-- stripped bytes    : 242006  -- end library merge @@ -17635,7 +17635,11 @@ if e_argument("script") or e_argument("scripts") then      -- run a script by loading it (using libs), pass args -    runners.loadbase() +    if e_argument("nofiledatabase") then +        -- handy for mtx-update +    else +        runners.loadbase() +    end      if is_mkii_stub then          ok = runners.execute_script(filename,false,true)      else diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua index fcd72b029..a0e39e8db 100644 --- a/scripts/context/stubs/mswin/mtxrun.lua +++ b/scripts/context/stubs/mswin/mtxrun.lua @@ -2575,7 +2575,7 @@ do -- create closure to overcome 200 locals limit  package.loaded["l-os"] = package.loaded["l-os"] or true --- original size: 15800, stripped down to: 9551 +-- original size: 15915, stripped down to: 9551  if not modules then modules={} end modules ['l-os']={    version=1.001, @@ -16624,8 +16624,8 @@ end -- of closure  -- used libraries    : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua  -- skipped libraries : - --- original bytes    : 683243 --- stripped bytes    : 241891 +-- original bytes    : 683358 +-- stripped bytes    : 242006  -- end library merge @@ -17635,7 +17635,11 @@ if e_argument("script") or e_argument("scripts") then      -- run a script by loading it (using libs), pass args -    runners.loadbase() +    if e_argument("nofiledatabase") then +        -- handy for mtx-update +    else +        runners.loadbase() +    end      if is_mkii_stub then          ok = runners.execute_script(filename,false,true)      else diff --git a/scripts/context/stubs/mswin/setuptex.bat b/scripts/context/stubs/mswin/setuptex.bat index 5f30bfd4e..b61fd4494 100644 --- a/scripts/context/stubs/mswin/setuptex.bat +++ b/scripts/context/stubs/mswin/setuptex.bat @@ -14,12 +14,24 @@ if exist %TEXMFOS%\bin\mtxrun.exe goto start  set TEXMFOS=%~s1\texmf-mswin-64  if exist %TEXMFOS%\bin\mtxrun.exe goto start +set TEXMFOS=%~s1texmf-win64 +if exist %TEXMFOS%\bin\mtxrun.exe goto start + +set TEXMFOS=%~s1\texmf-win64 +if exist %TEXMFOS%\bin\mtxrun.exe goto start +  set TEXMFOS=%~s1texmf-mswin  if exist %TEXMFOS%\bin\mtxrun.exe goto start  set TEXMFOS=%~s1\texmf-mswin  if exist %TEXMFOS%\bin\mtxrun.exe goto start +set TEXMFOS=%~s1texmf-win32 +if exist %TEXMFOS%\bin\mtxrun.exe goto start + +set TEXMFOS=%~s1\texmf-win32 +if exist %TEXMFOS%\bin\mtxrun.exe goto start +  :selftest  set TEXMFOS=%~d0%~p0texmf-mswin-64 @@ -28,12 +40,24 @@ if exist %TEXMFOS%\bin\mtxrun.exe goto start  set TEXMFOS=%~d0%~p0\texmf-mswin-64  if exist %TEXMFOS%\bin\mtxrun.exe goto start +set TEXMFOS=%~d0%~p0texmf-win64 +if exist %TEXMFOS%\bin\mtxrun.exe goto start + +set TEXMFOS=%~d0%~p0\texmf-win64 +if exist %TEXMFOS%\bin\mtxrun.exe goto start +  set TEXMFOS=%~d0%~p0texmf-mswin  if exist %TEXMFOS%\bin\mtxrun.exe goto start  set TEXMFOS=%~d0%~p0\texmf-mswin  if exist %TEXMFOS%\bin\mtxrun.exe goto start +set TEXMFOS=%~d0%~p0texmf-win32 +if exist %TEXMFOS%\bin\mtxrun.exe goto start + +set TEXMFOS=%~d0%~p0\texmf-win32 +if exist %TEXMFOS%\bin\mtxrun.exe goto start +  :start  set PATH=%TEXMFOS%\bin;%PATH% diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun index fcd72b029..a0e39e8db 100644 --- a/scripts/context/stubs/unix/mtxrun +++ b/scripts/context/stubs/unix/mtxrun @@ -2575,7 +2575,7 @@ do -- create closure to overcome 200 locals limit  package.loaded["l-os"] = package.loaded["l-os"] or true --- original size: 15800, stripped down to: 9551 +-- original size: 15915, stripped down to: 9551  if not modules then modules={} end modules ['l-os']={    version=1.001, @@ -16624,8 +16624,8 @@ end -- of closure  -- used libraries    : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua  -- skipped libraries : - --- original bytes    : 683243 --- stripped bytes    : 241891 +-- original bytes    : 683358 +-- stripped bytes    : 242006  -- end library merge @@ -17635,7 +17635,11 @@ if e_argument("script") or e_argument("scripts") then      -- run a script by loading it (using libs), pass args -    runners.loadbase() +    if e_argument("nofiledatabase") then +        -- handy for mtx-update +    else +        runners.loadbase() +    end      if is_mkii_stub then          ok = runners.execute_script(filename,false,true)      else | 
