Skip to content

Commit

Permalink
Merge pull request #56 from WojciechRynczuk/v3_release
Browse files Browse the repository at this point in the history
Release v3.0.1
  • Loading branch information
WojciechRynczuk committed Nov 27, 2018
2 parents a0ec5df + 6513da7 commit 3aa7f0d
Show file tree
Hide file tree
Showing 181 changed files with 29,077 additions and 1,036 deletions.
180 changes: 149 additions & 31 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,117 @@
# Doxygen generated doc
sources/doc/doxygen

# Created by https://www.gitignore.io/api/visualstudio,c++

# Created by https://www.gitignore.io/api/c++,cmake,eclipse,visualstudio

### C++ ###
# Prerequisites
*.d

# Compiled Object files
*.slo
*.lo
*.o
*.obj

# Precompiled Headers
*.gch
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Fortran module files
*.mod
*.smod

# Compiled Static libraries
*.lai
*.la
*.a
*.lib

# Executables
*.exe
*.out
*.app

### CMake ###
CMakeCache.txt
CMakeFiles
CMakeScripts
Testing
Makefile
cmake_install.cmake
install_manifest.txt
compile_commands.json
CTestTestfile.cmake

### Eclipse ###

.metadata
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.settings/
.loadpath
.recommenders

# Eclipse Core
.project

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# PyDev specific (Python IDE for Eclipse)
*.pydevproject

# CDT-specific (C/C++ Development Tooling)
.cproject

# JDT-specific (Eclipse Java Development Tools)
.classpath

# Java annotation processor (APT)
.factorypath

# PDT-specific (PHP Development Tools)
.buildpath

# sbteclipse plugin
.target

# Tern plugin
.tern-project

# TeXlipse plugin
.texlipse

# STS (Spring Tool Suite)
.springBeans

# Code Recommenders
.recommenders/

# Scala IDE specific (Scala & Java development for Eclipse)
.cache-main
.scala_dependencies
.worksheet

### VisualStudio ###
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
##
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore

# User-specific files
*.suo
Expand Down Expand Up @@ -46,17 +152,17 @@ TestResult.xml
[Rr]eleasePS/
dlldata.c

# DNX
# .NET Core
project.lock.json
project.fragment.lock.json
artifacts/
**/Properties/launchSettings.json

*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
Expand All @@ -65,7 +171,6 @@ artifacts/
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
Expand Down Expand Up @@ -115,6 +220,10 @@ _TeamCity*
# DotCover is a Code Coverage Tool
*.dotCover

# Visual Studio code coverage results
*.coverage
*.coveragexml

# NCrunch
_NCrunch_*
.*crunch*.local.xml
Expand Down Expand Up @@ -164,7 +273,7 @@ PublishScripts/
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
# NuGet v3's project.json files produces more ignoreable files
# NuGet v3's project.json files produces more ignorable files
*.nuget.props
*.nuget.targets

Expand Down Expand Up @@ -194,9 +303,9 @@ ClientBin/
*~
*.dbmdl
*.dbproj.schemaview
*.jfm
*.pfx
*.publishsettings
node_modules/
orleans.codegen.cs

# Since there are multiple workflows, uncomment next line to ignore bower_components
Expand All @@ -217,6 +326,7 @@ UpgradeLog*.htm
# SQL Server files
*.mdf
*.ldf
*.ndf

# Business Intelligence projects
*.rdl.data
Expand All @@ -231,13 +341,20 @@ FakesAssemblies/

# Node.js Tools for Visual Studio
.ntvs_analysis.dat
node_modules/

# Typescript v1 declaration files
typings/

# Visual Studio 6 build log
*.plg

# Visual Studio 6 workspace options file
*.opt

# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
*.vbw

# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
Expand All @@ -257,33 +374,34 @@ paket-files/
.idea/
*.sln.iml

# CodeRush
.cr/

### C++ ###
# Compiled Object files
*.slo
*.lo
*.o
*.obj
# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc

# Precompiled Headers
*.gch
*.pch
# Cake - Uncomment if you are using it
# tools/**
# !tools/packages.config

# Compiled Dynamic libraries
*.so
*.dylib
*.dll
# Telerik's JustMock configuration file
*.jmconfig

# Fortran module files
*.mod
# BizTalk build output
*.btp.cs
*.btm.cs
*.odx.cs
*.xsd.cs

# Compiled Static libraries
*.lai
*.la
*.a
*.lib
# End of https://www.gitignore.io/api/c++,cmake,eclipse,visualstudio

# Executables
*.exe
*.out
*.app
# Created by https://www.gitignore.io/api/python

### Python ###
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# End of https://www.gitignore.io/api/python
8 changes: 7 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
[submodule "sources/3rdParty/catch"]
path = sources/3rdParty/catch
url = https://github.com/philsquared/Catch
[submodule "sources/3rdParty/pugixml"]
path = sources/3rdParty/pugixml
url = https://github.com/zeux/pugixml
[submodule "sources/3rdParty/tclap"]
path = sources/3rdParty/tclap
url = https://github.com/sjm324/tclap
url = https://github.com/mirror/tclap
18 changes: 10 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ env:
#COVERITY_SCAN_TOKEN
- secure: "OtVLkLQ+O18ZOxFCVTotdxWwxOqE0HcCh7LEguFPpPOp5KX9JsBrRdN8Hq689AK+GnQVuYVHkRPdiduYq8CUoLppZy0AMus7muJp2bdnotwufOIZ0r9lqzau9F4HKcdg8LBjyoHq2gnJZgNsSlrma9AGJ8nKBlVCsOJU/2DB0zJ0ufUR92otRsbKlF0TFXC2SARHYL1fgjoJBtwtKyUkHcn5/85EZjUeZGVvvRIA1oqFN2ksHv2QSevSb4auZgi8Gz4LdkQFfWa+SYDoguMYDZCkJRg4kP/ciuAxWfulroXUyAHOGvg29AwkK7hpnFCiGCxm+mOoDousBrJymuqdblwyTzy3d84i1QZQWEAaSROuPA/cpmSPHBvx+H/YTkmdPKXp46728I1wSILOclN1icWll9KhuiDMGY48e2Zmux5SKuLTjg1wzFNrVEwLeiGT7kExWXeKdPMRo/xmH2vPDlBUVrl2z12RRinpGLW0lgG70f5EJl0K30ArNXmFfFZ775nUBokc9nVgK/bjA9t2olRlOC3tzkhgZnDYp7N/AudKeOnpsWeZEQjf9p/o7SjvMvqgbGXL6kZ74n8Jkau1nKIB+9viplLpBInxEYyMSZ/9qFZf3roYmBVYRA8v6G6PsFagYnqp4vl1zGjiO49KEW1jEF56gWKRYuYHQOaebsI="
#Compilers
- CC=gcc-6
- CXX=g++-6
- CC=gcc-8
- CXX=g++-8

#Disable the default Travis submodule behavior.
git:
Expand All @@ -23,17 +23,19 @@ addons:
sources:
- ubuntu-toolchain-r-test
packages:
- gcc-6
- g++-6
- gcc-8
- g++-8
- txt2man
- doxygen
- graphviz

coverity_scan:
project:
name: vcdMaker
version: v3.0
description: Coverity Scan by Travis CI
notification_email: vcdmaker@mail.com
build_command_prepend: "cov-configure --comptype gcc --compiler g++-6 --template && cmake ."
build_command_prepend: "cov-configure --comptype gcc --compiler g++-8 --template && cmake -DUSE_STATIC_PUGIXML=ON -DCMAKE_BUILD_TYPE=Release ."
build_command: "make"
branch_pattern: coverity_scan

Expand All @@ -54,6 +56,6 @@ before_script:
- cd ./sources

script:
- cmake .
- make
- make comparisonTest
- cmake -DUSE_STATIC_PUGIXML=ON -DCMAKE_BUILD_TYPE=Release .
- VERBOSE=1 make
- make check
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016 vcdMaker team
Copyright (c) 2018 vcdMaker team

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
11 changes: 6 additions & 5 deletions development/config/Doxyfile → development/config/Doxyfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = vcdMaker
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 2.0
PROJECT_NUMBER = 3.0

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand All @@ -58,7 +58,7 @@ PROJECT_LOGO =
# entered, it will be relative to the location where doxygen was started. If
# left blank the current directory will be used.

OUTPUT_DIRECTORY = doxygen
OUTPUT_DIRECTORY = ${OUTPUT_DIR_ABSOLUE}/doxygen

# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
# directories (in 2 levels) under the output directory of each output format and
Expand Down Expand Up @@ -187,7 +187,7 @@ SHORT_NAMES = NO
# description.)
# The default value is: NO.

JAVADOC_AUTOBRIEF = NO
JAVADOC_AUTOBRIEF = YES

# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
# line (until the first dot) of a Qt-style comment as the brief description. If
Expand Down Expand Up @@ -790,7 +790,7 @@ WARN_LOGFILE =
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
# Note: If this tag is empty the current directory is searched.

INPUT = ../../sources
INPUT = ${PROJECT_SOURCE_DIR}

# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
Expand Down Expand Up @@ -861,7 +861,8 @@ RECURSIVE = YES
# Note that relative paths are relative to the directory from which doxygen is
# run.

EXCLUDE = ../../sources/3rdParty
EXCLUDE = ${PROJECT_SOURCE_DIR}/3rdParty \
${PROJECT_SOURCE_DIR}/parsers/auto

# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded
Expand Down
1 change: 1 addition & 0 deletions sources/3rdParty/catch
Submodule catch added at c390c4
1 change: 1 addition & 0 deletions sources/3rdParty/pugixml
Submodule pugixml added at 77d7e6
2 changes: 1 addition & 1 deletion sources/3rdParty/tclap
Submodule tclap updated from 67907b to 1e1cc4
Loading

0 comments on commit 3aa7f0d

Please sign in to comment.