From e1fdc92beb7c3ee267c7bd24c1411f75ed3843f6 Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mike@mikegerwitz.com>
Date: Sun, 22 Dec 2013 00:20:21 -0500
Subject: [PATCH] package.json is now generated by configure script and
 included in distribution

---
 .gitignore                      | 1 +
 Makefile.am                     | 2 +-
 configure.ac                    | 2 +-
 package.json => package.json.in | 2 +-
 tools/verset                    | 3 ---
 5 files changed, 4 insertions(+), 6 deletions(-)
 rename package.json => package.json.in (96%)

diff --git a/.gitignore b/.gitignore
index 0c064fe..3531299 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 build
 node_modules
+package.json
 
 # generated by dist target
 AUTHORS
diff --git a/Makefile.am b/Makefile.am
index 1291d01..780e2c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 # see README
 SUBDIRS = doc
-EXTRA_DIST = AUTHORS NEWS ChangeLog
+EXTRA_DIST = AUTHORS NEWS ChangeLog package.json
 
 path_build = $(top_builddir)/build
 path_tools = $(top_builddir)/tools
diff --git a/configure.ac b/configure.ac
index 4843759..ad9373a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,5 +98,5 @@ AS_IF(test "$JAVA" -a ! "$CCJAR",
 
 AM_CONDITIONAL(HAS_CCJAR, [test "$CCJAR"])
 
-AC_CONFIG_FILES([Makefile doc/Makefile])
+AC_CONFIG_FILES([Makefile doc/Makefile package.json])
 AC_OUTPUT
diff --git a/package.json b/package.json.in
similarity index 96%
rename from package.json
rename to package.json.in
index 4f8c8ba..69f231b 100644
--- a/package.json
+++ b/package.json.in
@@ -1,7 +1,7 @@
 {
   "name":        "easejs",
   "description": "A Classical Object-Oriented Framework for JavaScript",
-  "version":     "0.2.0-dev",
+  "version":     "@VERSION@",
   "author":      "Mike Gerwitz <mike@mikegerwitz.com> (http://mikegerwitz.com)",
   "homepage":    "http://easejs.org",
 
diff --git a/tools/verset b/tools/verset
index 1ea544b..25741e6 100755
--- a/tools/verset
+++ b/tools/verset
@@ -39,8 +39,5 @@ cat version.js.tpl | sed "
   s/@SUFFIX@/${suffix#-}/;
 " > ../lib/version.js
 
-# update package.json for npm
-sed -i 's/"version":.*/"version":     "'$version'",/' ../package.json
-
 # update configure script by replacing the second argument of AC_INIT
 sed -i '/^AC_INIT/s/, \[[^]]\+\]/, ['$version']/' ../configure.ac