Merge pull request #19 from CleverRaven/master

reeeeeee-

.github/workflows/msvc-full-features.yml

@@ -9,9 +9,13 @@ on:
     - 'build-data/osx/**'
     - 'doc/**'
     - 'doxygen_doc/**'
+    - 'gfx/**'
+    - 'lang/**'
     - 'lgtm/**'
     - 'msvc-object_creator/**'
+    - 'object_creator/**'
     - 'tools/**'
+    - '!tools/format/**'
     - 'utilities/**'
   pull_request:
     branches:
@@ -21,9 +25,13 @@ on:
     - 'build-data/osx/**'
     - 'doc/**'
     - 'doxygen_doc/**'
+    - 'gfx/**'
+    - 'lang/**'
     - 'lgtm/**'
     - 'msvc-object_creator/**'
+    - 'object_creator/**'
     - 'tools/**'
+    - '!tools/format/**'
     - 'utilities/**'
 
 env:
@@ -67,7 +75,7 @@ jobs:
     - name: Build
       run: |
           cd msvc-full-features
-          msbuild -m -p:Configuration=Release -p:Platform=x64 -target:Cataclysm-vcpkg-static Cataclysm-vcpkg-static.sln
+          msbuild -m -p:Configuration=Release -p:Platform=x64 "-target:Cataclysm-vcpkg-static;Cataclysm-test-vcpkg-static;JsonFormatter-vcpkg-static" Cataclysm-vcpkg-static.sln
 
     - name: Dump logs if build failed
       if: failure()
@@ -86,6 +94,16 @@ jobs:
             }
         }
 
+    - name: Compile .mo files for localization
+      run: |
+          & "C:\Program Files\Git\bin\bash" ./lang/compile_mo.sh all
+          mkdir -p ./data/mods/TEST_DATA/lang/mo/ru/LC_MESSAGES -ErrorAction SilentlyContinue
+          msgfmt -f -o ./data/mods/TEST_DATA/lang/mo/ru/LC_MESSAGES/TEST_DATA.mo ./data/mods/TEST_DATA/lang/po/ru.po
+
+    - name: Run tests
+      run: |
+          .\Cataclysm-test-vcpkg-static-Release-x64.exe --min-duration 0.2 --rng-seed time
+
     - name: Clean
       run: |
           Get-ChildItem -Path Cataclysm-lib-vcpkg-static-Release-x64.* | Foreach-Object { rm $_.FullName }

.github/workflows/object_creator.yml

@@ -7,9 +7,13 @@ on:
     paths-ignore:
     - 'android/**'
     - 'build-data/osx/**'
+    - 'data/**'
     - 'doc/**'
     - 'doxygen_doc/**'
+    - 'gfx/**'
+    - 'lang/**'
     - 'lgtm/**'
+    - 'tests/**'
     - 'tools/**'
     - 'utilities/**'
   pull_request:
@@ -18,9 +22,15 @@ on:
     paths-ignore:
     - 'android/**'
     - 'build-data/osx/**'
+    - 'data/**'
     - 'doc/**'
     - 'doxygen_doc/**'
+    - 'gfx/**'
+    - 'lang/**'
     - 'lgtm/**'
+    - 'src/**'
+    - '!src/messages.*'
+    - 'tests/**'
     - 'tools/**'
     - 'utilities/**'
 

.lgtm.yml

@@ -1,3 +1,4 @@
 # Disable FIXME query, in DDA it is as likely to be a future feature as a bug.
 queries:
     - exclude: cpp/fixme-comment
+    - exclude: cpp/non-constant-format

CMakeLists.txt

@@ -137,9 +137,7 @@ message(STATUS "${PROJECT_NAME} build options --")
 
 # Preset variables
 if (NOT LANGUAGES)
-    # English is included to workaround a libintl bug that affects performance
-    # on MinGW targets. See lang/CMakeList.txt for more information.
-    set(LANGUAGES en de es_AR es_ES fr it_IT ja ko pt_BR ru zh_CN zh_TW)
+    set(LANGUAGES de es_AR es_ES fr it_IT ja ko pt_BR ru zh_CN zh_TW)
 endif ()
 
 if (GIT_BINARY)
@@ -336,22 +334,6 @@ endif (BACKTRACE)
 
 # Ok. Now create build and install recipes
 if (LOCALIZE)
-    if (NOT _OS_LINUX_) # on Linux with glibc, libintl is not required
-        find_package(Libintl)
-        if (NOT LIBINTL_FOUND)
-            message(FATAL_ERROR
-                    "You need the libintl development library \
-                         to be able to compile with LOCALIZE support. \
-                         See doc/COMPILING/COMPILING-CMAKE.md for details and more info.")
-        endif ()
-    endif()
-    find_package(Iconv)
-    if (NOT ICONV_FOUND)
-        message(FATAL_ERROR
-                "You need the iconv development library \
-                     to be able to compile with LOCALIZE support. \
-                     See doc/COMPILING/COMPILING-CMAKE.md for details and more info.")
-    endif ()
     add_subdirectory(lang)
     add_definitions(-DLOCALIZE)
 endif ()

LICENSE.txt

@@ -12,8 +12,6 @@ getpost (tools/json_tools/format/getpost.h) is licensed under the MIT license, s
 
 gulrak filesystem (src/third-party/ghc/*) is licensed under the MIT license, see file for text of license.
 
-libintl-lite is licensed under Boost Software License 1.0. Visit https://www.boost.org/users/license.html to read the license.
-
 libbacktrace is licensed under a BSD license (https://github.com/ianlancetaylor/libbacktrace/blob/master/LICENSE). The full license text is as follows:
 
 # Copyright (C) 2012-2016 Free Software Foundation, Inc.

Makefile

@@ -47,10 +47,6 @@
 #  (for example: make LANGUAGES="zh_CN zh_TW" for Chinese)
 #  make localization LANGUAGES=all
 #  (for every .po file in lang/po)
-#  Special note for MinGW: due to a libintl bug (https://savannah.gnu.org/bugs/index.php?58006),
-#  using English without a `.mo` file would cause significant slow down on MinGW
-#  targets. In such case you can compile a `.mo` file for English using `make LANGUAGES="en"`.
-#  `make LANGUAGE="all"` also compiles a `.mo` file for English in addition to other languages.
 # Enable sanitizer (address, undefined, etc.)
 #  make SANITIZE=address
 # Change mapsize (reality bubble size)
@@ -535,22 +531,6 @@ ifeq ($(NATIVE), osx)
     endif
   endif
   ifeq ($(LOCALIZE), 1)
-    LDFLAGS += -lintl
-    ifdef OSXCROSS
-      LDFLAGS += -L$(LIBSDIR)/gettext/lib
-      CXXFLAGS += -I$(LIBSDIR)/gettext/include
-    endif
-    # link to gettext from Homebrew if it exists
-    # Homebrew may be installed in /usr/local or /opt/homebrew
-    ifneq ("$(wildcard /usr/local/opt/gettext)", "")
-      LDFLAGS += -L/usr/local/opt/gettext/lib
-      CXXFLAGS += -I/usr/local/opt/gettext/include
-    else
-      ifneq ("$(wildcard /opt/homebrew/opt/gettext)", "")
-        LDFLAGS += -L/opt/homebrew/opt/gettext/lib
-        CXXFLAGS += -I/opt/homebrew/opt/gettext/include
-      endif
-    endif
     ifeq ($(MACPORTS), 1)
       ifneq ($(TILES), 1)
         CXXFLAGS += -I$(shell ncursesw6-config --includedir)
@@ -611,9 +591,6 @@ ifeq ($(TARGETSYSTEM),WINDOWS)
   else
     LDFLAGS += -static
   endif
-  ifeq ($(LOCALIZE), 1)
-    LDFLAGS += -lintl -liconv
-  endif
   W32FLAGS += -Wl,-stack,12000000,-subsystem,windows
   RFLAGS = -J rc -O coff
   ifeq ($(NATIVE), win64)
@@ -722,7 +699,7 @@ ifeq ($(TILES), 1)
         LDFLAGS += $(shell $(PKG_CONFIG) --libs SDL2_image SDL2_ttf)
       else
         ifeq ($(MSYS2),1)
-          LDFLAGS += -Wl,--start-group -lharfbuzz -lfreetype -Wl,--end-group -lgraphite2 -lpng -lz -ltiff -lbz2 -lglib-2.0 -llzma -lws2_32 -lintl -liconv -lwebp -ljpeg -luuid
+          LDFLAGS += -Wl,--start-group -lharfbuzz -lfreetype -Wl,--end-group -lgraphite2 -lpng -lz -ltiff -lbz2 -lglib-2.0 -llzma -lws2_32 -lwebp -ljpeg -luuid
         else
           LDFLAGS += -lfreetype -lpng -lz -ljpeg -lbz2
         endif
@@ -781,13 +758,6 @@ else
   endif # HAVE_PKGCONFIG
 endif # TILES
 
-ifeq ($(TARGETSYSTEM),CYGWIN)
-  ifeq ($(LOCALIZE),1)
-    # Work around Cygwin not including gettext support in glibc
-    LDFLAGS += -lintl -liconv
-  endif
-endif
-
 ifeq ($(BSD), 1)
   # BSDs have backtrace() and friends in a separate library
   ifeq ($(BACKTRACE), 1)
@@ -796,12 +766,7 @@ ifeq ($(BSD), 1)
     CXXFLAGS += -fno-omit-frame-pointer
   endif
 
-  # And similarly, their libcs don't have gettext built in
-  ifeq ($(LOCALIZE),1)
-    LDFLAGS += -lintl -liconv
-  endif
-
-  # libexecinfo, libintl and libiconv may be located in /usr/local on BSD
+  # libexecinfo may be located in /usr/local on BSD
   CXXFLAGS += -I/usr/local/include
   LDFLAGS += -L/usr/local/lib
 endif
@@ -1184,8 +1149,10 @@ etags: $(ASTYLE_SOURCES)
 	etags $^
 	./tools/json_tools/cddatags.py
 
-astyle: $(ASTYLE_SOURCES)
-	$(ASTYLE_BINARY) --options=.astylerc -n $(ASTYLE_SOURCES)
+ASTYLE_CHECK_STAMPS = $(sort $(patsubst %,$(ODIR)/%.astyle-check-stamp,$(ASTYLE_SOURCES)))
+astyle: $(ASTYLE_CHECK_STAMPS)
+$(ASTYLE_CHECK_STAMPS): $(ODIR)/%.astyle-check-stamp : %
+	$(ASTYLE_BINARY) --options=.astylerc -n $< && mkdir -p $(@D) && touch $@
 
 # Test whether the system has a version of astyle that supports --dry-run
 ifeq ($(shell if $(ASTYLE_BINARY) -Q -X --dry-run src/game.h > /dev/null; then echo foo; fi),foo)
@@ -1201,10 +1168,12 @@ else
 	@echo Cannot run an astyle check, your system either does not have astyle, or it is too old.
 endif
 
-style-json: json_blacklist $(JSON_FORMATTER_BIN)
+JSON_SOURCES := $(shell find data -name "*.json")
+JSON_CHECK_STAMPS = $(sort $(patsubst %,$(ODIR)/%,$(JSON_SOURCES:.json=.jstyle-check-stamp)))
+style-json : $(JSON_CHECK_STAMPS) $(JSON_FORMATTER_BIN)
+$(JSON_CHECK_STAMPS) : $(ODIR)/%.jstyle-check-stamp : %.json $(JSON_FORMATTER_BIN)
 ifndef CROSS
-	find data gfx -name "*.json" -print0 | grep -v -z -F -f json_blacklist | \
-	  xargs -0 -L 1 $(JSON_FORMATTER_BIN)
+	$(JSON_FORMATTER_BIN) $< && mkdir -p $(@D) && touch $@
 else
 	@echo Cannot run json formatter in cross compiles.
 endif

README.md

@@ -69,8 +69,7 @@ GitHub repo:
 https://github.com/CleverRaven/Cataclysm-DDA
 
 IRC:
-`irc.libera.chat` ; `#CataclysmDDA`
-https://kiwiirc.com/nextclient/irc.libera.chat#CataclysmDDA
+`#CataclysmDDA` on [Libera Chat](https://libera.chat), https://web.libera.chat/#CataclysmDDA
 
 Official Discord:
 https://discord.gg/jFEc7Yp