From 78555798ff26ff0191b32cf64d13b1328045d8b8 Mon Sep 17 00:00:00 2001 From: Joan Touzet Date: Mon, 18 Jul 2016 14:22:16 -0400 Subject: [PATCH] Add node (to build Fauxton) --- README.md | 4 +--- bin/shell.cmd | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d0753ce..2239880 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ 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 + cinst -y git 7zip.commandline StrawberryPerl nasm cyg-get wixtoolset python aria2 nodejs.install *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. @@ -191,8 +191,6 @@ This will build a development version of CouchDB runnable via python dev\run <-n1> <--with-admin-party-please> -TODO: Fix make release - To build a self-contained CouchDB installation (also known as an Erlang _release_), after running the above use: diff --git a/bin/shell.cmd b/bin/shell.cmd index a5a9e95..2f944ea 100755 --- a/bin/shell.cmd +++ b/bin/shell.cmd @@ -25,8 +25,8 @@ if not defined ZLIB_PATH set ZLIB_PATH=%RELAX%\zlib :: relax for couchdb :: werldir for building erlang -if not defined RELAX setx RELAX c:\relax > NUL: -if not defined RELAX set RELAX=c:\relax +if not defined RELAX setx RELAX e:\relax > NUL: +if not defined RELAX set RELAX=e:\relax if not defined WERL_DIR setx WERL_DIR c:\werl > NUL: if not defined WERL_DIR set WERL_DIR=c:\werl @@ -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;c:\relax\bin;%PATH%;%ICU_PATH%\bin64;C:\Relax\js-1.8.5\js\src\dist\bin;C:\relax\curl\lib +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 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 +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 powershell goto eof