Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions SignallingWebServer/platform_scripts/cmd/common.bat
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,13 @@ if exist node\ (
set INSTALL_DEPS=1
)

rem NOTE: We want to use our NodeJS (not system NodeJS!) to build the web frontend files.
rem Save our current directory (the NodeJS dir) in a variable
set NODE_DIR=%SCRIPT_DIR%node
set PATH=%NODE_DIR%;%PATH%

rem Print node version
FOR /f %%A IN ('node\node.exe -v') DO set NODE_VERSION=%%A
FOR /f %%A IN ('node.exe -v') DO set NODE_VERSION=%%A
echo Node version: %NODE_VERSION%
popd

Expand Down Expand Up @@ -189,10 +194,6 @@ exit /b
rem Start in the repo dir
pushd %SCRIPT_DIR%..\..\..\

rem NOTE: We want to use our NodeJS (not system NodeJS!) to build the web frontend files.
rem Save our current directory (the NodeJS dir) in a variable
set NODE_DIR=%SCRIPT_DIR%node

IF "%FRONTEND_DIR%"=="" (
set FRONTEND_DIR="%SCRIPT_DIR%..\..\www"
) else (
Expand All @@ -210,7 +211,6 @@ IF NOT exist "%FRONTEND_DIR%" (
set BUILD_FRONTEND=1
)

set PATH=%NODE_DIR%;%PATH%

IF "%BUILD_FRONTEND%"=="1" (
rem We could replace this all with a single npm script that does all this. we do have several build-all scripts already
Expand Down
Loading