From 885a6e8dacaa9fd48d019cc08e687d8aea8521f7 Mon Sep 17 00:00:00 2001 From: Ivan Vilata-i-Balaguer Date: Wed, 16 Mar 2016 14:37:28 +0100 Subject: [PATCH 1/4] Add missing periods in build doc Markdown formatting makes the sentences join together. --- doc/build.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/build.md b/doc/build.md index 98a08b9a60..1f8c61902e 100644 --- a/doc/build.md +++ b/doc/build.md @@ -56,8 +56,8 @@ However, if you're not familiar with git or it is otherwise inconvenient to use, ### 2. Install bitcoinj fork -Versions later than 0.13.1 has removed support for Java serialisation -In version 0.13.1 is also missing support for Java serialisation in MainNetParams (HttpDiscovery.Details) +Versions later than 0.13.1 has removed support for Java serialisation. +In version 0.13.1 is also missing support for Java serialisation in MainNetParams (HttpDiscovery.Details). We remove Cartographer/HttpDiscovery support from in our [fork version 0.13.1.1](https://github.com/bitsquare/bitcoinj/tree/RemovedHttpDiscovery). Beside the Java serialisation issues here are [privacy concerns](http://bitcoin-development.narkive.com/hczWIAby/bitcoin-development-cartographer#post3) regarding Cartographer. From 5d888f63b2a8c1aac95b5e8752589edddd90fd21 Mon Sep 17 00:00:00 2001 From: Ivan Vilata-i-Balaguer Date: Wed, 16 Mar 2016 14:42:09 +0100 Subject: [PATCH 2/4] Add reminder about OpenJDK and OpenJFX in build instructions --- doc/build.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/build.md b/doc/build.md index 1f8c61902e..8ca5168ce9 100644 --- a/doc/build.md +++ b/doc/build.md @@ -32,6 +32,7 @@ Prerequisites ------------- The only prerequisite for building Bitsquare is installing the Java Development Kit (JDK), version 8u40 or better (as well as maven and git). +In Debian-like systems with OpenJDK you'll need OpenJFX as well, i.e. you'll need the `openjfx` package besides the `openjdk-8-jdk` package. To check the version of Java you currently have installed: From 088d5f22f3b0595d31d5ed541c1c204a09de89dd Mon Sep 17 00:00:00 2001 From: Ivan Vilata-i-Balaguer Date: Wed, 16 Mar 2016 14:43:00 +0100 Subject: [PATCH 3/4] Use same term for Debian-like systems in build instructions --- doc/build.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/build.md b/doc/build.md index 8ca5168ce9..264c70849d 100644 --- a/doc/build.md +++ b/doc/build.md @@ -32,7 +32,7 @@ Prerequisites ------------- The only prerequisite for building Bitsquare is installing the Java Development Kit (JDK), version 8u40 or better (as well as maven and git). -In Debian-like systems with OpenJDK you'll need OpenJFX as well, i.e. you'll need the `openjfx` package besides the `openjdk-8-jdk` package. +In Debian/Ubuntu systems with OpenJDK you'll need OpenJFX as well, i.e. you'll need the `openjfx` package besides the `openjdk-8-jdk` package. To check the version of Java you currently have installed: From 05ca2dbb327f6c4e0d1bb946ae54dd6dacf5b1f4 Mon Sep 17 00:00:00 2001 From: Ivan Vilata-i-Balaguer Date: Wed, 16 Mar 2016 14:45:22 +0100 Subject: [PATCH 4/4] Indicate that Bitsquare can be built with OpenJDK, still untested --- doc/build.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/build.md b/doc/build.md index 264c70849d..d394d9f5e9 100644 --- a/doc/build.md +++ b/doc/build.md @@ -41,7 +41,8 @@ To check the version of Java you currently have installed: If `javac` is not found, or your version is anything less than `1.8.0_40`, then you'll need to [download and install the latest JDK]( http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) for your platform. -> _**TIP:** Here are [instructions](http://www.webupd8.org/2014/03/how-to-install-oracle-java-8-in-debian.html) for installing the JDK via `apt` on Debian/Ubuntu systems._ +> _**TIP:** Here are [instructions](http://www.webupd8.org/2014/03/how-to-install-oracle-java-8-in-debian.html) for installing the JDK via `apt` on Debian/Ubuntu systems. +> Bitsquare can be built with OpenJDK as well, but this hasn't been thoroughly tested yet._ Steps