From aeb7137a56284b7fe4be29989ea172f3bd56da3b Mon Sep 17 00:00:00 2001
From: Rogan Creswick <creswick@gmail.com>
Date: Wed, 5 Jun 2013 13:49:11 -0700
Subject: updated documentation, bulid files, and removed an old gitignore file

---
 Makefile            | 7 ++++---
 README.md           | 3 +--
 contexts/.gitignore | 7 -------
 3 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 contexts/.gitignore

diff --git a/Makefile b/Makefile
index 2b57dfe..d98b544 100644
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,7 @@ $(eval $(call subdir,doc))
 # Maven Packages ###############################################################
 
 # Don't try to run any of this if maven isn't installed
-MVN_EXE := $(shell which --skip-alias $i mvn 2>/dev/null)
+MVN_EXE := $(shell which mvn 2>/dev/null)
 ifneq "$(MVN_EXE)" ""
 
 # package/install various maven sub-projects
@@ -86,8 +86,8 @@ TEST_RUNNER_DIR := testrunner
 HEADLESS_DIR    := headless
 RSTESTER_DIR    := rsTester
 
-test: chromeExtension profile-chrome profile-firefox ffExtension pkg-rsTester
-	cd $(TEST_RUNNER_DIR) && $(MVN_TEST_CMD)
+test: fiveui.crx fiveui.xpi $(topdir)/profiles/chrome $(topdir)/profiles/firefox pkg-rsTester
+#	cd $(TEST_RUNNER_DIR) && $(MVN_TEST_CMD)
 	cd $(RSTESTER_DIR)    && $(MVN_TEST_CMD)
 	cd $(HEADLESS_DIR)    && $(MVN_TEST_CMD)
 
@@ -98,6 +98,7 @@ endif
 
 ifneq "$(PHANTOM_EXE)" ""
 
+test: test-js
 test-js:
 	cd $(topdir)/contexts/data && $(PHANTOM_EXE)           \
 	  lib/phantomjs_jasmine/phantomjs_jasminexml_runner.js \
diff --git a/README.md b/README.md
index a88f8cd..e10ed1f 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ repository, so building FiveUI should be as simple as running:
     $ make
 
 In the top-level FiveUI repository root.  On success, this will put
-the generated extensions in the `contexts` directory.
+the generated extensions in the top-level directory.
 
 ### Chrome signing key
 
@@ -69,7 +69,6 @@ This is the repository for the FiveUI project.
 
 ```
 binaries    : A directory holding the latest extension binaries
-build       : Helper scripts for building and packaging FiveUI
 contexts    : Implementation details for supported contexts (Firefox, Chrome, etc.)
 doc         : FiveUI Documentation
 exampleData : Sample web pages and rule sets for testing.
diff --git a/contexts/.gitignore b/contexts/.gitignore
deleted file mode 100644
index 67a424f..0000000
--- a/contexts/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-target
-fiveui.xpi
-fiveui.crx
-rofile
-.token
-chrome/background.js
-stage
-- 
cgit v1.2.3