Skip to content
Snippets Groups Projects
Commit 959c5d66 authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'pregmod-master' into 'pregmod-master'

Initialize %GITFOUND% in batch compiles

Closes #1850

See merge request !6973
parents 86adc6ca 3bdaac29
No related branches found
No related tags found
1 merge request!6973Initialize %GITFOUND% in batch compiles
......@@ -7,6 +7,7 @@ pushd %~dp0
:: See if we can find a git installation
setlocal enabledelayedexpansion
set GITFOUND=no
for %%k in (HKCU HKLM) do (
for %%w in (\ \Wow6432Node\) do (
for /f "skip=2 delims=: tokens=1*" %%a in ('reg query "%%k\SOFTWARE%%wMicrosoft\Windows\CurrentVersion\Uninstall\Git_is1" /v InstallLocation 2^> nul') do (
......@@ -35,7 +36,7 @@ if %PROCESSOR_ARCHITECTURE% == AMD64 (
CALL "%~dp0devTools\tweeGo\tweego_win86.exe" -o "%~dp0bin/FC_pregmod.html" --module=bin/fc.js --head devTools/head.html "%~dp0src"
)
DEL bin\fc.js
DEL "%~dp0src\002-config\fc-version.js.commitHash.js"
IF EXIST "%~dp0src\002-config\fc-version.js.commitHash.js" DEL "%~dp0src\002-config\fc-version.js.commitHash.js"
popd
ECHO Done
......@@ -7,6 +7,7 @@ pushd %~dp0
:: See if we can find a git installation
setlocal enabledelayedexpansion
set GITFOUND=no
for %%k in (HKCU HKLM) do (
for %%w in (\ \Wow6432Node\) do (
for /f "skip=2 delims=: tokens=1*" %%a in ('reg query "%%k\SOFTWARE%%wMicrosoft\Windows\CurrentVersion\Uninstall\Git_is1" /v InstallLocation 2^> nul') do (
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment