Merge pull request #580 from OpenGeoscience/webpack-examples

Remove grunt

Author: jbeezley

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+
+[*.js]
+indent_style = space
+indent_size = 2

.eslintignore

@@ -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

.eslintrc

@@ -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

.gitignore

@@ -12,7 +12,6 @@
 /docs/*.py
 !/docs/conf.py
 !/docs/parse.py
-/dist
 .eslintcache
 /lcov
 /notes

.travis.yml

@@ -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

CMakeLists.txt

@@ -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)
 
@@ -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)

Gruntfile.js

@@ -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}")

cmake/travis_build.cmake

@@ -0,0 +1,3 @@
+*
+!index.html
+!.gitignore