projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Install Ubuntu 12.04 LTS dependencies for Travis CI
[folly.git]
/
README.md
diff --git
a/README.md
b/README.md
index e6800cb6e50c04a9053cf22a4a818a17b15ff34b..30df7fa46c0878815a12d275a7a988da1b2e6fa0 100644
(file)
--- a/
README.md
+++ b/
README.md
@@
-18,6
+18,13
@@
Please download googletest from
https://googletest.googlecode.com/files/gtest-1.7.0.zip and unzip it in the
folly/test subdirectory.
https://googletest.googlecode.com/files/gtest-1.7.0.zip and unzip it in the
folly/test subdirectory.
+Ubuntu 12.04
+------------
+
+This release is old, requiring many upgrades. However, since Travis CI runs
+on 12.04, `folly/build/deps_ubuntu_12.04.sh` is provided, and upgrades all
+the required packages.
+
Ubuntu 13.10
------------
Ubuntu 13.10
------------
@@
-71,11
+78,11
@@
OS X (Homebrew)
----
folly is available as a Formula and releases may be built via `brew install folly`.
----
folly is available as a Formula and releases may be built via `brew install folly`.
-You may also use `folly/bootstrap-osx-homebrew.sh` to build against `master`:
+You may also use `folly/b
uild/b
ootstrap-osx-homebrew.sh` to build against `master`:
```
cd folly
```
cd folly
- ./bootstrap-osx-homebrew.sh
+ ./b
uild/b
ootstrap-osx-homebrew.sh
make
make check
```
make
make check
```