3.3 build requirements (#18)
diff --git a/README.md b/README.md
index 661e72e..a4e3a51 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@
Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
choco feature enable -n allowGlobalConfirmation
choco install git
-git config --global auto.crlf false
+git config --global core.autocrlf false
git clone https://github.com/apache/couchdb-glazier
&.\couchdb-glazier\bin\install_dependencies.ps1
```
@@ -77,19 +77,19 @@
cd /c/relax
git clone https://github.com/mozilla/gecko-dev
cd gecko-dev
-git checkout esr91
./mach bootstrap --application-choice js
+git checkout esr91
```
Please answer the following question of `./mach boostrap`. You need this only for the first run.
-It downloads a complete build toolchain for Spidermonkey.
+It downloads a complete build toolchain for Spidermonkey. You should run `./mach bootstrap` from
+the master branch and switch afterwards to your explicit ESR branch!
* Would you like to create this directory? (Yn): Y
* Would you like to run a few configuration steps to ensure Git is optimally configured? (Yn): Y
* Will you be submitting commits to Mozilla? (Yn): n
* Would you like to enable build system telemetry? (Yn):n
-
```bash
export MOZCONFIG=/c/relax/couchdb-glazier/moz/sm-opt
./mach build
@@ -99,7 +99,6 @@
Back in PowerShell, copy the binaries to where our build process expects them:
```powershell
-copy C:\relax\gecko-dev\sm-obj-opt\js\src\build\*.pdb C:\relax\vcpkg\installed\x64-windows\bin
copy C:\relax\gecko-dev\sm-obj-opt\js\src\build\*.lib C:\relax\vcpkg\installed\x64-windows\lib
copy C:\relax\gecko-dev\sm-obj-opt\dist\bin\*.dll C:\relax\vcpkg\installed\x64-windows\bin
copy C:\relax\gecko-dev\sm-obj-opt\dist\include\* C:\relax\vcpkg\installed\x64-windows\include -Recurse -ErrorAction SilentlyContinue
diff --git a/bin/install_dependencies.ps1 b/bin/install_dependencies.ps1
index 3c145fe..f7985e5 100644
--- a/bin/install_dependencies.ps1
+++ b/bin/install_dependencies.ps1
@@ -19,37 +19,53 @@
# Install build tools - requires English language pack installed
choco install visualstudio2022buildtools "--passive --locale en-US"
choco install visualstudio2022-workload-vctools --package-parameters "--add Microsoft.VisualStudio.Component.VC.ATL --add Microsoft.VisualStudio.Component.VC.Redist.MSM --add Microsoft.Net.Component.4.8.TargetingPack"
-choco install nodejs-lts wixtoolset make nssm python3 vswhere gnuwin32-coreutils.portable
+choco install wixtoolset make nssm vswhere gnuwin32-coreutils.portable
+choco install nodejs --version=16.19.0
+choco install python --version=3.10.8
Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force
Install-Module VSSetup -Scope CurrentUser -Force
+
+# Explicit workaround that refresnenv is working for this powershell shell
+$ChocolateyProfile = "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
+if (Test-Path($ChocolateyProfile)) {
+ Import-Module "$ChocolateyProfile"
+}
+refreshenv
+
python -m pip install --upgrade pip
-pip install --upgrade sphinx sphinx_rtd_theme pygments nose2 hypothesis
+pip install --upgrade sphinx sphinxcontrib-httpdomain sphinx_rtd_theme pygments nose2 hypothesis
# Hide the Download-StatusBar and improve download speed of wget-Cmdlet
$ProgressPreference = 'SilentlyContinue'
# Download and install MozillaBuild environment
# DON'T USE MozillaBuild 4.0. At time of writing, it fails even to start building sm
-wget -Uri $mozBuildUri -OutFile $mozBuildFile
-Start-Process -Filepath "$mozBuildFile" -ArgumentList "/S"
-sleep 120
+Write-Output "Downloading MozillaBuild ..."
+Invoke-WebRequest -Uri $mozBuildUri -OutFile $mozBuildFile
+Write-Output "Installing MozillaBuild ..."
+Start-Process -Wait -Filepath "$mozBuildFile" -ArgumentList "/S"
# Download and install Erlang/OTP 23
-wget -Uri $erlBuildUri -OutFile $erlBuildFile
-Start-Process -Filepath "$erlBuildFile" -ArgumentList "/S /D=${erlInstallPath}"
-sleep 120
+Write-Output "Downloading Erlang ..."
+Invoke-WebRequest -Uri $erlBuildUri -OutFile $erlBuildFile
+Write-Output "Installing Erlang ..."
+Start-Process -Wait -Filepath "$erlBuildFile" -ArgumentList "/S /D=${erlInstallPath}"
-# Download and install Elixier
-wget -Uri $elxBuildUri -OutFile $elxBuildFile
+# Download and install Elixir
+Write-Output "Downloading Elixir ..."
+Invoke-WebRequest -Uri $elxBuildUri -OutFile $elxBuildFile
+Write-Output "Installing Elixir ..."
Expand-Archive -Path $elxBuildFile -DestinationPath $elxInstallPath
# Download and install VCPkg
+Write-Output "Downloading VCPkg ..."
git clone https://github.com/Microsoft/vcpkg.git
-cd vcpkg
+Set-Location vcpkg
+Write-Output "Installing VCPkg ..."
.\bootstrap-vcpkg.bat -disableMetrics
.\vcpkg integrate install --triplet x64-windows
.\vcpkg install icu --triplet x64-windows
-cd ..
+Set-Location ..
# we know what we are doing (, do we really?)
Set-ExecutionPolicy Bypass -Scope CurrentUser -Force
diff --git a/bin/variables.ps1 b/bin/variables.ps1
index 828e4c3..91262db 100644
--- a/bin/variables.ps1
+++ b/bin/variables.ps1
@@ -19,14 +19,14 @@
# ERLANG BUILD SETTINGS
# Download location of the Erlang/OTP Environment for Windows (x64)
-$erlBuildUri = "https://github.com/erlang/otp/releases/download/OTP-23.3.4.13/otp_win64_23.3.4.13.exe"
+$erlBuildUri = "https://github.com/erlang/otp/releases/download/OTP-24.3.4.6/otp_win64_24.3.4.6.exe"
$erlBuildFile = Split-Path $erlBuildUri -Leaf
-$erlDir = "erl23"
+$erlDir = "erl24"
$erlInstallPath = "C:\Program Files\${erlDir}"
# ERLANG BUILD SETTINGS
# Download location of the Elixier binaries for Windows (x64)
-$elxBuildUri = "https://github.com/elixir-lang/elixir/releases/download/v1.12.3/Precompiled.zip"
+$elxBuildUri = "https://github.com/elixir-lang/elixir/releases/download/v1.13.4/Precompiled.zip"
$elxBuildFile = Split-Path $elxBuildUri -Leaf
$elxInstallPath = "C:\relax\elixir"
diff --git a/moz/sm-opt b/moz/sm-opt
index 822cc54..cdfeffb 100644
--- a/moz/sm-opt
+++ b/moz/sm-opt
@@ -11,9 +11,8 @@
ac_add_options --disable-jit
ac_add_options --disable-jemalloc
ac_add_options --enable-hardening
-ac_add_options --with-intl-api
+ac_add_options --without-intl-api
ac_add_options --build-backends=RecursiveMake
-#ac_add_options --with-system-icu
ac_add_options --enable-gczeal
#ac_add_options --target=x86_64-pc-mingw32
#ac_add_options --host=x86_64-pc-mingw32
