Merge pull request #18 from adamyg/topic/build-23

3.2.2 - build 23

.cvsignore

@@ -7,6 +7,7 @@ objects.*
 lib.*
 bin.*
 macros
+macros.x64
 help
 .makelib
 _grstate
@@ -21,4 +22,4 @@ Makefile
 *.obj
 *.cm
 *.bak
-.#*
+.#*

.github/workflows/build.yml

@@ -2,66 +2,104 @@ name: build
 on: [push]
 jobs:
   build:
-    runs-on: ${{ matrix.os }}
+    name: ${{ matrix.config.name }}
+    runs-on: ${{ matrix.config.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, ubuntu-latest]
+        config:
+        - {
+            name: "Windows Latest MSVC",
+            os: windows-latest,
+            toolchain: vc2022,
+            toolversion: vs170
+          }
+        - {
+           name: "Windows Latest MinGW",
+           os: windows-latest,
+           toolchain: mingw64,
+           toolversion: mingw64
+          }
+        - {
+           name: "Windows Latest OWC",
+           os: windows-latest,
+           toolchain: owc20,
+           toolversion: owc20
+          }
+        - {
+           name: "Ubuntu Latest GCC",
+           os: ubuntu-latest,
+           toolchain: gcc,
+           toolversion: gcc
+          }
+
     steps:
-    - uses: actions/checkout@v2
 
-    - uses: ilammy/msvc-dev-cmd@v1
-      if: runner.os == 'Windows'
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Checkout submodules
+      run: |
+        git submodule update --init --recursive
+
+    - name: MSVC setup
+      uses: ilammy/msvc-dev-cmd@v1
+      if: startsWith(matrix.config.name, 'Windows Latest MSVC')
       with:
         arch: x86
 
-    - uses: msys2/setup-msys2@v2
-      if: runner.os == 'Windows'
+    - name: MinGW64 setup
+      if: startsWith(matrix.config.name, 'Windows Latest MinGW')
+      shell: cmd
+      run: |
+        c:\msys64\usr\bin\pacman --noconfirm -S base-devel
+        c:\msys64\usr\bin\pacman --noconfirm -S mingw-w64-x86_64-gcc
+        c:\msys64\usr\bin\pacman --noconfirm -S mingw-w64-i686-gcc
+
+    - name: OpenWatcom setup
+      uses: open-watcom/setup-watcom@v0
+      if: startsWith(matrix.config.name, 'Windows Latest OWC')
       with:
-        release: false      
-        update: true
-        install: >-
-          bison
+        version: "2.0"
+        location: "C:\\Watcom"
 
-    - name: Windows, generating Makefiles
-      if: runner.os == 'Windows'
+    - name: Windows, generate
+      if: startsWith(matrix.config.name, 'Windows Latest')
       shell: cmd
       run: |
+        @if "${{ matrix.config.toolchain }}"=="mingw32" set PATH=c:\msys64\mingw32\bin;%PATH%
+        @if "${{ matrix.config.toolchain }}"=="mingw64" set PATH=c:\msys64\mingw64\bin;%PATH%
+        @if "${{ matrix.config.toolchain }}"=="owc20"  call .\support\owc20setenv.bat C:\Watcom
+        @if NOT "${{ matrix.config.toolchain }}"=="mingw64" c:\msys64\usr\bin\pacman --noconfirm -S bison
         @set PERL=c:/Strawberry/perl/bin/perl
-        c:/Strawberry/perl/bin/perl makelib.pl --perlpath=c:/Strawberry/perl/bin --busybox=./win32/busybox --wget=./win32/wget --bison=c:/msys64/usr/bin/bison --flex=./bin/flex --verbose vc2022
-        @rem dir c:\tools
-        @rem dir c:\msys64
-        @rem dir c:\msys64\usr\bin
+        c:/Strawberry/perl/bin/perl makelib.pl --perlpath=c:/Strawberry/perl/bin --busybox=./win32/busybox --wget=./win32/wget --bison=c:/msys64/usr/bin/bison --flex=./bin/flex --verbose "${{ matrix.config.toolchain }}"
 
-    - name: Windows, compiling
-      if: runner.os == 'Windows'
+    - name: Windows, compile
+      if: startsWith(matrix.config.name, 'Windows Latest')
       shell: cmd
       run: |
+        @if "${{ matrix.config.toolchain }}"=="mingw32" set PATH=c:\msys64\mingw32\bin;%PATH%
+        @if "${{ matrix.config.toolchain }}"=="mingw64" set PATH=c:\msys64\mingw64\bin;%PATH%
+        @if "${{ matrix.config.toolchain }}"=="owc20"  call .\support\owc20setenv.bat C:\Watcom
         @set PERL=c:/Strawberry/perl/bin/perl
         .\win32\gmake-42 release contrib
         .\win32\gmake-42 release
 
-    - name: Windows, package
-      if: runner.os == 'Windows'
-      uses: actions/upload-artifact@v2
-      with:
-        name: package-win32
-        path: ./bin.vs170/debug/*
-
-    - name: Linux, generating Makefiles
-      if: runner.os == 'Linux'
+    - name: Ubuntu, generate
+      if: startsWith(matrix.config.name, 'Ubuntu Latest')
       shell: bash
       run: |
         ./support/config_withncurses
-    - name: Linux, compiling
-      if: runner.os == 'Linux'
+
+    - name: Ubuntu, compile
+      if: startsWith(matrix.config.name, 'Ubuntu Latest')
       shell: bash
       run: |
         make release
-    - name: Linux, package
-      if: runner.os == 'Linux'
+
+    - name: Package
       uses: actions/upload-artifact@v2
       with:
-        name: package-linux
-        path: ./bin.gcc/debug/*
+        name: package-${{ matrix.config.toolchain }}
+        path: ./bin.${{ matrix.config.toolversion }}/release/*
 

.gitignore

@@ -10,6 +10,7 @@ bin.*/
 lib.*/
 objects*/
 macros/
+macros.x64
 help/
 Makefile
 GIT_Notes.txt

Changes

@@ -1,5 +1,22 @@
 -*- encoding: utf-8; -*-
 
+Sat May 28 16:52:13 2022 adamy
+
+	* hunspell-1.7.0
+
+Fri May 27 20:46:49 2022 adamy
+
+	* libarchive-3.6.1
+
+	* mingw - alpha
+
+		o mingw toolchain, makelib and libtool.
+		o gcc build and warnings.
+
+Thu Mar 24 13:36:07 2022 adamy
+
+	* mandoc-1.14.6
+
 Tue Mar 22 18:46:50 2022 adamy
 
 	* BUILD 21, version: 3.2.2

Makefile.in

@@ -1,5 +1,5 @@
 # -*- mode: mak; -*-
-# $Id: Makefile.in,v 1.52 2022/03/22 10:50:24 cvsuser Exp $
+# $Id: Makefile.in,v 1.59 2022/06/11 05:01:42 cvsuser Exp $
 # GRIEF - top level makefile.
 #
 # Copyright (c) 1998 - 2022, Adam Young.
@@ -112,7 +112,7 @@ XCLEAN=		$(D_BIN)/*.map
 
 # Configuration
 
-ifneq "" "$(filter win32,@build_os@)"
+ifeq ("win32","@build_os@")
 BUSYBOX=	@BUSYBOX@
 ifeq ($(BUSYBOX),busybox)
 BUSYBOX=	$(shell which busybox 2>/dev/null)
@@ -132,7 +132,8 @@ ifneq ("$(word 1,$(MAKECMDGOALS))","release")
 		|\n\
 		| make [release or debug] target \n\
 		|\n\
-		|	Build one or more of the following targets recursively within each sub-directory. \n\
+		|	Build one or more of the following targets recursively within each sub-directory\n\
+		|	for the toolchain @TOOLCHAIN@. \n\
 		|\n\
 		| Targets: \n\
 		|\n\
@@ -192,11 +193,13 @@ PACKAGEINFO=	include/edpackageinfo.h
 CC=		@CC@
 CXX=		@CXX@
 AR=		@AR@
+RANLIB=		@RANLIB@
 RM=		@RM@
 RMDIR=		@RMDIR@
 CP=		@CP@
 RC=		@RC@
 PERL=		@PERL@
+LIBTOOL=	@LIBTOOL@
 TAR=		@TAR@
 LEX=		@LEX@
 YACC=		@YACC@
@@ -206,7 +209,7 @@ INSTALL=	@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
 INSTALL_DATA=	@INSTALL_DATA@
 
-ifneq "" "$(filter mingw32 win32,@build_os@)"
+ifeq ("win32","@build_os@")
 INNO=		@INNO@
 ifeq ($(INNO),) # Inno5: allowing legacy XP installations
 INNO=		"C:/Program Files (x86)/Inno Setup 5/Compil32"
@@ -256,9 +259,18 @@ CLBRNAME=	clbr19
 MT7RNAME=	mt7r19
 PLBRNAME=	plbr19
 endif
+
+	# As path format is dependent on which variant,
+	# firstly resolve using WATCOM envvar, otherwise fallback to which.
+LIBCLBRPATH=	$(subst \,/,$(wildcard $(WATCOM)/binnt/$(CLBRNAME).dll))
+ifeq ("","$(LIBCLBRPATH)")
 LIBCLBRPATH=	$(shell which $(CLBRNAME).dll)
 LIBMT7RPATH=	$(shell which $(MT7RNAME).dll)
 LIBPLBRPATH=	$(shell which $(PLBRNAME).dll)
+else
+LIBMT7RPATH=	$(subst \,/,$(wildcard $(WATCOM)/binnt/$(MT7RNAME).dll))
+LIBPLBRPATH=	$(subst \,/,$(wildcard $(WATCOM)/binnt/$(PLBRNAME).dll))
+endif
 endif
 
 IMPORT=
@@ -268,19 +280,31 @@ IMPORT+=\
 	$(D_BIN)/$(MT7RNAME).dll	\
 	$(D_BIN)/$(PLBRNAME).dll
 endif
+
+GRUPDATER=	no
+ifeq (vs,$(findstring vs,"@TOOLCHAIN@"))
+GRUPDATER=	yes
+else ifeq ("@TOOLCHAIN@","owc20")
+GRUPDATER=	yes
+else ifeq ("@TOOLCHAIN@","owc19")
+GRUPDATER=	yes
+endif
 
 BINS=\
 	$(D_BIN)/gr$(E)			\
 	$(D_BIN)/gm$(E)			\
 	$(D_BIN)/grcpp$(E)		\
 	$(D_BIN)/grmandoc$(E)		\
 	$(D_BIN)/grunch$(E)
-ifneq "" "$(filter mingw32 win32,@build_os@)"
+ifneq "" "$(filter win32,@build_os@)"
 BINS+=	$(D_BIN)/grwc$(E)
 endif
-
+ifeq ("yes","$(GRUPDATER)")
+BINS+=	$(D_BIN)/grupdater$(E)
+endif
+
 LIBS=
-ifneq "" "$(filter mingw32 win32,@build_os@)"
+ifneq "" "$(filter win32,@build_os@)"
 LIBS+=	$(LW)win32
 endif
 LIBS+=\
@@ -321,7 +345,8 @@ help:
 		|\n\
 		| make [release or debug] target \n\
 		|\n\
-		|	Build one or more of the following targets recursively within each sub-directory. \n\
+		|	Build one or more of the following targets recursively within each sub-directory\n\
+		|	for the toolchain @TOOLCHAIN@. \n\
 		|\n\
 		| Targets: \n\
 		|\n\
@@ -330,7 +355,7 @@ help:
 		|	clean   - delete everything which can be remade. \n\
 		|	help    - command line usage. \n\
 		"
-                
+
 .PHONY:				release
 release:
 		$(MAKE) BUILD_TYPE=release $(filter-out release, $(MAKECMDGOALS))
@@ -340,7 +365,7 @@ debug:
 		$(MAKE) BUILD_TYPE=debug $(filter-out debug, $(MAKECMDGOALS))
 
 .PHONY:
-ifneq "" "$(filter mingw32 win32,@build_os@)"
+ifneq "" "$(filter win32,@build_os@)"
 contrib:			directories buildinfo $(LW)win32 $(LW)misc
 		$(MAKE) -C contrib
 else
@@ -382,6 +407,7 @@ package:	import packageinfo
 	$(INNO) ./win32/gr-inno-setup.iss
 	-$(RM) $(PACKAGEINFO)
 
+
 #########################################################################################
 # Applications
 
@@ -451,9 +477,13 @@ $(D_BIN)/grmandoc$(E):	$(D_BIN)/.created libs
 
 $(D_BIN)/grunch$(E):	$(D_BIN)/.created libs
 		$(MAKE) -C $(D_GRUNCH)
-                
+
 $(D_BIN)/grwc$(E):	$(D_BIN)/.created libs
 		$(MAKE) -C util
+
+$(D_BIN)/grupdater$(E):	$(D_BIN)/.created libs
+		$(MAKE) -C win32/AutoUpdater
+
 
 #########################################################################################
 # Rules
@@ -496,7 +526,7 @@ install:		build
 clean:
 		@echo $(BUILD_TYPE) clean
 		$(MAKE) -C libmisc clean
-ifneq "" "$(filter mingw32 win32,@build_os@)"
+ifneq "" "$(filter win32,@build_os@)"
 		$(MAKE) -C libw32
 endif
 		$(MAKE) -C libmalloc clean

README.md

@@ -1,6 +1,12 @@
-[![Website](https://img.shields.io/badge/View-Website-blue)](https://sourceforge.net/projects/grief/) [![GitHub release](https://img.shields.io/github/release/Naereen/StrapDown.js.svg)](https://github.com/adamyg/grief/releases/)
+[![Website](https://img.shields.io/badge/View-Website-blue)](https://sourceforge.net/projects/grief/)
+[![GitHub release](https://img.shields.io/github/release/Naereen/StrapDown.js.svg)](https://github.com/adamyg/grief/releases/)
+[![Workflow](https://github.com/adamyg/grief/actions/workflows/build.yml/badge.svg)](https://github.com/adamyg/grief/actions)
 
-[![Build status](https://ci.appveyor.com/api/projects/status/3tx1vwwclydfp1t6?svg=true&passingText=Ubuntu%20Passing&failingText=Ubuntu%20Failing&pendingText=Ubuntu%20Pending)](https://ci.appveyor.com/project/adamyg/grief-ubuntu) [![Build status](https://ci.appveyor.com/api/projects/status/3tx1vwwclydfp1t6?svg=true&passingText=MacOS%20Passing&failingText=MacOS%20Failing&pendingText=MacOS%20Pending)](https://ci.appveyor.com/project/adamyg/grief-macos) [![Build status](https://ci.appveyor.com/api/projects/status/3tx1vwwclydfp1t6?svg=true&passingText=Win32%20Passing&failingText=Win32%20Failing&pendingText=Win32%20Pending)](https://ci.appveyor.com/project/adamyg/grief-win32) [![Build status](https://ci.appveyor.com/api/projects/status/3tx1vwwclydfp1t6?svg=true&passingText=Cygwin32%20Passing&failingText=Cygwin32%20Failing&pendingText=Cygwin32%20Pending)](https://ci.appveyor.com/project/adamyg/grief-cygwin32)
+[![Build status](https://ci.appveyor.com/api/projects/status/3tx1vwwclydfp1t6?svg=true&passingText=Ubuntu%20Passing&failingText=Ubuntu%20Failing&pendingText=Ubuntu%20Pending)](https://ci.appveyor.com/project/adamyg/grief-ubuntu)
+[![Build status](https://ci.appveyor.com/api/projects/status/k63ggto1v8t1c28d?svg=true&passingText=MacOS%20Passing&failingText=MacOS%20Failing&pendingText=MacOS%20Pending)](https://ci.appveyor.com/project/adamyg/grief-macos)
+[![Build status](https://ci.appveyor.com/api/projects/status/77myicx6ab5d6g1a?svg=true&passingText=Win32%20Passing&failingText=Win32%20Failing&pendingText=Win32%20Pending)](https://ci.appveyor.com/project/adamyg/grief-win32)
+[![Build status](https://ci.appveyor.com/api/projects/status/3h8sweuo36r8q28t?svg=true&passingText=Cygwin32%20Passing&failingText=Cygwin32%20Failing&pendingText=Cygwin32%20Pending)](https://ci.appveyor.com/project/adamyg/grief-cygwin32)
+[![Build status](https://ci.appveyor.com/api/projects/status/8jk4qx55d4bql3l1?svg=true&passingText=MinGW32%20Passing&failingText=MinGW32%20Failing&pendingText=MinGW32%20Pending)](https://ci.appveyor.com/project/adamyg/grief-mingw)
 
 GRIEF - BRIEF clone
 =======================================================
@@ -24,10 +30,13 @@ Facility, was a popular programmer's text editor in the 1980s and early 1990s.
    * Supported operating systems
 
         * Linux
-        * Microsoft Windows (native/cygwin/mingw)
-        * AIX
-        * HP-UX
+        * Microsoft Windows (native/cygwin)
         * Mac OS/X
+        
+   * Other operating systems; working may be required
+
+        * HP-UX
+        * AIX
         * Solaris (SPARC and x86)
 
 Examples
@@ -96,6 +105,6 @@ can be found at the following.
 
     * <http://www.crisp.com>
 
-last update: May/2020
+last update: May/2022
 
 -end-