Merge branch 'master' into nopcre

elfmz · Dec 1, 2024 · 56bb9cd · 56bb9cd
2 parents 210a342 + 3d25eda
commit 56bb9cd
Show file tree

Hide file tree

Showing 18 changed files with 1,264 additions and 132 deletions.
diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
@@ -11,6 +11,7 @@ env:
 
 jobs:
   build:
+    if: ${{ !(github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository != 'elfmz/far2l') }}
     # The CMake configure and build commands are platform agnostic and should work equally
     # well on Windows or Mac.
     runs-on: ubuntu-latest
@@ -36,7 +37,7 @@ jobs:
       # access regardless of the host operating system
       shell: bash
       # -S and -B options specify source and build directories
-      run: cmake -S . -B _build -DCMAKE_BUILD_TYPE=$BUILD_TYPE ${{ matrix.options }}
+      run: cmake -S . -B _build -Wno-dev -DCMAKE_BUILD_TYPE=$BUILD_TYPE ${{ matrix.options }}
 
     - name: Build
       shell: bash

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -34,6 +34,7 @@ env:
 
 jobs:
   ubuntu-low-compiler:
+    if: ${{ !(github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository != 'elfmz/far2l') }}
     runs-on: ubuntu-20.04
 
     strategy:
@@ -42,29 +43,35 @@ jobs:
         compiler: [ gcc, clang ]
         include:
           - compiler: gcc
-            version: 10
-            c: /usr/bin/gcc-10
-            cxx: /usr/bin/g++-10
+            version: 7
+            c: /usr/bin/gcc-7
+            cxx: /usr/bin/g++-7
           - compiler: clang
-            version: 10
-            c: /usr/bin/clang-10
-            cxx: /usr/bin/clang++-10
+            version: 7
+            c: /usr/bin/clang-7
+            cxx: /usr/bin/clang++-7
 
     name: ubuntu-${{ matrix.compiler }}-${{ matrix.version }}
 
     steps:
       - name: Checkout source
         uses: actions/checkout@v4
-
-      - name: Install dependencies
+
+      - name: Install compilers
+        run: >
+          sudo apt-get update;
+          sudo apt-get -y install gcc-7 g++-7 clang-7
+
+      - name: Install far2l dependencies
         run: >
-         sudo apt-get update;
          sudo apt-get -y install
          libuchardet-dev libxml2-dev libwxgtk3.0-gtk3-dev
          libx11-dev libxi-dev
          libssl-dev libsmbclient-dev libnfs-dev libneon27-dev libssh-dev
          libarchive-dev
-  
+         libarchive-dev
+         python3-dev python3-cffi
+ 
       - name: Create Build Environment
         # Create a separate build directory as working directory for all subsequent commands
         run: mkdir -p _build
@@ -75,7 +82,7 @@ jobs:
         shell: bash
         # -S and -B options specify source and build directories
         run: > 
-         cmake -S . -B _build -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPYTHON=yes
+         cmake -S . -B _build -Wno-dev -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPYTHON=yes
          -DCMAKE_C_COMPILER=${{ matrix.c }} -DCMAKE_CXX_COMPILER=${{ matrix.cxx }}
   
       - name: Build
@@ -85,6 +92,7 @@ jobs:
           cmake --build _build --config $BUILD_TYPE -j$(nproc --all)
   
   ubuntu-medium-compiler:
+    if: ${{ !(github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository != 'elfmz/far2l') }}
     runs-on: ubuntu-22.04
 
     strategy:
@@ -107,15 +115,16 @@ jobs:
       - name: Checkout source
         uses: actions/checkout@v4
 
-      - name: Install dependencies
+      - name: Install far2l dependencies
         run: >
           sudo apt-get update;
           sudo apt-get -y install
           libuchardet-dev libxml2-dev libwxgtk3.0-gtk3-dev
           libx11-dev libxi-dev
           libssl-dev libsmbclient-dev libnfs-dev libneon27-dev libssh-dev
           libarchive-dev
-  
+          python3-dev python3-cffi
+
       - name: Create Build Environment
         # Create a separate build directory as working directory for all subsequent commands
         run: mkdir -p _build
@@ -126,7 +135,7 @@ jobs:
         shell: bash
         # -S and -B options specify source and build directories
         run: > 
-         cmake -S . -B _build -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPYTHON=yes
+         cmake -S . -B _build -Wno-dev -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPYTHON=yes
          -DCMAKE_C_COMPILER=${{ matrix.c }} -DCMAKE_CXX_COMPILER=${{ matrix.cxx }}
   
       - name: Build
@@ -136,6 +145,7 @@ jobs:
           cmake --build _build --config $BUILD_TYPE -j$(nproc --all)
 
   ubuntu-high-compiler:
+    if: ${{ !(github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository != 'elfmz/far2l') }}
     runs-on: ubuntu-24.04
 
     strategy:
@@ -158,14 +168,15 @@ jobs:
       - name: Checkout source
         uses: actions/checkout@v4
 
-      - name: Install dependencies
+      - name: Install far2l dependencies
         run: >
           sudo apt-get update;
           sudo apt-get -y install
           libuchardet-dev libxml2-dev libwxgtk3.2-dev
           libx11-dev libxi-dev
           libssl-dev libsmbclient-dev libnfs-dev libneon27-dev libssh-dev
           libarchive-dev
+          python3-dev python3-cffi
   
       - name: Create Build Environment
         # Create a separate build directory as working directory for all subsequent commands
@@ -177,7 +188,7 @@ jobs:
         shell: bash
         # -S and -B options specify source and build directories
         run: > 
-          cmake -S . -B _build -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPYTHON=yes
+          cmake -S . -B _build -Wno-dev -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPYTHON=yes
           -DCMAKE_C_COMPILER=${{ matrix.c }} -DCMAKE_CXX_COMPILER=${{ matrix.cxx }}
   
       - name: Build
@@ -187,14 +198,15 @@ jobs:
           cmake --build _build --config $BUILD_TYPE -j$(nproc --all)
         
   macos14-arm64-clang15:
+    if: ${{ !(github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository != 'elfmz/far2l') }}
     runs-on: macos-14
 
     steps:
 
       - name: Checkout source
         uses: actions/checkout@v4
 
-      - name: Install dependencies
+      - name: Install far2l dependencies
         # libx11, openssl is already installed
         run: >
           brew install
@@ -215,7 +227,7 @@ jobs:
         # access regardless of the host operating system
         shell: bash
         # -S and -B options specify source and build directories
-        run: cmake -S . -B _build -DCMAKE_BUILD_TYPE=$BUILD_TYPE  -DPYTHON=yes
+        run: cmake -S . -B _build -Wno-dev -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPYTHON=yes
 
       - name: Build
         shell: bash

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,7 +40,8 @@ if(GIT_FOUND)
     execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tag
         WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
         OUTPUT_VARIABLE GIT_TAG
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_QUIET)
 endif()
 
 if(NOT "${GIT_TAG}" STREQUAL "v_${VERSION}")

diff --git a/colorer/configs/base/CHANGELOG.md b/colorer/configs/base/CHANGELOG.md
@@ -17,11 +17,13 @@
 - [shell-posix] Commands are not recognized correctly after escaped new-line
 - [shell-bash] Redirection symbols < and > inside "magic backticks" block break background highlighting till the end of the file
 - [shell-bash] Fix magic backticks in for loop
+- [shell-bash] Fix array extension in for loop
 - [smarty] fixed the work of smarty templates
 - [markdown] amend emphasis with underscores
 - [markdown] fix trailing spaces in em and strong
 - [smarty] fixed working with nested brackets
 - [smarty] literal block - text only
+- [shell-posix] fix variable assignments with line continuations
 
 ### Changed
 - Simplified catalog.xml.
@@ -32,6 +34,7 @@
 - remove obsolete from visual-rgb.hrd
 - [groovy] add .gradle as groovy
 - Use the new shell-posix schema for shell scripts by default
+- [json] highlight JSON object keys
 
 ### Added
 - New package type of base - all packed. Hrc and hrd files in one archive. Directory 'auto' not in archive.
@@ -66,6 +69,9 @@
 - [shell-bash] add functions to outlined list
 - [markdown] added the ability to connect the backlight in 'code' by creating your own scheme 'markdown2:markdown2'
 - [markdown] highlight special all caps HTML tags
+- [hcl] add a new schema for HashiCorp HCL
+- [terraform] add a new schema for HashiCorp Terraform
+- [dockerfile] add a new schema for Dockerfile
 
 ## [1.2.0] - 2021-09-12
 

diff --git a/colorer/configs/base/hrc/inet/smarty.hrc b/colorer/configs/base/hrc/inet/smarty.hrc
@@ -281,12 +281,12 @@
 
 		<scheme name="Insertion">
 			<!--<inherit scheme="smartyEscape" />-->
-			<block start="/(\{)((literal))(\})/" end="/(\{)((\/literal))(\})/"
-				region01="OpenTag"   region11="OpenTag"
+			<block start="/(\{)((literal))(\})/" end="/(\{)((\/literal))(\})/"	
+				region01="OpenTag"   region11="OpenTag" 
 				region02="def:PairStart" region12="def:PairEnd"
-				region04="OpenTag"   region14="OpenTag"
+				region04="OpenTag"   region14="OpenTag" 
 				region03="def:Keyword"   region13="def:Keyword"
-				scheme="asp:html" priority="normal"  content-priority="normal"
+				scheme="asp:html" priority="normal"  content-priority="normal" 
 			/>
 			<inherit scheme="smartyComment" />
 			<inherit scheme="smartyPhpInsertion"/>

diff --git a/colorer/configs/base/hrc/proto.hrc b/colorer/configs/base/hrc/proto.hrc
@@ -733,6 +733,16 @@
         <filename weight='1'>/\.y$/i</filename>
     </prototype>
 
+    <!--  HashiCorp scripts  -->
+    <prototype name="hcl" group="scripts" description="HashiCorp HCL">
+        <location link="scripts/hcl/hcl.hrc"/>
+        <filename>/\.hcl$/i</filename>
+    </prototype>
+    <prototype name="terraform" group="scripts" description="HashiCorp Terraform">
+        <location link="scripts/hcl/terraform.hrc"/>
+        <filename>/\.tf$/i</filename>
+        <filename>/\.tfvars$/i</filename>
+    </prototype>
 
     <prototype name="delphiform" group="scripts" description="Delphi form">
         <location link="scripts/dfm.hrc" />
@@ -788,6 +798,12 @@
         <filename>/\.nut$/i</filename>
     </prototype>
 
+    <prototype name="dockerfile" group="scripts" description="Dockerfile">
+        <location link="scripts/dockerfile.hrc"/>
+        <filename>/^[Dd]ockerfile\..+$/</filename>
+        <filename>/^[Dd]ockerfile$/</filename>
+        <firstline>/^\s*FROM\b/</firstline>
+    </prototype>
 
     <prototype name="rarscript" group="scripts.install" description="RAR Install Script">
         <location link="scripts/rarscrpt.hrc" />
@@ -927,7 +943,6 @@
         <location link="rare/jcl.hrc" />
         <filename>/\.jcl$/i</filename>
     </prototype>
-
     <prototype name="sml" group="rare" description="Standard ML">
         <location link="rare/sml.hrc" />
         <filename>/\.(sml|sig)$/i</filename>