From 13abcc13dd6a879b4af3b14e32e421615687b2f4 Mon Sep 17 00:00:00 2001
From:  <git@ricciadams.com>
Date: Tue, 4 Nov 2014 00:57:48 -0800
Subject: [PATCH] Changes for final 0.x release - Include esprima.js directly -
 Change copyright - Change 'main' in packages.json

---
 LICENSE.MIT      | 2 +-
 bin/ojc          | 3 +--
 package.json     | 9 +++++----
 src/compiler.js  | 4 ++--
 src/errors.js    | 2 +-
 src/modifier.js  | 2 +-
 src/squeezer.js  | 4 ++--
 src/traverser.js | 2 +-
 src/utils.js     | 2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/LICENSE.MIT b/LICENSE.MIT
index d6099d0..589f2ed 100644
--- a/LICENSE.MIT
+++ b/LICENSE.MIT
@@ -1,7 +1,7 @@
 Unless otherwise mentioned (runtime.js), files in this project are licensed under
 the MIT license:
 
-Copyright (c) 2013 musictheory.net, LLC
+Copyright (c) 2013-2014 musictheory.net, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/bin/ojc b/bin/ojc
index 5b4fd2e..056b8bf 100755
--- a/bin/ojc
+++ b/bin/ojc
@@ -1,13 +1,12 @@
 #!/usr/bin/env node 
 
 /*
-  (c) 2013 musictheory.net, LLC
+  (c) 2013-2014 musictheory.net, LLC
   MIT license, http://www.opensource.org/licenses/mit-license.php
 */
 
 var fs       = require("fs");
 var util     = require("util");
-var esprima  = require("esprima-oj");
 var ojc      = require("../src/compiler");
 
 var args = process.argv.slice(2);
diff --git a/package.json b/package.json
index a2a5679..f376e8a 100644
--- a/package.json
+++ b/package.json
@@ -2,12 +2,12 @@
     "name": "ojc",
     "description": "compiler for the oj language",
     "homepage": "http://github.com/musictheory/oj",
-    "main": "esprima.js",
+    "main": "src/compiler.js",
     "bin": {
         "ojc": "./bin/ojc",
         "ojsqueeze": "./bin/ojsqueeze"
     },
-    "version": "0.1.0-9",
+    "version": "0.2.0",
     "engines": {
         "node": ">=0.8.0"
     },
@@ -24,9 +24,10 @@
         "type": "MIT",
         "url": "http://github.com/musictheory/oj/raw/master/LICENSE.MIT"
     }],
-    "dependencies": {
-        "esprima-oj": "*"
+    "devDependencies": {
+        "mocha": "*"
     },
+    "dependencies": { },
     "scripts": {
         "test": "mocha"
     }
diff --git a/src/compiler.js b/src/compiler.js
index 87fa163..aa33e6f 100644
--- a/src/compiler.js
+++ b/src/compiler.js
@@ -1,10 +1,10 @@
 /*
     compiler.js
-    (c) 2013 musictheory.net, LLC
+    (c) 2013-2014 musictheory.net, LLC
     MIT license, http://www.opensource.org/licenses/mit-license.php
 */
 
-var esprima   = require && require("esprima-oj");
+var esprima   = require && require("./esprima");
 var Modifier  = require && require("./modifier").Modifier;
 var OJError   = require && require("./errors").OJError;
 var Traverser = require && require("./traverser").Traverser;
diff --git a/src/errors.js b/src/errors.js
index f426402..1f0607f 100644
--- a/src/errors.js
+++ b/src/errors.js
@@ -1,6 +1,6 @@
 /*
     errors.js
-    (c) 2013 musictheory.net, LLC
+    (c) 2013-2014 musictheory.net, LLC
     MIT license, http://www.opensource.org/licenses/mit-license.php
 */
 
diff --git a/src/modifier.js b/src/modifier.js
index 40e0b9f..4017aff 100644
--- a/src/modifier.js
+++ b/src/modifier.js
@@ -1,6 +1,6 @@
 /*
     modifier.js
-    (c) 2013 musictheory.net, LLC
+    (c) 2013-2014 musictheory.net, LLC
     MIT license, http://www.opensource.org/licenses/mit-license.php
 
     Based on Modifier from harmonizr (http://github.com/jdiamond/harmonizr)
diff --git a/src/squeezer.js b/src/squeezer.js
index 94f803b..6ba3c5e 100644
--- a/src/squeezer.js
+++ b/src/squeezer.js
@@ -1,10 +1,10 @@
 /*
     compiler.js
-    (c) 2013 musictheory.net, LLC
+    (c) 2013-2014 musictheory.net, LLC
     MIT license, http://www.opensource.org/licenses/mit-license.php
 */
 
-var esprima   = require && require("esprima-oj");
+var esprima   = require && require("./esprima");
 var Traverser = require && require("./traverser").Traverser;
 var Syntax    = esprima.Syntax;
 var Modifier  = require && require("./modifier").Modifier;
diff --git a/src/traverser.js b/src/traverser.js
index a0d8b19..78ab88e 100644
--- a/src/traverser.js
+++ b/src/traverser.js
@@ -1,6 +1,6 @@
 /*
     traverser.js
-    (c) 2013 musictheory.net, LLC
+    (c) 2013-2014 musictheory.net, LLC
     MIT license, http://www.opensource.org/licenses/mit-license.php
 */
 
diff --git a/src/utils.js b/src/utils.js
index c1ccc7f..07a97c3 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -1,6 +1,6 @@
 /*
     traverser.js
-    (c) 2013 musictheory.net, LLC
+    (c) 2013-2014 musictheory.net, LLC
     MIT license, http://www.opensource.org/licenses/mit-license.php
 */