Merge master into release/1

--HG--
branch : release

.github/workflows/release.yml

@@ -0,0 +1,28 @@
+# release.yml
+# Copyright (C) 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.
+---
+on:
+  push:
+    tags:
+      - release/*
+jobs:
+  build:
+    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 ${{ steps.set-version.outputs.version }}
+          body: |
+            This is ${{ steps.set-version.outputs.version }} of....
+          draft: true

.gitignore

@@ -1,8 +1,18 @@
-runtest
+**/cppunitx/cppunitx
+**/test/runtest
+**/libgnu/getopt.h
+**/libgnu/stddef.h
+**/libgnu/stdlib.h
+**/libgnu/sysexits.h
+**/libgnu/unistd.h
+**/libgnu/sys/types.h
+**/libgnu/arg-nonnull.h
+**/libgnu/c++defs.h
+**/libgnu/warn-on-use.h
+libtool
 Makefile
-config.status
 config.h
-libtool
+config.status
 Makefile.in
 config.h.in
 configure
@@ -23,10 +33,10 @@ _build
 *.a
 *.lo
 *.o
+*.cache
 *.tvsconfig
 *.local
 *.user
-*.cache
 *.rej
 *.orig
 *~

.hgignore

@@ -1,9 +1,19 @@
 syntax: regexp
-(^|/)runtest$
+(^|/)cppunitx/cppunitx$
+(^|/)test/runtest$
+(^|/)libgnu/getopt\.h$
+(^|/)libgnu/stddef\.h$
+(^|/)libgnu/stdlib\.h$
+(^|/)libgnu/sysexits\.h$
+(^|/)libgnu/unistd\.h$
+(^|/)libgnu/sys/types\.h$
+(^|/)libgnu/arg-nonnull\.h$
+(^|/)libgnu/c\+\+defs\.h$
+(^|/)libgnu/warn-on-use\.h$
+(^|/)libtool$
 (^|/)Makefile$
-(^|/)config\.status$
 (^|/)config\.h$
-(^|/)libtool$
+(^|/)config\.status$
 (^|/)Makefile\.in$
 (^|/)config\.h\.in$
 (^|/)configure$
@@ -24,10 +34,10 @@ syntax: regexp
 \.a$
 \.lo$
 \.o$
+\.cache$
 \.tvsconfig$
 \.local$
 \.user$
-\.cache$
 \.rej$
 \.orig$
 ~$

.hgtags

@@ -1,2 +1,3 @@
 25ee843f907eb7376ad6f1af1aa15d40622062bb release/1-alpha.1
 9692febc64935c4c6db640dd9c5c1244dec3d43c release/1-alpha.2
+60e4429974732831ef81924059dbfc7b824c8c0d release/1-alpha.3

.vscode/launch.json

@@ -6,11 +6,16 @@
             "request": "launch",
             "name": "(gdb) Launch",
             "preLaunchTask": "Build",
-            "program": "${workspaceFolder}/test/runtest",
+            "program": "${workspaceFolder}/cppunitx/.libs/cppunitx",
             "args": [
-                "example.la"
+                "test_example.la"
+            ],
+            "environment": [
+                {
+                    "name": "LD_LIBRARY_PATH",
+                    "value": "${workspaceFolder}/libcppunitx/.libs"
+                }
             ],
-            "environment": [],
             "cwd": "${workspaceFolder}/test",
             "stopAtEntry": false,
             "externalConsole": false,

Makefile.am

@@ -2,9 +2,9 @@
 
 ACLOCAL_AMFLAGS = -Im4
 
-EXTRA_DIST = README.md
+EXTRA_DIST = README.md m4/gnulib-cache.m4
 
-SUBDIRS = libcppunitx test doc
+SUBDIRS = libgnu libcppunitx cppunitx test doc
 
 dist-hook:: $(distdir)/SHA256SUMS
 	if test -n "$$GPG_USERNAME"; then \

azure-pipelines.yml

@@ -6,11 +6,11 @@
 # this notice are preserved.  This file is offered as-is, without any warranty.
 ---
 variables:
-  package.distName: cppunitx-1-alpha.3
+  package.distName: cppunitx-1-alpha.4
+  uploadRepository: kazssym/cppunitx
 trigger:
   - master
   - release/*
-  - feature/*
 stages:
   - stage: Default
     jobs:
@@ -45,10 +45,10 @@ stages:
             condition: succeededOrFailed()
           - bash: |
               make dist || exit $?
-              mkdir -p dist
-              mv -f '$(package.distName)'.* dist/
+              mkdir -p _dist
+              mv -f '$(package.distName)'.* _dist/
             displayName: Make source archive
-          - publish: dist
+          - publish: _dist
             artifact: dist
   - stage: Test
     jobs:
@@ -71,13 +71,14 @@ stages:
           - download: current
             artifact: dist
           - bash: |
-              gzip -dc '$(Pipeline.Workspace)/dist/$(package.distName).tar.gz' | \
+              gzip -dc '$(Agent.BuildDirectory)/dist/$(package.distName).tar.gz' | \
               tar -x
             displayName: Unpack
           - bash: |
               $CC --version
               $CXX --version
               ./configure --prefix='$(Build.BinariesDirectory)'
+              echo "##vso[task.uploadfile]`pwd`/config.log"
             displayName: Configure
             workingDirectory: $(package.distName)
           - bash: |
@@ -90,7 +91,7 @@ stages:
             workingDirectory: $(package.distName)
   - stage: Release
     dependsOn: Default
-    condition: >-
+    condition:
       and(succeeded(),
         startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))
     jobs:
@@ -100,12 +101,10 @@ stages:
           vmImage: ubuntu-latest
         variables:
           - group: bitbucket
-          - name: repository
-            value: kazssym/cppunitx
         steps:
           - download: current
             artifact: dist
           - bash: |
               sh ./upload.sh -u '$(bitbucket.username):$(bitbucket.password)' \
-                  -r '$(repository)' '$(Pipeline.Workspace)'/dist/*
+                  -r '$(uploadRepository)' '$(Agent.BuildDirectory)'/dist/*
             displayName: Upload

build-aux/snippet/_Noreturn.h

@@ -0,0 +1,10 @@
+#if !defined _Noreturn && __STDC_VERSION__ < 201112
+# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
+      || 0x5110 <= __SUNPRO_C)
+#  define _Noreturn __attribute__ ((__noreturn__))
+# elif 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn
+# endif
+#endif

build-aux/snippet/arg-nonnull.h

@@ -0,0 +1,26 @@
+/* A C macro for declaring that specific arguments must not be NULL.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools
+   that the values passed as arguments n, ..., m must be non-NULL pointers.
+   n = 1 stands for the first argument, n = 2 for the second argument etc.  */
+#ifndef _GL_ARG_NONNULL
+# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3
+#  define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params))
+# else
+#  define _GL_ARG_NONNULL(params)
+# endif
+#endif