Skip to content

Commit

Permalink
Merge pull request #74 from abishekvashok/master
Browse files Browse the repository at this point in the history
Merge stable with changes from master
  • Loading branch information
abishekvashok authored Mar 27, 2019
2 parents 214004f + ad212c8 commit 77eddf2
Show file tree
Hide file tree
Showing 31 changed files with 655 additions and 10,348 deletions.
17 changes: 12 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
/build
config.h
Makefile
Makefile.in
stamp-h
stamp-h[0-9]*
config.cache
config.log
config.status
config.guess
config.*
compile
configure
configure.lineno
config.status.lineno
cmatrix.spec
depcomp
install-sh
missing
aclocal.m4
autom4te.cache/
.deps
*.tab.c
Expand All @@ -21,4 +27,5 @@ cscope.files
cmatrix
*.o
*.core

CMakeCache.txt
CMakeFiles/
1 change: 1 addition & 0 deletions .rultor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

21 changes: 18 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
language: c

os: linux
os:
- linux
- osx

sudo: required

compiler: gcc
compiler:
- gcc
- clang

env:
- CONFIGURE_CMD=configure
- CONFIGURE_CMD=cmake

script:
- ./configure
- |
if [[ $CONFIGURE_CMD == 'configure' ]]; then
export CC=${CC} && autoreconf -i && ./configure
fi
- |
if [[ $CONFIGURE_CMD == 'cmake' ]]; then
mkdir build && cd build && cmake -DCMAKE_C_COMPILER="${CC}" ..
fi
- make

73 changes: 73 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
# CMake build system for CMatrix

cmake_minimum_required(VERSION 2.8)

project(CMatrix LANGUAGES C)
set(VERSION "1.2")

# These are relative to CMAKE_INSTALL_PREFIX
# which by default is "/usr/local"
set(CONSOLE_FONTS_DIRS "share/consolefonts" "lib/kbd/consolefonts")
set(X_FONTS_DIRS "lib/X11/fonts/misc" "X11R6/lib/X11/fonts/misc" "share/fonts/X11/misc")

set(MKFONTDIR "/usr/bin/mkfontdir")

add_definitions(-DEXCLUDE_CONFIG_H)
add_definitions(-DVERSION="${VERSION}")
add_definitions(-DUSE_TIOCSTI)

include(CheckIncludeFiles)
check_include_files("sys/ioctl.h" HAVE_SYS_IOCTL_H)
if (HAVE_SYS_IOCTL_H)
add_definitions(-DHAVE_SYS_IOCTL_H)
endif ()
check_include_files("unistd.h" HAVE_UNISTD_H)
if (HAVE_UNISTD_H)
add_definitions(-DHAVE_UNISTD_H)
endif ()
check_include_files("termios.h" HAVE_TERMIOS_H)
if (HAVE_TERMIOS_H)
add_definitions(-DHAVE_TERMIOS_H)
endif ()
check_include_files("termio.h" HAVE_TERMIO_H)
if (HAVE_TERMIO_H)
add_definitions(-DHAVE_TERMIO_H)
endif ()

Set(CURSES_NEED_NCURSES TRUE)
find_package(Curses)
include_directories(${CURSES_INCLUDE_DIR})
add_definitions(-DHAVE_NCURSES_H)

add_executable(cmatrix cmatrix.c)

target_link_libraries(cmatrix ${CURSES_LIBRARIES})

install(TARGETS cmatrix DESTINATION bin)

if (UNIX)
foreach (CONSOLE_FONTS_DIR ${CONSOLE_FONTS_DIRS})
if (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${CONSOLE_FONTS_DIR}")
message(STATUS "Installing matrix console fonts to ${CMAKE_INSTALL_PREFIX}/${CONSOLE_FONTS_DIR}")
install(FILES
"${CMAKE_SOURCE_DIR}/matrix.fnt"
"${CMAKE_SOURCE_DIR}/matrix.psf.gz"
DESTINATION "${CONSOLE_FONTS_DIR}")
endif ()
endforeach ()
foreach (X_FONTS_DIR ${X_FONTS_DIRS})
if (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${X_FONTS_DIR}")
message(STATUS "Installing matrix X window fonts to ${CMAKE_INSTALL_PREFIX}/${X_FONTS_DIR}")
install(FILES
"${CMAKE_SOURCE_DIR}/mtx.pcf"
DESTINATION "${X_FONTS_DIR}")
install(CODE
"message(STATUS \"Running mkfontdir ${CMAKE_INSTALL_PREFIX}/${X_FONTS_DIR} ...\")")
install(CODE
"execute_process(COMMAND \"${MKFONTDIR}\" \"${CMAKE_INSTALL_PREFIX}/${X_FONTS_DIR}\")")
install(CODE
"message(STATUS \"If this is the first time you have installed CMatrix you will probably have to restart X window in order to use the mtx.pcf font.\")")
endif ()
endforeach ()
endif ()

46 changes: 46 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
93 changes: 93 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
# Contributing

When contributing to this repository, please first discuss the change you wish to make via issue,
email, or any other method with the owners of this repository before making a change.

Please note we have a code of conduct, please follow it in all your interactions with the project.

## Pull Request Process

1. Ensure any install or build dependencies are removed before the end of the layer when doing a
build.
2. Update the README.md with details of changes to the interface, this includes new environment
variables, exposed ports, useful file locations and container parameters.
3. Increase the version numbers in any examples files and the README.md to the new version that this
Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/).
4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you
do not have permission to do that, you may request the second reviewer to merge it for you.

## Code of Conduct

### Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, gender identity and expression, level of experience,
nationality, personal appearance, race, religion, or sexual identity and
orientation.

### Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

### Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

### Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

### Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the current maintainer at abishekvashok at the rate
mail dot com. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

### Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
Empty file modified COPYING
100755 → 100644
Empty file.
Empty file modified INSTALL
100755 → 100644
Empty file.
13 changes: 13 additions & 0 deletions ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
I am submitting a <!-- Feature Request / Bug Report -->

### Problem or Feature in Brief
<!--- Explain the problem in detail here -->

###

### Solution (if any)
<!-- If you would like to offer any solutions, provide it here or leave this section
blank -->

### Would you like to work on it?
<!-- Answer with a simple yes or no :) -->
67 changes: 39 additions & 28 deletions Makefile.am
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,48 @@ cmatrix_SOURCES = cmatrix.c

man_MANS = cmatrix.1

EXTRA_DIST = COPYING INSTALL install-sh\
if MATRIX_FONTS
BUILD_FONTS = 1
else
BUILD_FONTS = 0
endif

EXTRA_DIST = COPYING INSTALL install-sh \
missing mkinstalldirs matrix.fnt \
matrix.psf.gz mtx.pcf cmatrix.1 cmatrix.spec

install-data-local:
@if test -d /usr/share/consolefonts; then \
echo " Installing matrix fonts in /usr/share/consolefonts..."; \
$(INSTALL_DATA) $(srcdir)/matrix.fnt /usr/share/consolefonts; \
$(INSTALL_DATA) $(srcdir)/matrix.psf.gz /usr/share/consolefonts; \
fi
@if test -d /usr/lib/kbd/consolefonts; then \
echo " Installing matrix fonts in /usr/lib/kbd/consolefonts..."; \
$(INSTALL_DATA) $(srcdir)/matrix.fnt /usr/lib/kbd/consolefonts; \
$(INSTALL_DATA) $(srcdir)/matrix.psf.gz /usr/lib/kbd/consolefonts; \
fi
@if test -d /usr/lib/X11/fonts/misc; then \
echo " Installing X window matrix fonts in /usr/lib/X11/fonts/misc..."; \
$(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/lib/X11/fonts/misc; \
$(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/lib/X11/fonts/misc; \
echo " Running mkfontdir /usr/lib/X11/fonts/misc..."; \
$(MKFONTDIR) /usr/lib/X11/fonts/misc; \
echo " Done. If this is the first time you have installed CMatrix you will"; \
echo " probably have to restart X window in order to use the mtx.pcf font."; \
@if test $(BUILD_FONTS) = 1; then \
if test -d /usr/share/consolefonts; then \
echo " Installing matrix fonts in /usr/share/consolefonts..."; \
$(INSTALL_DATA) $(srcdir)/matrix.fnt /usr/share/consolefonts; \
$(INSTALL_DATA) $(srcdir)/matrix.psf.gz /usr/share/consolefonts; \
fi; \
if test -d /usr/lib/kbd/consolefonts; then \
echo " Installing matrix fonts in /usr/lib/kbd/consolefonts..."; \
$(INSTALL_DATA) $(srcdir)/matrix.fnt /usr/lib/kbd/consolefonts; \
$(INSTALL_DATA) $(srcdir)/matrix.psf.gz /usr/lib/kbd/consolefonts; \
fi; \
if test -d /usr/lib/X11/fonts/misc; then \
echo " Installing X window matrix fonts in /usr/lib/X11/fonts/misc..."; \
$(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/lib/X11/fonts/misc; \
$(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/lib/X11/fonts/misc; \
echo " Running mkfontdir /usr/lib/X11/fonts/misc..."; \
$(MKFONTDIR) /usr/lib/X11/fonts/misc; \
echo " Done. If this is the first time you have installed CMatrix you will"; \
echo " probably have to restart X window in order to use the mtx.pcf font."; \
else \
if test -d /usr/X11R6/lib/X11/fonts/misc; then \
echo " Installing X window matrix fonts in /usr/X11R6/lib/X11/fonts/misc..."; \
$(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/X11R6/lib/X11/fonts/misc; \
$(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/X11R6/lib/X11/fonts/misc; \
echo " Running mkfontdir /usr/X11R6/lib/X11/fonts/misc..."; \
$(MKFONTDIR) /usr/X11R6/lib/X11/fonts/misc; \
echo " Done. If this is the first time you have installed CMatrix you will"; \
echo " probably have to restart X window in order to use the mtx.pcf font."; \
fi \
fi; \
else \
if test -d /usr/X11R6/lib/X11/fonts/misc; then \
echo " Installing X window matrix fonts in /usr/X11R6/lib/X11/fonts/misc..."; \
$(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/X11R6/lib/X11/fonts/misc; \
$(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/X11R6/lib/X11/fonts/misc; \
echo " Running mkfontdir /usr/X11R6/lib/X11/fonts/misc..."; \
$(MKFONTDIR) /usr/X11R6/lib/X11/fonts/misc; \
echo " Done. If this is the first time you have installed CMatrix you will"; \
echo " probably have to restart X window in order to use the mtx.pcf font."; \
fi \
echo "Not installing matrix fonts"; \
fi

Loading

0 comments on commit 77eddf2

Please sign in to comment.