consolidate scripts into single folder [c:\relax]
- remove all %glazier% instances
- move all dependent tools into [c:\opt]
diff --git a/README.md b/README.md
index 0ac5e12..c577e7e 100644
--- a/README.md
+++ b/README.md
@@ -85,12 +85,12 @@
inside `%relax%`. Or do it manually for the same result:
* Add 7zip from `c:\mozilla-build\7zip` to your path
-* Innosoft's [isetup] to `%relax%/inno5`
-* Nullsoft [NSIS] Installer to `%relax%/nsis`
+* Innosoft's [isetup] to `c:\opt\inno5`
+* Nullsoft [NSIS] Installer to `c:\opt\nsis`
* Add 7zip, Inno5, and nsis to the user environment PATH
-* using 7zip, extract and rename [nasm] to `%relax%/nasm`
-* using 7zip, extract and rename [cmake] to `%relax%/cmake`
-* `mkdir strawberry && cd strawberry` then using 7zip, extract Strawberry [Perl]
+* using 7zip, extract and rename [nasm] to `c:\opt\nasm`
+* using 7zip, extract and rename [cmake] to `c:\opt\cmake`
+* `mkdir c:\opt\strawberry && cd c:\opt\strawberry` then using 7zip, extract Strawberry [Perl]
[perl]: http://strawberryperl.com/download/5.12.2.0/strawberry-perl-5.12.2.0-portable.zip
[nasm]: http://www.nasm.us/pub/nasm/releasebuilds/2.09.07/win32/nasm-2.09.07-win32.zip
@@ -287,4 +287,3 @@
/relax/bin/couchdb_config.sh && /relax/bin/couchdb_build.sh
A few minutes later, the release binaries should be made available.
-
diff --git a/bin/build_curl.cmd b/bin/build_curl.cmd
index a9a00f5..034f817 100755
--- a/bin/build_curl.cmd
+++ b/bin/build_curl.cmd
@@ -1,7 +1,7 @@
::setlocal
path=%path%;%opt%\cmake\bin;c:\mozilla-build\7zip;%relax%\openssl\bin;
-for %%i in ("%glazier%\bits\curl-*.zip") do set curl_ver=%%~ni
+for %%i in ("%relax%\bits\curl-*.zip") do set curl_ver=%%~ni
setx CURL_VER %curl_ver%
set CURL_SRC=%RELAX%\%curl_ver%
setx CURL_SRC %curl_src%
diff --git a/bin/build_icu.cmd b/bin/build_icu.cmd
index 43ae3fb..0c5a846 100755
--- a/bin/build_icu.cmd
+++ b/bin/build_icu.cmd
@@ -7,7 +7,7 @@
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: ensure we have a fresh source tree to build from
if exist "%icu_path%" rd /s/q %icu_path%
-7z x "%glazier%\bits\icu4c-*src.zip" -o%relax% -y
+7z x "%relax%\bits\icu4c-*src.zip" -o%relax% -y
pushd %icu_path%
msbuild /m /p:Configuration=Release /p:Platform=Win32 /v:m /clp:summary %icu_path%\source\allinone\allinone.sln
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
diff --git a/bin/build_openssl.cmd b/bin/build_openssl.cmd
index b45a09b..ed79dcd 100755
--- a/bin/build_openssl.cmd
+++ b/bin/build_openssl.cmd
@@ -6,7 +6,7 @@
:: extract bundle and name
:: stash SSL version
del /f/q "%TEMP%\openssl*.tar"
-7z x "%glazier%\bits\openssl-*.tar.gz" -y -o"%TEMP%"
+7z x "%relax%\bits\openssl-*.tar.gz" -y -o"%TEMP%"
:: get the version of OpenSSL into the environment
for %%i in ("%TEMP%\openssl-*.tar") do set openssl_ver=%%~ni
@@ -14,6 +14,7 @@
set SSL_PATH=%relax%\openssl
setx SSL_PATH %ssl_path%
+pause
if exist "%ssl_path%" rd /s/q %ssl_path%
:: set up a softlink for openssl as Erlang seems to dumb to find it
if not exist c:\openssl mklink /d c:\openssl "%relax%\openssl"
diff --git a/bin/build_wx.cmd b/bin/build_wx.cmd
index e39ac12..ef4eef1 100755
--- a/bin/build_wx.cmd
+++ b/bin/build_wx.cmd
@@ -3,14 +3,14 @@
:: read the version of wxWidgets from the wxMSW source distribution
:: wx_ver is used later on only in this script to set up a softlink
:: so that Erlang finds it in the correct location
-for %%i in ("%glazier%\bits\wxMSW*.zip") do set wx_src=%%~ni
+for %%i in ("%relax%\bits\wxMSW*.zip") do set wx_src=%%~ni
set wx_ver=%wx_src:wxmsw=wxWidgets%
setx wx_ver %wx_ver%
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
if exist c:\cygwin\opt\local\pgm\%wx_ver% goto build
if exist %relax%\%wx_src% goto build
-7z.exe x %glazier%\bits\wxMSW* -aoa -y -o%relax%\
+7z.exe x %relax%\bits\wxMSW* -aoa -y -o%relax%\
mkdir c:\cygwin\opt\local\pgm > NUL: 2>&1
mklink /d c:\cygwin\opt\local\pgm\%wx_ver% %relax%\%wx_src%
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
@@ -21,7 +21,7 @@
:: lib\vc_lib\msw\wx\setup.h VC++ static, wxMSW
:: lib\vc_lib\mswud\wx\setup.h VC++ static, wxMSW, Unicode, debug
:: lib\vc_lib\mswunivd\wx\setup.h VC++ static, wxUniversal, debug
-type %glazier%\bits\wxwidgets_setup.h >> %relax%\%wx_src%\include\wx\msw\setup.h
+type %relax%\bits\wxwidgets_setup.h >> %relax%\%wx_src%\include\wx\msw\setup.h
nmake BUILD=release SHARED=0 UNICODE=1 USE_OPENGL=1 USE_GDIPLUS=1 DIR_SUFFIX_CPU= -f makefile.vc
pushd %RELAX%\%wx_src%\build\msw
diff --git a/bin/build_zlib.cmd b/bin/build_zlib.cmd
index e452af9..7035dc6 100755
--- a/bin/build_zlib.cmd
+++ b/bin/build_zlib.cmd
@@ -2,7 +2,7 @@
path=%path%;c:\mozilla-build\7zip;%opt%\nasm;%opt%\strawberry\perl\bin;
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: clean up existing installs
-7z x "%glazier%\bits\zlib-*.zip" -y -o%glazier%
+7z x "%relax%\bits\zlib-*.zip" -y -o%relax%
for %%i in ("%") do set zlib_ver=%%~ni
if defined zlib_ver rd /s/q %relax%\%zlib_ver%
setx zlib_ver %zlib_ver%
diff --git a/bin/erl_config.sh b/bin/erl_config.sh
index 33d4448..040a048 100755
--- a/bin/erl_config.sh
+++ b/bin/erl_config.sh
@@ -4,6 +4,6 @@
# from Erlang/OTP R14B03 onwards, Erlang by default is built with
# *static* OpenSSL. Uncomment following, and change build_openssl.cmd
# to revert this.
-./otp_build configure --enable-dynamic-ssl-lib --with-ssl=$RELAX/openssl 2>&1 | tee $ERL_TOP/build_configure.txt
-## ./otp_build configure --with-ssl=/relax/openssl 2>&1 | tee $ERL_TOP/build_configure.txt
+## ./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
popd
diff --git a/bin/shell.cmd b/bin/shell.cmd
index 13f3d10..6d32917 100755
--- a/bin/shell.cmd
+++ b/bin/shell.cmd
@@ -28,11 +28,9 @@
:: werldir for building erlang
if not defined OPT set OPT=c:\opt
-if not defined GLAZIER set GLAZIER=%~dp0
-if not defined RELAX set RELAX=%d0\relax
-if not defined WERLDIR set WERLDIR=%d0\werl
+if not defined RELAX set RELAX=c:\relax
+if not defined WERLDIR set WERLDIR=c:\werl
setx OPT %OPT% > NUL:
-setx GLAZIER %GLAZIER% > NUL:
setx RELAX %RELAX% > NUL:
set LIB=%OPT%\VC\VC\lib;%OPT%\SDK\lib;%LIB%
@@ -92,7 +90,7 @@
pushd %WERL%\
for /f "usebackq" %%i in (`c:\cygwin\bin\cygpath.exe %WERLDIR%`) do @set WERL_PATH=%%i
set ERL_TOP=%WERL_PATH%/otp_src_%OTP_REL%
-c:\cygwin\bin\bash %GLAZIER%\bin\shell.sh
+c:\cygwin\bin\bash %relax%\bin\shell.sh
goto eof
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
diff --git a/bin/shell.sh b/bin/shell.sh
index 4312651..91362a4 100755
--- a/bin/shell.sh
+++ b/bin/shell.sh
@@ -44,10 +44,10 @@
PATH=$PATH:/usr/local/bin:/usr/bin:/bin
# then glazier tools
-PATH=$PATH:`/usr/bin/cygpath $GLAZIER`/bin:`/usr/bin/cygpath $GLAZIER`/bits
+PATH=$PATH:`/usr/bin/cygpath $RELAX`/bin:`/usr/bin/cygpath $RELAX`/bits
# then windows
-PATH=$PATH:`/usr/bin/cygpath $WINDIR`/system32:`/usr/bin/cygpath $WINDIR`:`/usr/bin/cygpath $WINDIR`/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0
+PATH=$PATH:`/usr/bin/cygpath $WINDIR`/system32:`/usr/bin/cygpath $WINDIR`:`/usr/bin/cygpath $WINDIR`/System32/Wbem:`/usr/bin/cygpath $WINDIR`/system32/WindowsPowerShell/v1.0
# remaining settings from otp_build env_win32 script
OVERRIDE_TARGET="win32"
@@ -66,7 +66,7 @@
MD_SH_DEBUG_LOG=$TMP/md_r$OTP_VER.log
MC_SH_DEBUG_LOG=$TMP/mc_r$OTP_VER.log
-export OVERRIDE_TARGET CC CXX AR RANLIB OVERRIDE_CONFIG_CACHE_STATIC OVERRIDE_CONFIG_CACHE INCLUDE LIB LIBPATH LINK CL PATH TMP CC_SH LD_SH RC_SH MD_SH MC_SH ERL_TOP ERTS_VSN OTP_VER SHELL RELAX GLAZIER WIN32_WRAPPER_PATH OVERRIDE_TARGET
+export OVERRIDE_TARGET CC CXX AR RANLIB OVERRIDE_CONFIG_CACHE_STATIC OVERRIDE_CONFIG_CACHE INCLUDE LIB LIBPATH LINK CL PATH TMP CC_SH LD_SH RC_SH MD_SH MC_SH ERL_TOP ERTS_VSN OTP_VER SHELL RELAX WIN32_WRAPPER_PATH OVERRIDE_TARGET
# ensure we have an ERL_TOP to go to
mkdir -p $ERL_TOP > /dev/null 2>&1
