Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fc-pregmod
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pregmodfan
fc-pregmod
Commits
959c5d66
Commit
959c5d66
authored
4 years ago
by
Pregmodder
Browse files
Options
Downloads
Plain Diff
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
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!6973
Initialize %GITFOUND% in batch compiles
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
compile.bat
+2
-1
2 additions, 1 deletion
compile.bat
compile_debug+sanityCheck.bat
+1
-0
1 addition, 0 deletions
compile_debug+sanityCheck.bat
with
3 additions
and
1 deletion
compile.bat
+
2
−
1
View file @
959c5d66
...
...
@@ -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
"
%~dp0
devTools\tweeGo\tweego_win86.exe"
-o
"
%~dp0
bin/FC_pregmod.html"
--module
=
bin
/fc
.js
--head
devTools
/head
.html
"
%~dp0
src"
)
DEL
bin
\fc.js
DEL
"
%~dp0
src\002-config\fc-version.js.commitHash.js"
IF
EXIST
"
%~dp0
src\002-config\fc-version.js.commitHash.js"
DEL
"
%~dp0
src\002-config\fc-version.js.commitHash.js"
popd
ECHO
Done
This diff is collapsed.
Click to expand it.
compile_debug+sanityCheck.bat
+
1
−
0
View file @
959c5d66
...
...
@@ -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
(
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment