OSGeo · echoix · Nov 30, 2024 · Nov 30, 2024 · Nov 30, 2024 · Nov 30, 2024
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,116 @@
+# EditorConfig: https://editorconfig.org
+# Rules are read from top to bottom, the most recent rule found applies
+# Some basic properties are supported by all editor plugins
+
+# top-most EditorConfig file
+root = true
+
+# General settings
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+trim_trailing_whitespace = true
+
+[*.{htm,html,js,css,svg}]
+indent_size = 2
+
+[*.{xml,config}]
+indent_size = 2
+
+# Scripts
+[{*.sh,mswindows/osgeo4w/*config}]
+end_of_line = lf
+indent_size = 4
+
+# These are explicitly windows files and should use crlf
+[*.{bat,cmd,ps1}{.tmpl,}]
+end_of_line = crlf
+
+[*.{c,h,cpp,hpp}]
+indent_size = 2
+
+[{*.js,*.json,*.json5,*.mjs,*.cjs}]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.js]
+block_comment_start = /**
+block_comment = *
+block_comment_end = */
+
+[*.ipynb]
+end_of_line = lf
+
+[{*.py, *.pyi}]
+charset = utf-8
+indent_style = space
+# TODO: To enable when files are fixed:
+# indent_size = 4
+# max_line_length = 88
+
+[{Makefile,*.make,*.make.in}]
+# TODO: To enable when files are fixed:
+# indent_style = tab
+indent_size = 4
+
+[*.y{a,}ml]
+indent_style = space
+indent_size = 2
+
+# Patch files
+[*.patch]
+trim_trailing_whitespace = false
+
+# TODO: To enable when files are fixed:
+# # CSVs use CRLF as defined in RFC 4180
+# [*.csv]
+# end_of_line = crlf
+
+[*.md]
+# Two trailing whitespace in markdown means to create a line break
+# https://www.markdownguide.org/basic-syntax/#line-breaks
+trim_trailing_whitespace = false
+indent_style = space
+# TODO: To enable when files are fixed:
+# indent_size = 2
+
+# Exclude some files from rules
+[*.{ascii,asc,ref,po,ps,svg}]
+trim_trailing_whitespace = unset
+end_of_line = unset
+charset = unset
+insert_final_newline = unset
+
+[{**/testsuite/data/**,mswindows/osgeo4w/envdiff.sed}]
+trim_trailing_whitespace = unset
+end_of_line = unset
+charset = unset
+insert_final_newline = unset
+
+[python/libgrass_interface_generator/ctypesgen/parser/parsetab.py]
+trim_trailing_whitespace = false
+
+[mswindows/{generic.manifest,Installer-Files/*.url}]
+end_of_line = crlf
+
+# Binary files
+[**/PERMANENT/vector/*/{cidx,coor,sidx,topo}]
+trim_trailing_whitespace = unset
+end_of_line = unset
+charset = unset
+insert_final_newline = unset
+
+[*.{laz,raw,rgb}]
+trim_trailing_whitespace = unset
+end_of_line = unset
+charset = unset
+insert_final_newline = unset
+
+[{lib/vector/diglib/test*.ok,**/*.nib/keyedobjects.nib}]
+trim_trailing_whitespace = unset
+end_of_line = unset
+charset = unset
+insert_final_newline = unset
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,20 @@
+# TODO: Enable the following with a related change in .editorconfig:
+# *.csv      text eol=crlf
+
+# Scripts
+*.bash      text eol=lf
+*.sh        text eol=lf
+# Windows scripts should be CRLF
+*.bat       text eol=crlf
+*.cmd       text eol=crlf
+*.ps1       text eol=crlf
+
+# Jupyter notebooks
+*.ipynb     text eol=lf
+
+# Binary files
+*.raw       binary
+*.laz       binary
+*/PERMANENT/vector/*/[cs]idx    binary
+*/PERMANENT/vector/*/coor       binary
+*/PERMANENT/vector/*/topo       binary
diff --git a/.github/workflows/.editorconfig b/.github/workflows/.editorconfig
diff --git a/.github/workflows/additional_checks.yml b/.github/workflows/additional_checks.yml
@@ -38,12 +38,6 @@ jobs:
             precommit:
               - '.pre-commit-config.yaml'
 
-      - name: Check for CRLF endings
-        uses: erclu/check-crlf@94acb86c2a41b0a46bd8087b63a06f0457dd0c6c # v1.2.0
-        with:
-          # Ignore all test data, Windows-specific directories and scripts.
-          exclude: mswindows .*\.bat .*/testsuite/data/.*
-
       - name: Set up Python
         uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
         with:

diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml
@@ -51,6 +51,7 @@ jobs:
           VALIDATE_BASH_EXEC: true
           # VALIDATE_CSS: true
           # VALIDATE_DOCKER: true
+          VALIDATE_EDITORCONFIG: true
           VALIDATE_JAVASCRIPT_ES: true
           # VALIDATE_JAVASCRIPT_STANDARD: true
           VALIDATE_JSON: true

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -72,3 +72,9 @@ repos:
     rev: v1.35.1
     hooks:
       - id: yamllint
+  # TODO: In a next release, the plain editorconfig-checker repo could be used
+  - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
+    rev: 3.2.0
+    hooks:
+      - id: editorconfig-checker
+        alias: ec
diff --git a/db/drivers/mysql/Makefile b/db/drivers/mysql/Makefile
@@ -12,8 +12,8 @@ endif
 
 include $(MODULE_TOPDIR)/include/Make/DB.make
 
-LIBES = $(DBMIDRIVERLIB) $(DBMIBASELIB) $(DBSTUBSLIB) \
-	 $(GISLIB) $(DATETIMELIB)
+LIBES =	$(DBMIDRIVERLIB) $(DBMIBASELIB) $(DBSTUBSLIB) \
+		$(GISLIB) $(DATETIMELIB)
 EXTRA_CFLAGS = $(MYSQLINCPATH)
 EXTRA_LDFLAGS = $(MYSQLLIBPATH)