Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
ebac2b3
add transform and filter functionality for nsfw
Sep 15, 2017
ec5013b
add some tests for the transform files
Sep 18, 2017
7f83be1
add testcases for the FileWatcher implementation
Sep 20, 2017
9b06a54
fix windows compile errors
Sep 20, 2017
08a55c9
add transform and filter functionality for nsfw
Sep 15, 2017
31090b2
add some tests for the transform files
Sep 18, 2017
56e485c
add testcases for the FileWatcher implementation
Sep 20, 2017
a358c03
fix windows compile errors
Sep 20, 2017
d9bb3c9
modify cmake and add ctest
Sep 25, 2017
f0d00a5
repair code style
Sep 25, 2017
250529b
merge conflicts
Sep 25, 2017
0e90a8a
delete comment in cmakelists
Sep 25, 2017
2a3f7b0
add virtual destructors
Sep 25, 2017
1f437b0
review issues
Sep 26, 2017
07fe872
review issues
Sep 27, 2017
1eda018
indentation
Sep 27, 2017
f031693
change a lot of thing to use this as a library
Oct 26, 2017
c4c31c3
install the project with cmake
Oct 27, 2017
ae40db2
add include guards
Oct 27, 2017
57fbfcf
add namespaces for nsfw
Oct 30, 2017
ab64839
add namespaces in whole project and every supported platform
Nov 2, 2017
b2aebce
change the js entry class to the library
Nov 2, 2017
f8bab16
FIX: compilation on macOS
reneme Nov 3, 2017
daba5e8
fix Filewatcher Test
Nov 7, 2017
020c1fc
integrate cmake and ctest to travis and appveyor
Nov 13, 2017
c9f8cb8
Merge branch 'master' into feature/add_cpp_interface_for_nsfw
Jan 24, 2018
d931ef3
update Catch to Catch2 2.1.0
reneme Jan 24, 2018
288c317
disable bogus test on macOS now
reneme Jan 24, 2018
4f1c5ec
fix mutex locking
Jan 24, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 53 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,57 @@
env:
matrix:
- export NODE_VERSION="4" CC=clang CXX=clang++ npm_config_clang=1
- export NODE_VERSION="6" CC=clang CXX=clang++ npm_config_clang=1
- export NODE_VERSION="7" CC=clang CXX=clang++ npm_config_clang=1
sudo: required

matrix:
include:
- os: linux
compiler: gcc
dist: trusty
env: NODE_VERSION="4"
- os: osx
compiler: clang
osx_image: xcode8
env: NODE_VERSION="4"

- os: linux
compiler: gcc
dist: trusty
env: NODE_VERSION="6"
- os: osx
compiler: clang
osx_image: xcode8
env: NODE_VERSION="6"

- os: linux
compiler: gcc
dist: trusty
env: NODE_VERSION="7"
- os: osx
compiler: clang
osx_image: xcode8
env: NODE_VERSION="7"

- os: linux
compiler: gcc
dist: trusty
env: NODE_VERSION="8"
- os: osx
compiler: clang
osx_image: xcode8
env: NODE_VERSION="8"

branches:
only:
- master
# only:
# - master

git:
depth: 10

compiler: clang
addons:
apt:
sources: ['ubuntu-toolchain-r-test']
packages: ['g++-6']

before_install:
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update; fi
- git clone https://github.com/creationix/nvm.git ./.nvm
- source ./.nvm/nvm.sh
- nvm install $NODE_VERSION
Expand All @@ -22,11 +60,12 @@ before_install:
install:
- npm install

before_script:
- env
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX="g++-6" CC="gcc-6" && cmake .; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export npm_config_clang=1 && cmake .; fi

script:
- npm test

os:
- linux
- osx

sudo: false
- cmake --build .
- ctest -VV
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ project (${PROJECT_NAME})

message (STATUS "Running CMake version ${CMAKE_VERSION}")

set (CMAKE_CXX_STANDARD 11)

set (NSFW_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/include")

enable_testing()

add_subdirectory (src)
add_subdirectory (test)
9 changes: 6 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,18 @@ environment:
- nodejs_version: "6"
- nodejs_version: "7"

branches:
only:
- master
#branches:
# only:
# - master

# Install scripts. (runs after repo cloning)
install:
# Get the latest stable version of Node.js or io.js
- ps: Install-Product node $env:nodejs_version
# install modules
- npm install --msvs_version=2015
- cmake .
- cmake --build .

# Post-install test scripts.
test_script:
Expand All @@ -24,6 +26,7 @@ test_script:
- npm --version
# run tests
- npm test
- ctest -VV

# Don't actually build.
build: off
Expand Down
2 changes: 1 addition & 1 deletion binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"win_delay_load_hook": "false",
"include_dirs": [
"<!(node -e \"require('nan')\")",
"includes"
"include"
],
"conditions": [
["OS=='win'", {
Expand Down
Loading