Merge pull request #17 from adamyg/topic/build-224

Topic/build 224

- 4.8.27 merge
- aspell integration
- Bugfix #14
- Bugfix #15
- Enhancement #16

.github/workflows/build.yml

@@ -7,34 +7,53 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest]
+
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2   
+      uses: actions/checkout@v2
+
     - name: Checkout submodules
       run: |
         git submodule update --init --recursive
+
     - uses: ilammy/msvc-dev-cmd@v1
       with:
         arch: x86
-    - name: generating Makefiles
+
+    - name: Generating environment
       shell: cmd
       run: |
         @set PERL=c:/Strawberry/perl/bin/perl
         cd mcwin32
         c:/Strawberry/perl/bin/perl makelib.pl --perlpath=c:/Strawberry/perl/bin --busybox=./support/busybox --verbose vc2019
         choco install innosetup --version=5.6.1 --force
-        set
-        dir "%programfiles(x86)%"
-    - name: compiling
+        @rem set
+        @rem dir c:\tools
+        @rem dir "%programfiles(x86)%"
+
+    - name: Compile
       shell: cmd
       run: |
         @set PERL=c:/Strawberry/perl/bin/perl
         cd mcwin32
-        .\support\gmake-42
-        @rem .\support\gmake-42 package
-        "%programfiles(x86)%\Inno Setup 5\ISCC" ".\releases\mc-inno-setup.iss"
-    - name: package
+        .\support\gmake-42 release build
+
+    - name: Package
+      shell: cmd
+      run: |
+        @set PERL=c:/Strawberry/perl/bin/perl
+        cd mcwin32
+        @rem .\support\gmake-42 release package
+        "%programfiles(x86)%\Inno Setup 5\ISCC" -DBUILD_INFO=1 -DBUILD_TYPE=release ".\releases\mc-inno-setup.iss"
+
+    - name: Upload artifacts
       uses: actions/upload-artifact@v2
       with:
         name: mcwin32-package
         path: ./mcwin32/releases/mcwin32-build*-setup.exe
+
+    - name: Release artifacts
+      uses: softprops/action-gh-release@v1
+      with:
+        files: ./mcwin32/releases/mcwin32-build*-setup.exe
+        draft: true

.gitignore

@@ -12,4 +12,3 @@ mcwin32-build*.exe
 GIT_*.txt
 GIT_*.bat
 .#*
-

README.md

@@ -2,10 +2,10 @@
 
 # Midnight Commander for Windows
 
-## Native Midnight Commander 4.8.24 for Windows/Win32
+## Native Midnight Commander 4.8.27 for Windows/Win32
 
 	Windows XP+/32 bit native port of GNU Midnight Commander,
-	based on the current 4.8.24 development stream.
+	based on the current 4.8.27 development stream.
 
 	Supports both the recent Windows 10 plus the prior legacy console,
 	16 and 256 colour modes are available within either.

mcsrc/AUTHORS

@@ -43,6 +43,9 @@ Alexander Serkov <[email protected]>
 Alessandro Rubini <[email protected]>
 	Mouse support.
 
+Aleš Janda <[email protected]>
+	Shadows of dialog windows and menus.
+
 Alexander Dong <[email protected]>
 	OS/2 port.
 

mcsrc/Makefile.am

@@ -1,5 +1,5 @@
 ## Process this file with automake to create Makefile.in.
-AUTOMAKE_OPTIONS = 1.5
+AUTOMAKE_OPTIONS = 1.12
 
 SUBDIRS = po lib src doc contrib misc
 
@@ -9,13 +9,15 @@ endif
 
 EXTRA_DIST = 
 
-dist_noinst_SCRIPTS = build-glib2.sh
+dist_noinst_SCRIPTS = \
+    build-glib2.sh \
+    version.sh
 
-dist_noinst_HEADERS = $(top_srcdir)/version.h
+dist_noinst_HEADERS = $(top_srcdir)/mc-version.h
 
 ACLOCAL_AMFLAGS = -I m4
 
-CONFIG_STATUS_DEPENDENCIES = $(top_srcdir)/version.h
+CONFIG_STATUS_DEPENDENCIES = $(top_srcdir)/mc-version.h
 
 .PHONY: update-version \
         cppcheck \
@@ -29,16 +31,16 @@ CONFIG_STATUS_DEPENDENCIES = $(top_srcdir)/version.h
 
 
 update-version:
-	@if test -x $(top_srcdir)/maint/utils/version.sh; then \
-	    $(top_srcdir)/maint/utils/version.sh "$(top_srcdir)" 2>&1 >/dev/null; \
+	@if test -x $(top_srcdir)/version.sh; then \
+	    $(top_srcdir)/version.sh "$(top_srcdir)" 2>&1 >/dev/null; \
 	else \
-	    if test ! -e $(top_srcdir)/version.h; then \
-	        echo "File not found: $(top_srcdir)/maint/utils/version.sh"; \
+	    if test ! -e $(top_srcdir)/mc-version.h; then \
+	        echo "File not found: $(top_srcdir)/version.sh"; \
 	        exit 1; \
 	    fi; \
 	fi
 
-$(top_srcdir)/version.h: update-version
+$(top_srcdir)/mc-version.h: update-version
 
 CPPCHECK_CMD = cppcheck \
     --inline-suppr \

mcsrc/acinclude.m4

@@ -17,6 +17,7 @@ m4_include([m4.include/mc-with-screen.m4])
 m4_include([m4.include/mc-with-internal-edit.m4])
 m4_include([m4.include/mc-subshell.m4])
 m4_include([m4.include/mc-background.m4])
+m4_include([m4.include/mc-ext2fs-attr.m4])
 m4_include([m4.include/mc-glib.m4])
 m4_include([m4.include/mc-vfs.m4])
 m4_include([m4.include/mc-version.m4])

mcsrc/autogen.sh

@@ -20,7 +20,7 @@ ${XGETTEXT:-xgettext} --keyword=_ --keyword=N_ --keyword=Q_ --output=- \
 cd src/vfs/smbfs/helpers
 date -u >include/stamp-h.in
 
-$srcdir/maint/utils/version.sh "$srcdir"
+$srcdir/version.sh "$srcdir"
 
 if test -x $srcdir/configure.mc; then
   $srcdir/configure.mc "$@"

mcsrc/build-glib2.sh

@@ -30,8 +30,8 @@
 : ${GETTEXT_VERSION=0.17}
 
 GLIB_DIR="glib-$GLIB_VERSION"
-GLIB_TARBALL="glib-$GLIB_VERSION.tar.gz"
-GLIB_URL="ftp://ftp.gnome.org/pub/gnome/sources/glib/2.30/$GLIB_TARBALL"
+GLIB_TARBALL="glib-$GLIB_VERSION.tar.bz2"
+GLIB_URL="https://download.gnome.org/sources/glib/2.30/$GLIB_TARBALL"
 
 PKGC_DIR="pkg-config-$PKGC_VERSION"
 PKGC_TARBALL="pkg-config-$PKGC_VERSION.tar.gz"