You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ripple.apache.org by da...@apache.org on 2013/05/30 16:19:40 UTC
[14/16] git commit: Remove git submodule support by changing how
Jasmine is pulled in.
Remove git submodule support by changing how Jasmine is pulled in.
It is the only git submodule, that provides no extra benefit as one.
This also makes the project not depend on git to run tests.
Issue Ref: https://issues.apache.org/jira/browse/RIPPLE-13
Since the latest Jasmine stable release does not play well being in
NPM's package.json, it can be installed nicely with bower.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ripple/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ripple/commit/fb77af84
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ripple/tree/fb77af84
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ripple/diff/fb77af84
Branch: refs/heads/master
Commit: fb77af84a6b43bf7772e8b4fe5c3ccbcfc752032
Parents: bee356b
Author: Brent Lintner <br...@gmail.com>
Authored: Tue May 14 19:15:07 2013 -0400
Committer: Brent Lintner <br...@gmail.com>
Committed: Tue May 21 15:10:03 2013 -0400
----------------------------------------------------------------------
.bowerrc | 3 +++
.gitignore | 1 +
.gitmodules | 3 ---
bower.json | 6 ++++++
configure | 2 +-
package.json | 3 ++-
thirdparty/jasmine | 1 -
7 files changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ripple/blob/fb77af84/.bowerrc
----------------------------------------------------------------------
diff --git a/.bowerrc b/.bowerrc
new file mode 100644
index 0000000..ab784a9
--- /dev/null
+++ b/.bowerrc
@@ -0,0 +1,3 @@
+{
+ "directory": "thirdparty"
+}
http://git-wip-us.apache.org/repos/asf/incubator-ripple/blob/fb77af84/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index c4defee..1b051ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ pkg
services
npm-debug.log
test/assets/cov/results.html
+thirdparty/jasmine
http://git-wip-us.apache.org/repos/asf/incubator-ripple/blob/fb77af84/.gitmodules
----------------------------------------------------------------------
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 4294313..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "thirdparty/jasmine"]
- path = thirdparty/jasmine
- url = http://github.com/pivotal/jasmine.git
http://git-wip-us.apache.org/repos/asf/incubator-ripple/blob/fb77af84/bower.json
----------------------------------------------------------------------
diff --git a/bower.json b/bower.json
new file mode 100644
index 0000000..7fd707b
--- /dev/null
+++ b/bower.json
@@ -0,0 +1,6 @@
+{
+ "name": "ripple-emulator",
+ "devDependencies": {
+ "jasmine": "1.3.x"
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ripple/blob/fb77af84/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index 9ee4bcd..854b328 100755
--- a/configure
+++ b/configure
@@ -19,4 +19,4 @@
npm install -g jake jshint csslint uglify-js
npm install
-git submodule update --init
+./node_modules/.bin/bower install
http://git-wip-us.apache.org/repos/asf/incubator-ripple/blob/fb77af84/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 109248e..8b294c2 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,8 @@
"html-minifier": "0.4.5",
"jWorkflow": "0.x.x",
"xmlhttprequest": "1.4.2",
- "coverjs": "0.0.14"
+ "coverjs": "0.0.14",
+ "bower": "0.9.x"
},
"files": [
"README.md",
http://git-wip-us.apache.org/repos/asf/incubator-ripple/blob/fb77af84/thirdparty/jasmine
----------------------------------------------------------------------
diff --git a/thirdparty/jasmine b/thirdparty/jasmine
deleted file mode 160000
index 22904c4..0000000
--- a/thirdparty/jasmine
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 22904c4f8340a5fc8ef6f1656966db4235dfa08e