Merge pull request #1388 from Ch00rD/master

A few simple updates to the install script and docs.
This commit is contained in:
aparajita
2011-10-28 20:51:56 -07:00
4 changed files with 9 additions and 9 deletions
+5 -5
View File
@@ -20,7 +20,7 @@ System Requirements
To run Cappuccino applications, all you need is a web browser that understands
JavaScript.
To build Cappuccino itself, please read more here: [Getting and Building the Source](http://wiki.github.com/280north/cappuccino/getting-and-building-the-source>).
To build Cappuccino itself, please read more here: [Getting and Building the Source](http://wiki.github.com/cappuccino/cappuccino/getting-and-building-the-source>).
If you're using Windows, you'll also need [Cygwin](http://www.cygwin.com/).
@@ -38,11 +38,11 @@ instead download a pre-compiled copy of Cappuccino from:
To build Cappuccino from source, check out the most recent stable version from GitHub:
$ git clone git://github.com/280north/cappuccino.git (git)
$ git clone git://github.com/cappuccino/cappuccino.git (git)
or download the zipball of the most recent source code:
<http://github.com/280north/cappuccino/zipball/master> (zip)
<http://github.com/cappuccino/cappuccino/zipball/master> (zip)
If this is your first build and your system does not have narwhal and jake
installed, run the bootstrap script to install it and all of its dependencies:
@@ -67,7 +67,7 @@ If you need help with Cappuccino, you can get help from the following sources:
- [FAQ](http://cappuccino.org/discuss/faq.php)
- [Documentation](http://cappuccino.org/learn/)
- [Wiki](http://github.com/280north/cappuccino/wikis)
- [Wiki](http://github.com/cappuccino/cappuccino/wikis)
- Mailing Lists:
- [Objective-J](http://groups.google.com/group/objectivej)
- [Objective-J Developers](http://groups.google.com/group/objectivej-dev)
@@ -75,7 +75,7 @@ If you need help with Cappuccino, you can get help from the following sources:
If you discover any bugs, please file a ticket at:
<http://github.com/280north/cappuccino/issues>
<http://github.com/cappuccino/cappuccino/issues>
License
-------
+1 -1
View File
@@ -1,4 +1,4 @@
Requires objj be installed, as well as ojunit, located at http://github.com/280north/ojunit
Requires objj be installed, as well as ojunit, located at http://github.com/cappuccino/ojunit
Run individual tests using a command similar to the following:
+2 -2
View File
@@ -124,7 +124,7 @@ fi
install_directory=""
tmp_zip="/tmp/narwhal.zip"
github_user="280north"
github_user="cappuccino"
github_ref="master"
tusk_install_command="install"
@@ -149,7 +149,7 @@ usage: ./bootstrap.sh [OPTIONS]
--directory [DIR]: Use a directory other than /usr/local/narwhal.
--clone: Do "git clone git://" instead of downloading zips.
--clone-http: Do "git clone http://" instead of downloading zips.
--github-user [USER]: Use another github user (default: 280north).
--github-user [USER]: Use another github user (default: cappuccino).
--github-ref [REF]: Use another git ref (default: master).
--install-capp: Install "objective-j" and "cappuccino" packages.
--install-test: Install "ojtest" package.
+1 -1
View File
@@ -77,7 +77,7 @@ ensurePackageUpToDate("browserjs", "0.1.1");
ensurePackageUpToDate("shrinksafe", "0.2");
ensurePackageUpToDate("narwhal", "0.3.1", {
noupdate : true,
message : "Update Narwhal by re-running bootstrap.sh, or pulling the latest from git (see: http://github.com/280north/narwhal)."
message : "Update Narwhal by re-running bootstrap.sh, or pulling the latest from git (see: http://github.com/cappuccino/narwhal)."
});
ensurePackageUpToDate("narwhal-jsc", "0.3", {
optional : true,