Merge master into release/2

--HG--
branch : release

.github/FUNDING.yml

@@ -1,9 +1,11 @@
 # FUNDING.yml - GitHub sponsor button configuration
-# Copyright (C) 2019 Kaz Nishimura
+# Copyright (C) 2019-2020 Kaz Nishimura
 #
 # Copying and distribution of this file, with or without modification, are
 # permitted in any medium without royalty provided the copyright notice and
 # this notice are preserved. This file is offered as-is, without any warranty.
 ---
+github:
+  - kazssym
 custom:
   - https://salt.bountysource.com/checkout/amount?team=vx68k

.github/workflows/release.yml

@@ -14,12 +14,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - id: set-version
+        run: |
+          echo "::set-output name=version::`expr '${{ github.ref }}' : '.*/\(.*\)'`"
       - uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ github.ref }}
-          release_name: Version ${{ github.ref }}
+          release_name: Version ${{ steps.set-version.outputs.version }}
           body: |
-            This is ...
+            This is version ${{ steps.set-version.outputs.version }} of ....
           draft: true

.gitignore

@@ -14,24 +14,22 @@ config.h.in
 configure
 aclocal.m4
 stamp-*
-.dirstamp
-Debug
-Release
+_build
+LibrarySupport
 .libs
 .deps
-LibrarySupport
-_build
 *@quot.po
 *@boldquot.po
 *.insert-header
 *.gmo
 *.trs
-*.log
 *.pc
 *.lo
 *.o
 *.tvsconfig
 *.local
+*.lineno
+*.log
 *.cache
 *.rej
 *.orig

.hgignore

@@ -15,24 +15,22 @@ syntax: regexp
 (^|/)configure$
 (^|/)aclocal\.m4$
 (^|/)stamp-[^/]*$
-(^|/)\.dirstamp$
-(^|/)Debug$
-(^|/)Release$
+(^|/)_build$
+(^|/)LibrarySupport$
 (^|/)\.libs$
 (^|/)\.deps$
-(^|/)LibrarySupport$
-(^|/)_build$
 @quot\.po$
 @boldquot\.po$
 \.insert-header$
 \.gmo$
 \.trs$
-\.log$
 \.pc$
 \.lo$
 \.o$
 \.tvsconfig$
 \.local$
+\.lineno$
+\.log$
 \.cache$
 \.rej$
 \.orig$

.hgtags

@@ -1,2 +1,3 @@
 0b9aff908790e0dc941587209eb3a9ce1057004e release/2-alpha.1
 bf7c62707dccb2d8bf7b84a625a3277920f137cd release/2-alpha.2
+334752b5b7688bc94854b967a1af3fb35df98ac2 release/2-alpha.3

.vscode/c_cpp_properties.json

@@ -1,8 +1,9 @@
 {
+    "version": 4,
     "configurations": [
         {
             "name": "POSIX (GCC)",
-            "compilerPath": "/usr/bin/gcc",
+            "compilerPath": "gcc",
             "includePath": [
                 "${workspaceFolder}",
                 "${workspaceFolder}/libvm68kapi",
@@ -12,14 +13,33 @@
                 "HAVE_CONFIG_H"
             ],
             "cStandard": "c11",
-            "cppStandard": "c++11",
+            "cppStandard": "c++14",
+            "browse": {
+                "path": [
+                    "${workspaceFolder}"
+                ],
+                "limitSymbolsToIncludedHeaders": true
+            }
+        },
+        {
+            "name": "Win32 (MinGW-w64 cross)",
+            "compilerPath": "i686-w64-mingw32-gcc",
+            "includePath": [
+                "${workspaceFolder}",
+                "${workspaceFolder}/libvm68kapi",
+                "${workspaceFolder}/libvm68k"
+            ],
+            "defines": [
+                "HAVE_CONFIG_H"
+            ],
+            "cStandard": "c11",
+            "cppStandard": "c++14",
             "browse": {
                 "path": [
                     "${workspaceFolder}"
                 ],
                 "limitSymbolsToIncludedHeaders": true
             }
         }
-    ],
-    "version": 4
+    ]
 }

.vscode/tasks.json

@@ -6,6 +6,7 @@
             "type": "process",
             "command": "make",
             "args": [
+                "V=0",
                 "check"
             ],
             "group": "build",
@@ -18,6 +19,7 @@
             "type": "process",
             "command": "make",
             "args": [
+                "V=0",
                 "clean",
                 "check"
             ],
@@ -31,6 +33,7 @@
             "type": "process",
             "command": "make",
             "args": [
+                "V=0",
                 "clean"
             ],
             "group": "none",

Makefile.am

@@ -2,13 +2,13 @@
 
 ACLOCAL_AMFLAGS = -Im4
 
-EXTRA_DIST = libvm68k.groupproj
+EXTRA_DIST = README.md libvm68k.groupproj
 
 SUBDIRS = libvm68kapi libvm68k test
 
 dist-hook: $(distdir)/SHA256SUMS
 	if test -n "$$GPG_USERNAME"; then \
-	    gpg -ba -u "$$GPG_USERNAME" $(distdir)/SHA256SUMS; \
+	  gpg -ba -u "$$GPG_USERNAME" $(distdir)/SHA256SUMS; \
 	fi
 
 $(distdir)/SHA256SUMS:

README.md

@@ -0,0 +1,14 @@
+# Introduction
+
+The libvm68k library is an M68000 emulation engine implemented in C++,
+primarily for use in [Virtual X68000][].
+
+[Virtual X68000]: https://www.vx68k.org/vx68k
+
+# License
+
+This program is provided under the terms and conditions of the [GNU General Public License, version 3][GPL-3.0].
+
+[![(License)](https://img.shields.io/badge/license-GPL--3.0--or--later-blue.svg)][GPL-3.0]
+
+[GPL-3.0]: https://opensource.org/licenses/GPL-3.0

azure-pipelines.yml

@@ -6,7 +6,7 @@
 # this notice are preserved.  This file is offered as-is, without any warranty.
 ---
 variables:
-  package.distName: libvm68k-2-alpha.3
+  package.distName: libvm68k-2-alpha.4
   uploadRepository: kazssym/libvm68k
 trigger:
   - master
@@ -25,35 +25,36 @@ stages:
             inputs:
               secureFile: keys.asc
           - bash: |
-              echo '$(gpg.passphrase)' | \
+              echo '$(gpg.passphrase)' |
               sh ./setupkeys.sh '$(Keys.secureFilePath)'
             displayName: Set up signing keys
           - bash: |
               sudo apt-get install -q --no-install-recommends \
-                  texinfo \
-                  libcppunit-dev
+                texinfo \
+                libcppunit-dev
             displayName: Install build dependencies
           - bash: |
-              autoreconf
+              autoreconf --verbose
             displayName: Bootstrap
           - bash: |
-              ./configure --disable-static
+              ./configure --disable-static &&
+              echo "##vso[task.uploadfile]`pwd`/config.log"
             displayName: Configure
           - bash: |
               make check
             displayName: Build
           - task: PublishTestResults@2
             condition: succeededOrFailed()
           - bash: |
-              make dist || exit $?
-              mkdir -p _dist
+              make dist &&
+              mkdir -p _dist &&
               mv -f '$(package.distName)'.* _dist/
-            displayName: Make source archive
+            displayName: Make distributables
           - publish: _dist
             artifact: dist
   - stage: Test
     jobs:
-      - job: Test
+      - job: Build
         strategy:
           matrix:
             Ubuntu:
@@ -63,7 +64,7 @@ stages:
             macOS:
               VM_IMAGE: macOS-latest
               CC: clang
-              CXX: clang++ -std=c++11
+              CXX: clang++ -std=c++14
         continueOnError: true
         pool:
           vmImage: $(VM_IMAGE)
@@ -72,23 +73,22 @@ stages:
           - download: current
             artifact: dist
           - bash: |
-              gzip -dc '$(Agent.BuildDirectory)/dist/$(package.distName).tar.gz' | \
-              tar -x
+              gzip -dc '$(Agent.BuildDirectory)'/dist/*.tar.gz |
+              tar -x --strip-components=1
             displayName: Unpack
           - bash: |
               $CC --version
               $CXX --version
-              ./configure --prefix='$(Build.BinariesDirectory)'
+              ./configure --prefix='$(Build.BinariesDirectory)' &&
+              echo "##vso[task.uploadfile]`pwd`/config.log"
             displayName: Configure
-            workingDirectory: $(package.distName)
           - bash: |
               make check
             displayName: Build
-            workingDirectory: $(package.distName)
           - bash: |
-              make install installcheck
+              make install &&
+              make installcheck
             displayName: Install
-            workingDirectory: $(package.distName)
   - stage: Release
     dependsOn: Default
     condition:
@@ -106,5 +106,5 @@ stages:
             artifact: dist
           - bash: |
               sh ./upload.sh -u '$(bitbucket.username):$(bitbucket.password)' \
-                  -r '$(uploadRepository)' '$(Agent.BuildDirectory)'/dist/*
+                -r '$(uploadRepository)' '$(Agent.BuildDirectory)'/dist/*
             displayName: Upload

configure.ac

@@ -1,22 +1,30 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.69])
-AC_INIT([libvm68k], [2-alpha.3],
-[https://bitbucket.org/kazssym/libvm68k/issues/new],,
+AC_INIT([libvm68k], [2-alpha.4],
+[https://github.com/vx68k/libvm68k/issues/new],,
 [https://www.vx68k.org/vx68k/libvm68k])
 AC_CONFIG_SRCDIR([libvm68k/execution_context.cpp])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
-LT_PREREQ([2.4.6])
-LT_INIT()
 AM_INIT_AUTOMAKE([foreign no-define tar-ustar])
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
 # Checks for libraries.
 # Checks for header files.
+AC_CHECK_HEADERS([sys/mman.h])
 # Checks for typedefs, structures, and compiler characteristics.
 # Checks for library functions.
+# Checks for other features.
+LT_PREREQ([2.4.6])
+LT_INIT([win32-dll])
 PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit=yes])
+AC_ARG_WITH([cppunit],
+[AS_HELP_STRING([--with-cppunit], [use CppUnit [default=yes]])],,
+[with_cppunit=yes])
+if test "$with_cppunit" = no; then
+  no_cppunit=yes
+fi
 AM_CONDITIONAL([CPPUNIT], [test "$no_cppunit" != yes])
 # Configuration actions.
 AC_CONFIG_FILES([Makefile libvm68kapi/Makefile libvm68k/Makefile