Merge branch 'FarGroup:master' into master

deep-soft · Oct 14, 2024 · ef4b3e4 · ef4b3e4
2 parents 47d239d + 5228ca5
commit ef4b3e4
Show file tree

Hide file tree

Showing 28 changed files with 4,536 additions and 23 deletions.
diff --git a/enc/enc_lua/luafar_manual.tsi b/enc/enc_lua/luafar_manual.tsi
@@ -11593,6 +11593,19 @@ mtime=3887368189
 </article>
 </node>
 <node>
+id=593
+lv=1
+dt=Text
+nm=lpeg
+ctime=3937670947
+mtime=3937670954
+<article>
+#_<markdown>
+#_See the documentation [here](https://www.inf.puc-rio.br/~roberto/lpeg/).
+#_
+</article>
+</node>
+<node>
 id=524
 lv=0
 dt=Text
@@ -12836,6 +12849,43 @@ mtime=3776336416
 </article>
 </node>
 <node>
+id=592
+lv=1
+dt=Text
+nm=LPeg
+ctime=3937670870
+mtime=3937670904
+<article>
+#_Home page: https://www.inf.puc-rio.br/~roberto/lpeg/
+#_
+#_License
+#_
+#_Copyright © 2007-2023 Lua.org, PUC-Rio.
+#_
+#_Permission is hereby granted, free of charge, to any person
+#_obtaining a copy of this software and associated documentation
+#_files (the "Software"), to deal in the Software without
+#_restriction, including without limitation the rights to use,
+#_copy, modify, merge, publish, distribute, sublicense, and/or
+#_sell copies of the Software, and to permit persons to whom the
+#_Software is furnished to do so, subject to the following
+#_conditions:
+#_
+#_The above copyright notice and this permission notice shall be
+#_included in all copies or substantial portions of the Software.
+#_
+#_THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+#_EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+#_OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+#_NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+#_HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+#_WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+#_FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+#_OTHER DEALINGS IN THE SOFTWARE.
+#_
+</article>
+</node>
+<node>
 id=550
 lv=0
 dt=Text

diff --git a/misc/msi-installer/features.wxs b/misc/msi-installer/features.wxs
@@ -871,7 +871,6 @@
 <?if $(var.Platform) = x86 ?>
           <ComponentRef Id="lua51.dll_1" />
 <?endif?>
-          <ComponentRef Id="lpeg.dll" />
           <ComponentRef Id="_globalinfo.lua" />
           <ComponentRef Id="api.lua" />
           <ComponentRef Id="utils.lua" />

diff --git a/misc/msi-installer/files.wxs b/misc/msi-installer/files.wxs
@@ -22,9 +22,6 @@
       <Component Id="lua51.dll" Guid="$(var.Guid.lua51.dll)" Win64="$(var.Win64)">
         <File Id="lua51.dll" KeyPath="yes" Source="$(var.SourceDir)\lua51.dll" />
       </Component>
-      <Component Id="lpeg.dll" Guid="$(var.Guid.lpeg.dll)" Win64="$(var.Win64)">
-        <File Id="lpeg.dll" KeyPath="yes" Source="$(var.SourceDir)\lpeg.dll" />
-      </Component>
       <Component Id="Far.map" Guid="$(var.Guid.Far.map)" Win64="$(var.Win64)">
         <File Id="Far.map" KeyPath="yes" Source="$(var.SourceDir)\Far.map" />
       </Component>

diff --git a/misc/msi-installer/guids_arm64.wxi b/misc/msi-installer/guids_arm64.wxi
@@ -575,10 +575,9 @@
 <?define Guid.lm_pol.lng = "8D96ED24-5D9E-4727-B0F1-A1E45C4B7C92" ?>
 <?define Guid.luamacro.example.ini = "C68D05A2-A7D3-4E7F-9FC3-3E2ABD176A24" ?>
 <?define Guid.lua51.dll = "9989AAA6-DDA2-47D0-A022-08C792D5D53D" ?>
-
-<?define Guid.lpeg.dll = "260CD73D-3211-453B-A8DA-CB1A0697B69A" ?>
 <?define Guid.luafar3.dll = "DEB2BE08-4961-4657-B9C5-672B32FC4E9E" ?>
 <?define Guid.luafar3.map = "968DB915-1A89-4409-ABC5-05B4C5394889" ?>
+
 <?define Guid.DlgBuilder.hpp = "97E9F467-D07C-4953-B6A5-4C953FA3F1DC" ?>
 <?define Guid.farcolor.hpp = "E2422E03-0F25-4D52-B46C-A88CD6499117" ?>
 <?define Guid.plugin.hpp = "FCD81F8A-330F-4242-89C0-4ABD803A4357" ?>

diff --git a/misc/msi-installer/guids_x64.wxi b/misc/msi-installer/guids_x64.wxi
@@ -575,10 +575,9 @@
 <?define Guid.lm_pol.lng = "C3069057-FDB6-491D-B012-A29886A4B628" ?>
 <?define Guid.luamacro.example.ini = "E782F2C0-4B28-49A5-83FF-31E1FD086862" ?>
 <?define Guid.lua51.dll = "31F36739-E199-4FA9-BD95-E08D99C54F27" ?>
-
-<?define Guid.lpeg.dll = "924E63FA-359B-4E4B-98B3-D04502466DEF" ?>
 <?define Guid.luafar3.dll = "51D92B8C-EFB1-47A7-98FA-AD3BB73BBDD8" ?>
 <?define Guid.luafar3.map = "931D33C2-2675-4DC7-8A57-DF8A12B263ED" ?>
+
 <?define Guid.DlgBuilder.hpp = "8E572810-F31E-476C-A67E-3679CFDDF510" ?>
 <?define Guid.farcolor.hpp = "09214A8A-A57C-42EB-9E74-FA95E5006BFD" ?>
 <?define Guid.plugin.hpp = "E736C600-248A-445F-8EC5-2646A8D586E7" ?>

diff --git a/misc/msi-installer/guids_x86.wxi b/misc/msi-installer/guids_x86.wxi
@@ -576,9 +576,9 @@
 <?define Guid.luamacro.example.ini = "8E03CCC4-572B-40D6-900A-A4F1524A7F0D" ?>
 <?define Guid.lua51.dll = "1D39E4A8-1D26-44B0-8189-418D87D83809" ?>
 <?define Guid.lua51.dll_1 = "B365D738-B096-4AF5-86D4-4AA9ACEF656B" ?>
-<?define Guid.lpeg.dll = "57D8A59A-E866-42EA-9861-5895976405BE" ?>
 <?define Guid.luafar3.dll = "84A3F626-E485-400E-A50B-8A5F5B0568DE" ?>
 <?define Guid.luafar3.map = "837F1FF5-6638-4D79-83EE-DF5FB160DB0C" ?>
+
 <?define Guid.DlgBuilder.hpp = "9C10E352-F1FF-4B24-9F54-F2EA68737F22" ?>
 <?define Guid.farcolor.hpp = "7030C0CD-25D3-43BF-8591-43786F604DFD" ?>
 <?define Guid.plugin.hpp = "4C2F0C58-B243-4CF5-8F69-7BECCD41630D" ?>

diff --git a/plugins/luamacro/_globalinfo.lua b/plugins/luamacro/_globalinfo.lua
@@ -1,7 +1,7 @@
 function export.GetGlobalInfo()
   return {
-    Version       = { 3, 0, 0, 852 },
-    MinFarVersion = { 3, 0, 0, 6327 },
+    Version       = { 3, 0, 0, 854 },
+    MinFarVersion = { 3, 0, 0, 6380 },
     Guid          = win.Uuid("4EBBEFC8-2084-4B7F-94C0-692CE136894D"),
     Title         = "LuaMacro",
     Description   = "Far macros in Lua",

diff --git a/plugins/luamacro/changelog b/plugins/luamacro/changelog
@@ -1,3 +1,11 @@
+shmuel 2024-10-09 23:52:28+03:00 - build 854
+
+1. Refactoring
+
+shmuel 2024-10-09 17:41:49+03:00 - build 853
+
+1. Lpeg is now part of LuaFAR (no need for lpeg.dll).
+
 shmuel 2024-10-03 22:53:54+03:00 - build 852
 
 1. LuaFAR: refactoring.

diff --git a/plugins/luamacro/luafar/LPeg/README.md b/plugins/luamacro/luafar/LPeg/README.md
@@ -0,0 +1,4 @@
+# LPeg - Parsing Expression Grammars For Lua
+
+For more information,
+see [Lpeg](//www.inf.puc-rio.br/~roberto/lpeg/).