update to Erlang/OTP R14B04
diff --git a/README.md b/README.md
index 6974fc8..e53b3af 100644
--- a/README.md
+++ b/README.md
@@ -25,8 +25,8 @@
pushd c:\relax
path=c:\relax\bin;%path%
- aria2c.exe --force-sequential=false --max-connection-per-server=1 --check-certificate=false --auto-file-renaming=false --input-file=downloads.md --max-concurrent-downloads=5 --dir=bits --save-session=bits/a2session.txt
- cd bits && md5sum.exe --check md5sums.txt
+ aria2c.exe --force-sequential=false --max-connection-per-server=1 --check-certificate=false --auto-file-renaming=false --input-file=downloads.md --max-concurrent-downloads=5 --dir=bits --save-session=bits/a2session.txt
+ cd bits && md5sum.exe --check ..\downloads.md5
# Install Compilers
################################################################################
@@ -163,9 +163,8 @@
* launch a cygwin erl-ified shell via `c:\relax\bin\shell.cmd`
* choose your erlang version - R14B03 is strongly advised
* unpack erlang source by `cd $RELAX && tar xzf bits/otp_src_R14B03.tar.gz`
-* apply additional [patches] to allow building with OpenSSL again
* customise Erlang by excluding unneeded Java interface and old GS GUI:
-
+
cd $ERL_TOP
tar xvzf /relax/bits/tcltk85_win32_bin.tar.gz
echo "skipping gs" > lib/gs/SKIP
@@ -177,13 +176,12 @@
erl_config.sh
erl_build.sh
-
+
* the output is logged into `$ERL_TOP/build_*.txt` if required
* at this point I usually duplicate the OTP source tree for later
robocopy $ERL_TOP /relax/release/$OTP_REL -mir
-[patches]: https://github.com/dch/otp/commit/d1e151a689f8e54cdc2d671e96e00beb86d2b571
# ICU 4.4.2
################################################################################
diff --git a/bin/erl_config_static.sh b/bin/erl_config_static.sh
new file mode 100755
index 0000000..db40cbb
--- /dev/null
+++ b/bin/erl_config_static.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+pushd $ERL_TOP
+./otp_build autoconf 2>&1 | tee $ERL_TOP/build_autoconf.txt
+# from Erlang/OTP R14B03 onwards, Erlang by default is built with
+# *static* OpenSSL.
+./otp_build configure --with-ssl=/relax/openssl 2>&1 | tee $ERL_TOP/build_configure.txt
+popd
diff --git a/bin/shell.cmd b/bin/shell.cmd
index d39c6a4..239298b 100755
--- a/bin/shell.cmd
+++ b/bin/shell.cmd
@@ -36,11 +36,9 @@
:: then get to unix goodness as fast as possible
if /i "%choice%"=="0" goto win_shell
::::if /i "%choice%"=="2" goto R......
-if /i "%choice%"=="1" goto R14B01
-if /i "%choice%"=="2" goto R14B02
if /i "%choice%"=="3" goto R14B03
if /i "%choice%"=="4" goto R14B04
-if /i "%choice%"=="5" goto R14B05
+if /i "%choice%"=="5" goto R15B
:: else
goto eof
@@ -52,10 +50,10 @@
goto unix_shell
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:R14B01
-set ERL_TOP=/relax/otp_src_R14B01
-set ERTS_VSN=5.8.2
-set OTP_REL=R14B01
+:R15B
+set ERL_TOP=/relax/otp_src_R15B
+set ERTS_VSN=5.9
+set OTP_REL=R15B
goto unix_shell
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
diff --git a/bin/sync_otp.cmd b/bin/sync_otp.cmd
index b78e24c..7da2aa1 100755
--- a/bin/sync_otp.cmd
+++ b/bin/sync_otp.cmd
@@ -1 +1,2 @@
robocopy c:\relax\release\otp_src_R14B03 c:\relax\otp_src_R14B03 -mir -log:NUL:
+robocopy c:\relax\release\otp_src_R14B04 c:\relax\otp_src_R14B04 -mir -log:NUL:
diff --git a/bits/md5sums.txt b/bits/md5sums.txt
index 44203d1..0870dd2 100755
--- a/bits/md5sums.txt
+++ b/bits/md5sums.txt
@@ -7,9 +7,9 @@
998d7ec6d9f07237fe0d54e5c7ffc4ae *MozillaBuildSetup-1.6.exe
23edf89e61f43dd9f47b01fa7fd7c3bd *nasm-2.09.07-win32.zip
5e02441c7f3fa4da4f4928a2d42a07c3 *nsis-2.46-setup.exe
-ce595447571128bc66f630a8fa13339a *otp_src_R14B01.tar.gz
-7979e662d11476b97c462feb7c132fb7 *otp_src_R14B03.tar.gz
0352932ea863bc02b056cda7c9ac5b79 *openssl-0.9.8r.tar.gz
+4b469729f103f52702bfb1fb24529dc0 *otp_src_R14B04.tar.gz
+dd6c2a4807551b4a8a536067bde31d73 *otp_src_R15B.tar.gz
6f819070a9461ff442c708312c919aa5 *setup.exe
41881cc6a7503748c9ea2b1580af2fd0 *strawberry-perl-5.12.2.0-portable.zip
5b39aa309baf8633b475f25e23b75677 *tcltk85_win32_bin.tar.gz
diff --git a/downloads.md b/downloads.md
index 80366d8..ebc2967 100644
--- a/downloads.md
+++ b/downloads.md
@@ -32,8 +32,8 @@
http://www.openssl.org/source/openssl-0.9.8r.tar.gz
################################################################################
### bits required to build erlang
-http://www.erlang.org/download/otp_src_R14B03.tar.gz
-http://www.erlang.org/download/otp_src_R14B01.tar.gz
+http://www.erlang.org/download/otp_src_R15B.tar.gz
+http://www.erlang.org/download/otp_src_R14B04.tar.gz
### nsis nsis-2.46-setup.exe
http://download.sourceforge.net/project/nsis/NSIS%202/2.46/nsis-2.46-setup.exe
http://www.erlang.org/download/tcltk85_win32_bin.tar.gz
diff --git a/erlang.md b/erlang.md
index 6bd9df1..06526b7 100644
--- a/erlang.md
+++ b/erlang.md
@@ -5,7 +5,7 @@
* start a new cygwin shell via `c:\relax\bin\shell.cmd`
* in a cygwin shell:
- cd /relax && tar xzf /relax/bits/otp_src_R14B03.tar.gz &
+ cd /relax && tar xzf /relax/bits/otp_src_R14B04.tar.gz &
* include optional components - used for debugger and java interfaces
