X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=INSTALL;h=833db389b636890ab1526d41bcd6f94081cd8bd1;hp=95e0ae91803464cb7ed55beb3e7686a9295757b4;hb=39dce56b0e0b4daba503663e44ee6c86a754ddc2;hpb=dd3b0532a3ab3f6712a00b2dfd1697c1437fa077

diff --git a/INSTALL b/INSTALL
index 95e0ae91..833db389 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,19 +1,31 @@
+-------------------------------------------------------------------------------
+INSTALL
+-------------------------------------------------------------------------------
+
 Requirements
 ------------
 
- - git
- - g++
+ - git (only needed when building from git)
+ - A C++ compiler with C++11 support (-std=c++11 option), e.g.
+   - g++ (>= 4.8.1)
+   - clang++ (>= 3.3)
  - make
- - libtool
+ - libtool (only needed when building from git)
  - pkg-config >= 0.22
- - cmake >= 2.6
+ - cmake >= 2.8.12
  - libglib >= 2.28.0
- - Qt >= 4.5
- - libboost >= 1.42 (including the following libs):
+ - glibmm-2.4 (>= 2.28.0)
+ - Qt5 (including the following components):
+    - Qt5Core, Qt5Gui, Qt5Widgets, Qt5Svg
+ - libboost >= 1.55 (including the following libs):
     - libboost-system
-    - libboost-thread
- - libsigrok >= 0.2.0
- - libsigrokdecode >= 0.1.0
+    - libboost-filesystem
+    - libboost-serialization
+    - libboost-test (optional, only needed to run the unit tests)
+ - libsigrokcxx >= 0.6.0 (libsigrok C++ bindings)
+ - libsigrokdecode >= 0.6.0
+ - libsigrokandroidutils >= 0.1.0 (optional, only needed on Android)
+ - Asciidoctor (optional, only needed to build the manual)
 
 
 Building and installing
@@ -30,12 +42,9 @@ For installing PulseView:
 
  $ make install
 
-Please see the following wiki pages for more detailed instructions:
+See the following wiki page for more (OS-specific) instructions:
 
- http://sigrok.org/wiki/Linux
- http://sigrok.org/wiki/Mac_OS_X
- http://sigrok.org/wiki/Windows
- http://sigrok.org/wiki/FreeBSD
+ http://sigrok.org/wiki/Building
 
 
 Creating a source distribution package
@@ -47,3 +56,23 @@ In order to build a source package begin with an unconfigured source tree.
  $ cd dist
  $ cmake ..
  $ make package_source
+
+
+Generating the manual
+---------------------
+
+To generate the HTML manual, you only need Asciidoctor. If you also want
+to generate the PDF manual, you need to install asciidoctor-pdf as well
+and make it available for execution:
+
+ $ gem install --pre asciidoctor-pdf
+ $ export PATH=~/.gem/ruby/2.3.0/bin:$PATH
+
+Then, to build the PulseView manual, run:
+
+ $ cd manual
+ $ ./generate
+
+Note: The stylesheet used is a lightly modified version of "Read The Docs"
+from the Asciidoctor stylesheet factory:
+https://asciidoctor.org/docs/user-manual/#stylesheet-factory