Skip to content

Commit

Permalink
Merge master to create a release-management branch
Browse files Browse the repository at this point in the history
--HG--
branch : release
  • Loading branch information
kazssym committed Mar 30, 2020
2 parents 64aa71b + e6b81b5 commit 62f8a2c
Show file tree
Hide file tree
Showing 78 changed files with 29,226 additions and 1,040 deletions.
9 changes: 9 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# FUNDING.yml - GitHub sponsor button configuration
# Copyright (C) 2019 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.
---
custom:
- https://salt.bountysource.com/checkout/amount?team=vx68k
37 changes: 37 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
test/test-reports/
test/*.test
test/runtest
libvm68k.la
libvm68kapi.la
remove-potcdate.sed
Makefile
config.status
config.h
libtool
POTFILES
Makefile.in
config.h.in
configure
aclocal.m4
stamp-*
**/Debug/
**/Release/
**/LibrarySupport/
**/.libs/
**/.deps/
**/nbproject/private/
**/_build/
*@quot.po
*@boldquot.po
*.insert-header
*.gmo
*.trs
*.log
*.lo
*.o
*.tvsconfig
*.local
*.cache
*.rej
*.orig
*~
15 changes: 9 additions & 6 deletions .hgeol
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
[patterns]

**.res = BIN

# The default is native. DO NOT put any patterns below the next line.
** = native
;; .hgeol - Mercurial EOL conversion rules

[patterns]
;; Images are binary.
**/*.jpg = BIN
**/*.png = BIN

;; The default is set to LF. This MUST be the last pattern.
**/* = LF
54 changes: 38 additions & 16 deletions .hgignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,38 @@
syntax: glob

# RAD Studio files and directories
*.local
*.tvsconfig
*.dsk
LibrarySupport/

# Common binary directories
.libs/
Debug/
Release/

# Backup files
*~
*.~*
syntax: regexp
^test/test-reports/
^test/[^/]*\.test$
^test/runtest$
(^|/)libvm68k\.la$
(^|/)libvm68kapi\.la$
(^|/)remove-potcdate\.sed$
(^|/)Makefile$
(^|/)config\.status$
(^|/)config\.h$
(^|/)libtool$
(^|/)POTFILES$
(^|/)Makefile\.in$
(^|/)config\.h\.in$
(^|/)configure$
(^|/)aclocal\.m4$
(^|/)stamp-[^/]*$
(^|/)Debug/
(^|/)Release/
(^|/)LibrarySupport/
(^|/)\.libs/
(^|/)\.deps/
(^|/)nbproject/private/
(^|/)_build/
@quot\.po$
@boldquot\.po$
\.insert-header$
\.gmo$
\.trs$
\.log$
\.lo$
\.o$
\.tvsconfig$
\.local$
\.cache$
\.rej$
\.orig$
~$
24 changes: 24 additions & 0 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"configurations": [
{
"name": "POSIX",
"includePath": [
"${workspaceFolder}",
"${workspaceFolder}/libvm68kapi",
"${workspaceFolder}/src"
],
"defines": [
"HAVE_CONFIG_H"
],
"cStandard": "c11",
"cppStandard": "c++11",
"browse": {
"path": [
"${workspaceFolder}"
],
"limitSymbolsToIncludedHeaders": true
}
}
],
"version": 4
}
15 changes: 15 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"files.exclude": {
"**/.libs": true,
"**/.deps": true,
"**/*.gmo": true,
"**/*.lo": true,
"**/*.o": true,
"**/*.tvsconfig": true,
"**/*.local": true,
"**/*.cache": true,
"**/*.rej": true,
"**/*.orig": true,
"**/*~": true
}
}
43 changes: 43 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "Build",
"type": "process",
"command": "make",
"args": [
"check"
],
"group": {
"kind": "build",
"isDefault": true
},
"problemMatcher": [
"$gcc"
]
},
{
"label": "Rebuild",
"type": "process",
"command": "make",
"args": [
"clean",
"check"
],
"group": "build",
"problemMatcher": [
"$gcc"
]
},
{
"label": "Clean",
"type": "process",
"command": "make",
"args": [
"clean"
],
"group": "none",
"problemMatcher": []
}
]
}
23 changes: 23 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
This file documents the current guidelines for contributing.

# Conventions

The key words “MUST”, “MUST NOT”, “REQUIRED”, “SHALL”, “SHALL NOT”, “SHOULD”,
“SHOULD NOT”, “RECOMMENDED”, “MAY”, and “OPTIONAL” in this document are to be
interpreted as described in [BCP 14][] when, and only when, they appear in all
capitals, as shown here.

[BCP 14]: https://tools.ietf.org/html/bcp14

# Pull request guidelines

## File encoding

Unless mandated by the media type, a file SHOULD be encoded either in `UTF-8`
(preferred) or in `US-ASCII`, and if it would be in `UTF-8`, it MUST NOT
contain any BOM (U+FEFF).

## End-of-line convention

Unless mandated by the media type, each line of a file SHOULD end with a single
LF (U+000A).
Loading

0 comments on commit 62f8a2c

Please sign in to comment.