Repository: couchdb-glazier Updated Branches: refs/heads/master 7029bb6e3 -> 69c7f647d
Updates and bug fixes as of 2017-07-08 / Win10 / 2.1 Project: http://git-wip-us.apache.org/repos/asf/couchdb-glazier/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-glazier/commit/69c7f647 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-glazier/tree/69c7f647 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-glazier/diff/69c7f647 Branch: refs/heads/master Commit: 69c7f647da448506724543f499d55146946059e0 Parents: 7029bb6 Author: Joan Touzet <[email protected]> Authored: Sat Jul 8 19:09:03 2017 -0400 Committer: Joan Touzet <[email protected]> Committed: Sat Jul 8 19:09:03 2017 -0400 ---------------------------------------------------------------------- README.md | 309 +++++++++++++++++++++++++++++-------------- bin/build_installer.cmd | 2 +- bin/build_openssl.cmd | 2 +- bin/erl_config.sh | 8 +- bin/rebar | Bin 199962 -> 199736 bytes bin/shell.cmd | 28 ++-- downloads.md | 10 +- downloads.md5 | 11 +- 8 files changed, 239 insertions(+), 131 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-glazier/blob/69c7f647/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 7a7e5bc..c87c1c9 100644 --- a/README.md +++ b/README.md @@ -17,10 +17,10 @@ a consistent, repeatable build environment. - 64-bit Windows 7 or 8.1. *As of CouchDB 2.0 we only support a 64-bit build of CouchDB*. - We like 64-bit Windows 7, 8.1 or 10 Enterprise N (missing Media Player, etc.) from MSDN. - If prompted, reboot after installing the .NET framework. -- [Visual Studio 2013 x64 Community Edition](https://www.visualstudio.com/en-us/news/vs2013-community-vs.aspx) installed on the *C: drive* -- [Chocolatey](https://chocolatey.org). From an *administrative* __cmd.exe__ command prompt: +- [Visual Studio 2013 x64 Community Edition](https://www.visualstudio.com/vs/older-downloads/) installed on the *C: drive*. Downloading requires a free Dev Essentials subscription from Microsoft. +- [Chocolatey](https://chocolatey.org). From an *administrative* __cmd.exe__ command prompt, run: -``` +```dos @powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin ``` @@ -32,47 +32,56 @@ a consistent, repeatable build environment. ## Clean Package Installs with Chocolatey, cyg-get and pip These packages install silently, without intervention. Cut and paste them -into a command prompt, leave it running, and open another one for the next -section. - - cinst -y git 7zip.commandline StrawberryPerl nasm cyg-get wixtoolset python aria2 nodejs.install nssm - -*NOTE*: There is a bug presently in the Chocolatey cygwin package. After the `cinst` above, download the cygwin installer from https://cygwin.com/, rename the installer to cygwinsetup.exe, and move the installer to `C:\tools\cygwin`. This will enable the cyg-get line below. +into an **Administrator** command prompt. - cyg-get p7zip autoconf binutils bison gcc-code gcc-g++ gdb git libtool make patchutils pkg-config readline file renameutils socat time tree util-linux wget - C:\ProgramData\chocolatey\lib\python3\tools\Scripts\pip install sphinx docutils pygments +```dos +cinst -y git 7zip.commandline StrawberryPerl nasm cyg-get wixtoolset python aria2 nodejs.install make +cinst -y nssm --version 2.24.101-g897c7ad +cyg-get p7zip autoconf binutils bison gcc-code gcc-g++ gdb git libtool make patchutils pkg-config readline file renameutils socat time tree util-linux wget +pip install sphinx docutils pygments +``` *Note: Do NOT install curl or help2man inside CygWin!* ## Mozilla build Fetch the latest Mozilla Build version from -https://wiki.mozilla.org/MozillaBuild and install to c:\mozilla-build. +https://wiki.mozilla.org/MozillaBuild and install to c:\mozilla-build +with all defaults. ## Make a new prompt shortcut Make a new shortcut on the desktop. The location should be: - cmd.exe /E:ON /V:ON /T:1F /K ""C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat"" amd64 && color 1f +```dos +cmd.exe /E:ON /V:ON /T:1F /K ""C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat"" amd64 && color 1f +``` -Name it something like "Couch SDK Prompt." -Right-click on the icon, click the `advanced` -button, and tick the `Run as Administrator` button. +Name it "CouchDB SDK Prompt". -I suggest you pin it to the Start menu. We'll use this all the time. +Right-click on the icon, select Properties, click the `Advanced...` +button, and tick the `Run as administrator` checkbox. Click OK twice. -Let's confirm we have the right bits with -`where cl mc mt link lc rc nmake`: +I suggest you pin it to the Start menu. We'll use this all the time. - C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\amd64\cl.exe - C:\Program Files (x86)\Windows Kits\8.1\bin\x64\mc.exe - C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mc.exe - C:\Program Files (x86)\Windows Kits\8.1\bin\x64\mt.exe - C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe - C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\amd64\link.exe - C:\Program Files (x86)\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools\x64\lc.exe - C:\Program Files (x86)\Windows Kits\8.1\bin\x64\rc.exe - C:\Program Files (x86)\Windows Kits\8.1\bin\x86\rc.exe - C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\amd64\nmake.exe +Start a CouchDB SDK Prompt window and run +`where cl mc mt link lc rc nmake make`. Make sure the output matches the +following: + +```dos +C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\amd64\cl.exe +C:\Program Files (x86)\Windows Kits\8.1\bin\x64\mc.exe +C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mc.exe +C:\Program Files (x86)\Windows Kits\8.1\bin\x64\mt.exe +C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe +C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\amd64\link.exe +C:\tools\cygwin\bin\link.exe +C:\Program Files (x86)\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools\x64\lc.exe +C:\Program Files (x86)\Windows Kits\8.1\bin\x64\rc.exe +C:\Program Files (x86)\Windows Kits\8.1\bin\x86\rc.exe +C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\amd64\nmake.exe +C:\ProgramData\chocolatey\bin\make.exe +C:\tools\cygwin\bin\make.exe +``` Stop here if your results are not *identical*. If you are unable to reproduce these results, please open an issue on this repository for @@ -80,15 +89,19 @@ assistance. ## Set up required convenience links & environment variable - pushd c:\relax - rd /s/q SDK VC nasm inno5 nsis strawberry - mklink /j c:\relax\SDK "c:\Program Files (x86)\Windows Kits\8.1" - mklink /j c:\relax\VC "C:\Program Files (x86)\Microsoft Visual Studio 12.0" - mklink /j nasm "c:\Program Files\NASM" - :: this one is for the picky software packagers - mklink /j c:\openssl c:\relax\openssl - :: environment variable for future scripts - setx RELAX c:\relax +In the CouchDB SDK Prompt, run the following commands: + +```dos +mkdir c:\relax +cd c:\relax +rd /s/q SDK VC nasm inno5 nsis strawberry +mklink /j c:\relax\bin c:\relax\glazier\bin +mklink /j c:\relax\nasm "c:\Program Files (x86)\NASM" +mklink /j c:\relax\SDK "c:\Program Files (x86)\Windows Kits\8.1" +mklink /j c:\relax\VC "C:\Program Files (x86)\Microsoft Visual Studio 12.0" +mklink /j c:\openssl c:\relax\openssl +setx RELAX c:\relax +``` Close all open command prompts. Now we're ready to go! @@ -96,109 +109,201 @@ Close all open command prompts. Now we're ready to go! ## Downloading glazier and dependency sources -Open a `Couch SDK Prompt`: +Open a new `CouchDB SDK Prompt` and run the following: + +```dos +cd c:\relax +git config --global core.autocrlf input +git clone https://github.com/apache/couchdb-glazier +c:\relax\bin\aria2c --force-sequential=false --max-connection-per-server=5 --check-certificate=false --auto-file-renaming=false --allow-overwrite=true --input-file=couchdb-glazier/downloads.md --max-concurrent-downloads=5 --dir=bits --save-session=bits/a2session.txt +color 1f +``` + +As of 2017-07-08, this will download the source for the following versions of our dependencies: + +* MS Visual C++ x64 Redistributable for VC12 with patches +* OpenSSL 1.0.2l +* curl 7.49.1 +* Erlang: + * 17.5 + * 18.3 + * 19.3 +* ICU4C 57.1 (*Note*: this is the last version to support building in VS2013) +* SpiderMonkey 1.8.5 - cd c:\relax - git config --global core.autocrlf input - git clone https://git-wip-us.apache.org/repos/asf/couchdb-glazier.git - mklink /j c:\relax\bin c:\relax\glazier\bin - path=c:\relax\bin;%PATH%; - aria2c --force-sequential=false --max-connection-per-server=5 --check-certificate=false --auto-file-renaming=false --allow-overwrite=true --input-file=glazier/downloads.md --max-concurrent-downloads=5 --dir=bits --save-session=bits/a2session.txt - color 1f ## Build & Test 64-bit OpenSSL - cd %RELAX%\bin && build_openssl.cmd +In the same `CouchDB SDK Prompt`, run the following: + +```dos +cd %RELAX%\bin && build_openssl.cmd +``` + +Close your `CouchDB SDK Prompt`. ## Build 64-bit libcurl - cd %RELAX%\bin && build_curl.cmd +Open a new `CouchDB SDK Prompt` and run the following: + +```dos +cd %RELAX%\bin && build_curl.cmd +``` ## Build 64-bit ICU - cd %RELAX%\bin && build_icu.cmd +In the same `CouchDB SDK Prompt` run the following: + +```dos +cd %RELAX%\bin && build_icu.cmd +``` + +Close the window. ## Start a UNIX-friendly shell with MS compilers -1. Start your `SDK prompt` as above +1. Start your `CouchDB SDK Prompt` as above 2. Launch a cygwin erl-ified shell via `c:\relax\bin\shell.cmd` -3. Select 17.5 unless you know what you are doing! +3. Select 18.3 (unless you know what you are doing!) 4. Select `b for bash prompt`. For more detail on why this is necessary, see [UNIX-friendly shell details](#unix-friendly-shell-details) below. -## Unpack, configure and build Erlang/OTP 17.5 - - ln -s /cygdrive/c/relax /relax - cd .. && tar xzf /relax/bits/otp_src_17.5.tar.gz - cd $ERL_TOP - echo "skipping gs" > lib/gs/SKIP - echo "skipping wx" > lib/wx/SKIP - echo "skipping ic" > lib/ic/SKIP - echo "skipping jinterface" > lib/jinterface/SKIP - erl_config.sh - :: Ensure OpenSSL is found by the configure script. - erl_build.sh - exit - exit +## Unpack, configure and build Erlang/OTP 18.3 + +At the bash prompt, enter the following commands: + +```bash +ln -s /cygdrive/c/relax /relax +cd .. && tar xzf /relax/bits/otp_src_18.3.tar.gz +cd $ERL_TOP +echo "skipping gs" > lib/gs/SKIP +echo "skipping wx" > lib/wx/SKIP +echo "skipping ic" > lib/ic/SKIP +echo "skipping jinterface" > lib/jinterface/SKIP +eval `$ERL_TOP/otp_build env_win32 x64` +``` + +At this point, check your paths. Run `which cl link mc lc mt nmake rc`. +The output should match the following: + +```bash +/cygdrive/c/PROGRA~2/MICROS~1.0/VC/BIN/amd64/cl +/cygdrive/c/PROGRA~2/MICROS~1.0/VC/BIN/amd64/link +/cygdrive/c/PROGRA~2/WI3CF2~1/8.1/bin/x64/mc +/cygdrive/c/PROGRA~2/MICROS~1/Windows/v8.1A/bin/NETFX4~1.1TO/x64/lc +/cygdrive/c/PROGRA~2/WI3CF2~1/8.1/bin/x64/mt +/cygdrive/c/PROGRA~2/MICROS~1.0/VC/BIN/amd64/nmake +/cygdrive/c/PROGRA~2/WI3CF2~1/8.1/bin/x64/rc +``` + +If it does not, stop and diagnose. + +Now you can proceed to build Erlang, closing the window when +done: + +```bash +erl_config.sh +# Ensure OpenSSL is found by the configure script. +# If you see any warnings, stop and diagnose. +erl_build.sh +exit +exit +``` ## Build Spidermonkey JavaScript 1.8.5 Spidermonkey needs to be compiled with the Mozilla Build chain. -To build it with VS2013 requires a few patches. - -Start by launching a fresh `SDK prompt`. - - call c:\mozilla-build\start-shell-msvc2013-x64.bat - which cl lc link mt rc make - # /c/Program Files (x86)/Microsoft Visual Studio 12.0/VC/BIN/amd64/cl.exe - # /c/Program Files (x86)/Microsoft SDKs/Windows/v8.1A/bin/NETFX 4.5.1 Tools/x64/lc.exe - # /c/Program Files (x86)/Microsoft Visual Studio 12.0/VC/BIN/amd64/link.exe - # /c/Program Files (x86)/Windows Kits/8.1/bin/x64/mt.exe - # /c/Program Files (x86)/Windows Kits/8.1/bin/x64/rc.exe - # /local/bin/make.exe - cd /c/relax - tar xzf bits/js185-1.0.0.tar.gz - patch -p0 </c/relax/glazier/bits/js185-msvc2013.patch - cd js-1.8.5/js/src - autoconf-2.13 - ./configure --enable-static --enable-shared-js --disable-debug-symbols --disable-debug --disable-debugger-info-modules --target=x86_64-pc-mingw32 --host=x86_64-pc-mingw32 - make - ## optional, takes a while, math-jit-tests will fail - ## for more detail see https://bugzilla.mozilla.org/show_bug.cgi?id=1076670 - ## TODO: apply fix as part of patch - ## also one jsapi test has been disabled that crashes, call we don't use - make check - exit - exit +To build it with VS2013 requires a few patches contained in this +repository. + +Start by launching a fresh `CouchDB SDK prompt`, then setup the +Mozilla build environment with the command: + +```dos +call c:\mozilla-build\start-shell-msvc2013-x64.bat +``` + +Now, ensure the output of `which cl lc link mt rc make` matches +the following: + +```dos +/c/Program Files (x86)/Microsoft Visual Studio 12.0/VC/BIN/amd64/cl.exe +/c/Program Files (x86)/Microsoft SDKs/Windows/v8.1A/bin/NETFX 4.5.1 Tools/x64/lc.exe +gram Files (x86)/Microsoft Visual Studio 12.0/VC/BIN/amd64/link.exe +/c/Program Files (x86)/Windows Kits/8.1/bin/x64/mt.exe +/c/Program Files (x86)/Windows Kits/8.1/bin/x64/rc.exe +/local/bin/make.exe +``` + +If this does not match *exactly*, stop and diagnose. + +Now, proceed to patch and build SpiderMonkey 1.8.5: + +```bash +cd /c/relax +tar xzf bits/js185-1.0.0.tar.gz +patch -p0 </c/relax/couchdb-glazier/bits/js185-msvc2013.patch +cd js-1.8.5/js/src +autoconf-2.13 +./configure --enable-static --enable-shared-js --disable-debug-symbols --disable-debug --disable-debugger-info-modules --target=x86_64-pc-mingw32 --host=x86_64-pc-mingw32 +make +``` + +If desired, tests can be run at this point. This is optional, +takes a while, and the math-jit-tests may fail. For more detail +as to why, see https://bugzilla.mozilla.org/show_bug.cgi?id=1076670 +Also, one jsapi test has been disabled that crashes; this exercises +a call CouchDB doesn't use. + +To run the tests: + +```bash +make check +``` + +Close the prompt window by entering `exit` twice. ## Building CouchDB itself Start a new `SDK prompt`, then run `c:\relax\bin\shell.cmd`. -Select `Erlang 17.5` and `w for a Windows prompt`. - - cd \relax && git clone https://gitbox.apache.org/repos/asf/couchdb.git - cd couchdb - # optional, use suitable tag here - # git checkout --track origin/2.0.x - git clean -fdx && git reset --hard - powershell -ExecutionPolicy Bypass .\configure.ps1 -WithCurl - make -f Makefile.win check +Select `Erlang 18.3` and `w for a Windows prompt`. +Then, run the following commands to download and build CouchDB +from the master repository: + +```dos +cd \relax && git clone https://github.com/apache/couchdb +cd couchdb +# optionally, switch to a different tag or branch for building with: +# git checkout --track origin/2.0.x +git clean -fdx && git reset --hard +powershell -ExecutionPolicy Bypass .\configure.ps1 -WithCurl +make -f Makefile.win check +``` This will build a development version of CouchDB runnable via - python dev\run <-n1> <--with-admin-party-please> +```dos +python dev\run <-n1> <--with-admin-party-please> +``` To build a self-contained CouchDB installation (also known as an Erlang _release_), after running the above use: +```dos make -f Makefile.win release +``` -To build an installer using WiX to creates a full Windows .msi: +To build an installer using WiX to create a full Windows .msi, run: +```dos + make -f Makefile.win release cd \relax\glazier bin\build_installer.cmd +``` + +You made it! Time to relax. :D # Appendix http://git-wip-us.apache.org/repos/asf/couchdb-glazier/blob/69c7f647/bin/build_installer.cmd ---------------------------------------------------------------------- diff --git a/bin/build_installer.cmd b/bin/build_installer.cmd index 2a621ee..ab9c7fd 100644 --- a/bin/build_installer.cmd +++ b/bin/build_installer.cmd @@ -41,7 +41,7 @@ xcopy %RELAX%\js-1.8.5\js\src\dist\bin\*.dll %COUCHDB%\bin /Y >NUL 2>&1 copy %RELAX%\curl\lib\libcurl.dll %COUCHDB%\bin /Y >NUL 2>&1 :: add nssm so we can create/delete the Windows service -copy C:\ProgramData\chocolatey\lib\NSSM\Tools\nssm-2.24\win64\nssm.exe %COUCHDB%\bin /Y >NUL 2>&1 +copy c:\ProgramData\Chocolatey\lib\nssm\tools\nssm-2.24-101-g897c7ad\win64\nssm.exe %COUCHDB%\bin /Y >NUL 2>&1 :: update version number :: commented out because WiX insists on a #.#.#.# number format and there's http://git-wip-us.apache.org/repos/asf/couchdb-glazier/blob/69c7f647/bin/build_openssl.cmd ---------------------------------------------------------------------- diff --git a/bin/build_openssl.cmd b/bin/build_openssl.cmd index e17eb0c..a0e76b6 100755 --- a/bin/build_openssl.cmd +++ b/bin/build_openssl.cmd @@ -26,7 +26,7 @@ pushd %relax%\%openssl_ver% perl Configure VC-WIN64A --prefix=%ssl_path% call ms\do_win64a nmake -f ms\nt.mak clean -nmake -f ms\nt.mak +nmake -f ms\nt.mak all nmake -f ms\nt.mak test nmake -f ms\nt.mak install http://git-wip-us.apache.org/repos/asf/couchdb-glazier/blob/69c7f647/bin/erl_config.sh ---------------------------------------------------------------------- diff --git a/bin/erl_config.sh b/bin/erl_config.sh index 040a048..10a2396 100755 --- a/bin/erl_config.sh +++ b/bin/erl_config.sh @@ -5,5 +5,11 @@ pushd $ERL_TOP # *static* OpenSSL. Uncomment following, and change build_openssl.cmd # to revert this. ## ./otp_build configure --enable-dynamic-ssl-lib --with-ssl=/cygdrive/c/openssl 2>&1 | tee $ERL_TOP/build_configure.txt -./otp_build configure --with-ssl --without-javac 2>&1 | tee $ERL_TOP/build_configure.txt +export SSL_INCDIR='/cygdrive/c/OpenSSL-Win64' +export SSL_INCLUDE='-I/cygdrive/c/OpenSSL-Win64/include' +export SSL_LIBDIR='/cygdrive/c/OpenSSL-Win64/lib' +export SSL_CRYPTO_LIBNAME='libeay32' +export SSL_SSL_LIBNAME='ssleay32' +mkdir /cygdrive/c/OpenSSL-Win64/lib/VC +./otp_build configure --with-ssl=/cygdrive/c/OpenSSL-Win64 --without-javac 2>&1 | tee $ERL_TOP/build_configure.txt popd http://git-wip-us.apache.org/repos/asf/couchdb-glazier/blob/69c7f647/bin/rebar ---------------------------------------------------------------------- diff --git a/bin/rebar b/bin/rebar index 6479d5a..74be913 100644 Binary files a/bin/rebar and b/bin/rebar differ http://git-wip-us.apache.org/repos/asf/couchdb-glazier/blob/69c7f647/bin/shell.cmd ---------------------------------------------------------------------- diff --git a/bin/shell.cmd b/bin/shell.cmd index 9ae7ca3..ba49e1c 100755 --- a/bin/shell.cmd +++ b/bin/shell.cmd @@ -44,16 +44,16 @@ goto %OTP_REL% :: choice.exe exists on all windows platforms since MSDOS but not on XP :select echo Select an Erlang: -echo 7 for Erlang 17.5 (default) -echo 8 for Erlang 18.0 -echo 1 for Erlang 18.1 +echo 7 for Erlang 17.5 +echo 8 for Erlang 18.3 (default) +echo 9 for Erlang 19.3 set /p choice="Make your selection ===> " if /i "%choice%"=="0" goto win_shell if /i "%choice%"=="7" goto 17.5 -if /i "%choice%"=="8" goto 18.0 -if /i "%choice%"=="1" goto 18.1 +if /i "%choice%"=="8" goto 18.3 +if /i "%choice%"=="9" goto 19.3 :: else -goto 18.1 +goto 18.3 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :17.5 @@ -62,15 +62,15 @@ set OTP_REL=17.5 goto shell_select :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:18.0 -set ERTS_VSN=7.0 -set OTP_REL=18.0 +:18.3 +set ERTS_VSN=7.3 +set OTP_REL=18.3 goto shell_select :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:18.1 -set ERTS_VSN=7.1 -set OTP_REL=18.1 +:19.3 +set ERTS_VSN=8.3 +set OTP_REL=19.3 goto shell_select :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: @@ -101,7 +101,7 @@ set ERL_TOP=%WERL_DIR%\otp_src_%OTP_REL% echo Type exit to stop relaxing. title On the couch. Type exit to stop relaxing. :: Need these things on the path to build/run CouchDB -set PATH=%ERL_TOP%\release\win32\erts-%ERTS_VSN%\bin;%ERL_TOP%\bootstrap\bin;%ERL_TOP%\erts\etc\win32\cygwin_tools\vc;%ERL_TOP%\erts\etc\win32\cygwin_tools;%RELAX%\bin;%PATH%;%ICU_PATH%\bin64;%RELAX%\js-1.8.5\js\src\dist\bin;%RELAX%\curl\lib;c:\ProgramData\chocolatey\lib\python3\tools\Scripts;C:\Program Files\nodejs;C:\Program Files (x86)\WiX Toolset v3.10\bin +set PATH=%ERL_TOP%\release\win32\erts-%ERTS_VSN%\bin;%ERL_TOP%\bootstrap\bin;%ERL_TOP%\erts\etc\win32\cygwin_tools\vc;%ERL_TOP%\erts\etc\win32\cygwin_tools;%RELAX%\bin;%PATH%;%ICU_PATH%\bin64;%RELAX%\js-1.8.5\js\src\dist\bin;%RELAX%\curl\lib;C:\Python36\Scripts;C:\Program Files\nodejs;C:\Program Files (x86)\WiX Toolset v3.11\bin;C:\tools\cygwin\bin cmd.exe /k goto eof @@ -109,7 +109,7 @@ goto eof :ps_shell echo Type exit to stop relaxing. title On the couch. Type exit to stop relaxing. -set PATH=%ERL_TOP%\release\win32\erts-%ERTS_VSN%\bin;%ERL_TOP%\bootstrap\bin;%ERL_TOP%\erts\etc\win32\cygwin_tools\vc;%ERL_TOP%\erts\etc\win32\cygwin_tools;c:\relax\bin;%PATH%;%ICU_PATH%\bin64;C:\Relax\js-1.8.5\js\src\dist\bin;C:\relax\curl\lib;c:\ProgramData\chocolatey\lib\python3\tools\Scripts;C:\Program Files\nodejs;C:\Program Files (x86)\WiX Toolset v3.10\bin +set PATH=%ERL_TOP%\release\win32\erts-%ERTS_VSN%\bin;%ERL_TOP%\bootstrap\bin;%ERL_TOP%\erts\etc\win32\cygwin_tools\vc;%ERL_TOP%\erts\etc\win32\cygwin_tools;c:\relax\bin;%PATH%;%ICU_PATH%\bin64;C:\Relax\js-1.8.5\js\src\dist\bin;C:\relax\curl\lib;c:\ProgramData\chocolatey\lib\python3\tools\Scripts;C:\Program Files\nodejs;C:\Program Files (x86)\WiX Toolset v3.11\bin powershell goto eof http://git-wip-us.apache.org/repos/asf/couchdb-glazier/blob/69c7f647/downloads.md ---------------------------------------------------------------------- diff --git a/downloads.md b/downloads.md index 24fc583..4273caf 100644 --- a/downloads.md +++ b/downloads.md @@ -5,18 +5,18 @@ http://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe ################################################################################ ### OpenSSL -http://openssl.org/source/openssl-1.0.2e.tar.gz +https://www.openssl.org/source/openssl-1.0.2l.tar.gz ################################################################################ ### libcurl -https://curl.haxx.se/download/curl-7.49.1.zip +https://curl.haxx.se/download/curl-7.49.1.zip ################################################################################ ### Erlang http://www.erlang.org/download/otp_src_17.5.tar.gz -http://www.erlang.org/download/otp_src_18.0.tar.gz -http://www.erlang.org/download/otp_src_18.1.tar.gz +http://www.erlang.org/download/otp_src_18.3.tar.gz +http://www.erlang.org/download/otp_src_19.3.tar.gz ################################################################################ ### ICU4C -http://download.icu-project.org/files/icu4c/55.1/icu4c-55_1-src.zip +http://download.icu-project.org/files/icu4c/57.1/icu4c-57_1-src.zip ################################################################################ ### spidermonkey js185-1.0.0.tar.gz http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz http://git-wip-us.apache.org/repos/asf/couchdb-glazier/blob/69c7f647/downloads.md5 ---------------------------------------------------------------------- diff --git a/downloads.md5 b/downloads.md5 index 15416a5..e1a40aa 100755 --- a/downloads.md5 +++ b/downloads.md5 @@ -1,12 +1,9 @@ 89f15a9ef6b54bcba8d5bd9b9049d873 *curl-7.49.1.zip -4cddf1e1d47622fdd9de2cd7bb5001fd *icu4c-55_1-src.zip +f797503ecaebf1d38920013dc7893066 *icu4c-57_1-src.zip a4574365938222adca0a6bd33329cb32 *js185-1.0.0.tar.gz 7fbb850e4dd92b9905f5ab312bc39101 *js185-msvc2013.patch -5262bfa25b60ed9de9f28d5d52d77fc5 *openssl-1.0.2e.tar.gz +f85123cd390e864dfbe517e7616e6566 *openssl-1.0.2l.tar.gz 346dd0136bf1cc28cebc140e505206bb *otp_src_17.5.tar.gz -232acb0c278ee05c8d787cbaf6399be5 *otp_src_18.0.tar.gz -fa64015fdd133e155b5b19bf90ac8678 *otp_src_18.1.tar.gz -1801436936e64598bab5b87b37dc7f87 *vcredist_x86.exe +7e4ff32f97c36fb3dab736f8d481830b *otp_src_18.3.tar.gz +a8c259ec47bf84e77510673e1b76b6db *otp_src_19.3.tar.gz 96b61b8e069832e6b809f24ea74567ba *vcredist_x64.exe -b6f4be9dd32090c42994765ff0a832cb *wxMSW-2.8.12.zip -387d90b328a9f84534c919f1f2c0d3ec *autoconf-archive-2012.09.08.tar.gz
