Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove grunt #580

Merged
merged 18 commits into from
May 31, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
root = true
[*]
end_of_line = lf
insert_final_newline = true
charset = utf-8

[*.js]
indent_style = space
indent_size = 2
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@ src/version.js
src/sha.js
src/util/wigglemaps.js
src/util/distanceGrid.js
dist/**
testing/**
geo.js
**/*.min.js
examples/common/js/jsonlint.js
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"key-spacing": 0,
"no-unneeded-ternary": 0,
"yoda": 0,
"no-useless-call": 0
"no-useless-call": 0,
"camelcase": 0
},
"env": {
"browser": true
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
/docs/*.py
!/docs/conf.py
!/docs/parse.py
/dist
.eslintcache
/lcov
/notes
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ before_install:

script:
- npm run build
- ./node_modules/.bin/grunt docs
- npm run docs
- mkdir _build
- ctest -S cmake/travis_build.cmake -VV || true
- if [ -f _build/test_failed ] ; then false ; fi
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ enable_testing()
set(BUILD_TESTING ON CACHE BOOL "Enable geojs testing")
set(PHANTOMJS_TESTS ON CACHE BOOL "Generate phantomjs unit tests.")
set(ESLINT_TESTS ON CACHE BOOL "Generate eslint style tests for JS source files.")
set(SELENIUM_TESTS OFF CACHE BOOL "Generate selenium unit tests.")
set(SELENIUM_TESTS ON CACHE BOOL "Generate selenium unit tests.")

site_name(HOSTNAME)

Expand All @@ -20,7 +20,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

set(NOTES_PATH "${CMAKE_CURRENT_BINARY_DIR}/build_notes.json")

# set the path where grunt builds the sources
# set the path where webpack builds the sources
set(GEOJS_DEPLOY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dist")

function(add_geojs_test test_name)
Expand Down
303 changes: 0 additions & 303 deletions Gruntfile.js

This file was deleted.

4 changes: 3 additions & 1 deletion cmake/travis_build.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
set(coverage_file "${CTEST_SOURCE_DIRECTORY}/dist/cobertura/phantomjs/coverage.xml")

ctest_start("Continuous")
ctest_configure()
ctest_configure(
OPTIONS "-DSELENIUM_TESTS=OFF"
)
ctest_build()
ctest_test(PARALLEL_LEVEL 1 RETURN_VALUE res)
if(EXISTS "${coverage_file}")
Expand Down
3 changes: 3 additions & 0 deletions dist/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*
!index.html
!.gitignore
File renamed without changes.
Loading