Merge pull request #15741 from gaye/backout-bug-9500080

Revert "Bug 950080 - add grunt jsdoc generator to gaia"
mozilla-b2g · Jan 27, 2014 · 1f727f9 · 1f727f9
2 parents dfd0861 + b9331fc
commit 1f727f9
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 63 deletions.
diff --git a/.jsdocrc b/.jsdocrc
diff --git a/Gruntfile.js b/Gruntfile.js
diff --git a/Makefile b/Makefile
@@ -986,7 +986,7 @@ endif
 
 # clean out build products
 clean:
-	rm -rf profile profile-debug profile-test $(PROFILE_FOLDER) $(STAGE_FOLDER) docs
+	rm -rf profile profile-debug profile-test $(PROFILE_FOLDER) $(STAGE_FOLDER)
 
 # clean out build products and tools
 really-clean: clean
@@ -1004,6 +1004,3 @@ build-test-unit: $(NPM_INSTALLED_PROGRAMS)
 
 build-test-integration: $(NPM_INSTALLED_PROGRAMS)
 	@$(call run-build-test, $(shell find build/test/integration/*.test.js))
-
-docs: $(NPM_INSTALLED_PROGRAMS)
-	grunt docs
diff --git a/README.md b/README.md
@@ -168,9 +168,3 @@ See [Gaia functional tests README](https://github.com/mozilla-b2g/gaia/blob/mast
 #### Endurance
 
 See [how to run the Gaia endurance tests](https://developer.mozilla.org/en-US/docs/Mozilla/Firefox_OS/Platform/Automated_testing/endurance_tests/how_to_run_gaiaui_endurance_tests)
-
-## Generate jsdoc
-
-To generate API reference locally:
-
-run `make docs` command to generate docs in `docs` folder
diff --git a/package.json b/package.json
@@ -33,10 +33,8 @@
     "async": "0.2.9",
     "adm-zip": "0.4.3",
     "dive": "0.3.0",
-    "grunt": "0.4.2",
-    "grunt-contrib-clean": "0.5.0",
-    "grunt-jsdoc": "0.5.0",
     "marionette-file-manager": "0.0.2",
-    "q": "~0.9.7"
+    "q": "~0.9.7",
+    "dive": "0.3.0"
   }
 }