From 16549aa49ad8c3ce38dc704f3c938bfdaa8b970f Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 19 Nov 2015 17:11:26 +0000
Subject: [PATCH] Update text docs for Java 7
---
INSTALL-headless.txt | 9 +++++----
INSTALL.txt | 20 +++++++++++---------
README.txt | 3 ++-
3 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/INSTALL-headless.txt b/INSTALL-headless.txt
index 6f54575808..3ae8a14f07 100644
--- a/INSTALL-headless.txt
+++ b/INSTALL-headless.txt
@@ -25,21 +25,22 @@ where there are comments labeled "PORTABLE". Do this before you
run I2P for the first time.
To start I2P:
- (*nix): sh i2prouter start
+ (*nix, BSD, Mac): sh i2prouter start
(win*): I2P.exe
- (non-x86 platforms PPC, ARM, etc): sh runplain.sh
+ (platforms without wrapper support): sh runplain.sh
To stop I2P (gracefully):
lynx http://localhost:7657/summaryframe (click "Shutdown")
+ or (*nix, BSD, Mac) sh i2prouter graceful
To stop I2P immediately:
- sh i2prouter stop
+ (*nix, BSD, Mac) sh i2prouter stop
To uninstall I2P:
rm -rf $I2PInstallDir ~/.i2p
Supported JVMs:
- All platforms: Java 1.6 or higher required; 1.7 or higher recommended
+ All platforms: Java 1.7 or higher required
Windows: OpenJDK or Oracle from http://java.com/download
Linux: OpenJDK or Oracle from http://java.com/download
FreeBSD: OpenJDK or Oracle from http://java.com/download
diff --git a/INSTALL.txt b/INSTALL.txt
index 23701b0411..d9960fc3a0 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,8 +1,9 @@
I2P source installation instructions
Prerequisites to build from source:
- Java SDK (preferably Oracle/Sun or OpenJDK) 1.6.0 or higher
+ Java SDK (preferably Oracle/Sun or OpenJDK) 1.7.0 or higher
Non-linux operating systems and JVMs: See https://trac.i2p2.de/wiki/java
+ Certain subsystems for embedded (core, router, mstreaming, streaming, i2ptunnel) require only Java 1.6
Apache Ant 1.7.0 or higher
The xgettext, msgfmt, and msgmerge tools installed
from the GNU gettext package http://www.gnu.org/software/gettext/
@@ -40,29 +41,30 @@ or on Windows, just double-click on i2pinstall.exe.
Or move the i2pupdate.zip file into an existing installation directory and restart.
To start I2P:
- (*nix): sh i2prouter start
+ (*nix, BSD, Mac): sh i2prouter start
(win*): I2P.exe or i2prouter.bat
- (non-x86 platforms PPC, ARM, etc): sh runplain.sh
+ (platforms without wrapper support): sh runplain.sh
To install I2P as a system service:
- (*nix) sh i2prouter install
+ (*nix, BSD, Mac) sh i2prouter install
(win*) install_i2p_service_winnt.bat
To uninstall I2P as a system service:
- (*nix) sh i2prouter remove
+ (*nix, BSD, Mac) sh i2prouter remove
(win*) uninstall_i2p-service_winnt.bat
To stop I2P (gracefully):
lynx http://localhost:7657/summaryframe (click "Shutdown")
+ or (*nix, BSD, Mac) sh i2prouter graceful
To stop I2P immediately:
- sh i2prouter stop
+ (*nix, BSD, Mac) sh i2prouter stop
To uninstall I2P:
rm -rf $I2PInstallDir ~/.i2p
Supported JVMs:
- Windows: Latest available from http://java.com/download (1.5+ supported)
- Linux: Latest available from http://java.com/download (1.5+ supported)
- FreeBSD: 1.5-compatible (NIO required)
+ Windows: Latest available from http://java.com/download (1.7+ supported)
+ Linux: Latest available from http://java.com/download (1.7+ supported)
+ FreeBSD: 1.7-compatible (NIO required)
Other operating systems and JVMs: See http://trac.i2p2.de/wiki/java
diff --git a/README.txt b/README.txt
index 0a99e21a49..b7a4b8e405 100644
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,7 @@
Prerequisites to build from source:
- Java SDK (preferably Oracle/Sun or OpenJDK) 1.6.0 or higher
+ Java SDK (preferably Oracle/Sun or OpenJDK) 1.7.0 or higher
Non-linux operating systems and JVMs: See https://trac.i2p2.de/wiki/java
+ Certain subsystems for embedded (core, router, mstreaming, streaming, i2ptunnel) require only Java 1.6
Apache Ant 1.7.0 or higher
The xgettext, msgfmt, and msgmerge tools installed
from the GNU gettext package http://www.gnu.org/software/gettext/
--
GitLab