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
5b9699f3
Commit
5b9699f3
authored
4 years ago
by
Pregmodder
Browse files
Options
Downloads
Patches
Plain Diff
Add extra memory settings to compile.bat
parent
44974fcd
No related branches found
No related tags found
1 merge request
!8925
Add extra memory settings to compile.bat
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
compile.bat
+8
-0
8 additions, 0 deletions
compile.bat
devTools/concatFiles.bat
+5
-1
5 additions, 1 deletion
devTools/concatFiles.bat
with
13 additions
and
1 deletion
compile.bat
+
8
−
0
View file @
5b9699f3
...
@@ -5,6 +5,14 @@
...
@@ -5,6 +5,14 @@
pushd
%~dp0
pushd
%~dp0
SETLOCAL
SETLOCAL
:: If compile is invoked with "extramemory", set SORT_MEM (used by concatFiles.bat)
SET
CMD_OPTION
=
%
~
1
IF
DEFINED
CMD_OPTION
IF
/I
[
%CMD_OPTION%
]==[
EXTRAMEMORY
]
SET
CMD_OPTION
=
EXTRAMEM
IF
DEFINED
CMD_OPTION
IF
/I
[
%CMD_OPTION%
]==[
EMEMORY
]
SET
CMD_OPTION
=
EXTRAMEM
IF
DEFINED
CMD_OPTION
IF
/I
[
%CMD_OPTION%
]==[
EXTRAMEM
]
SET
SORT_MEM
=
65535
:: See if we can find a git installation
:: See if we can find a git installation
set
GITFOUND
=
no
set
GITFOUND
=
no
for
%%k
in
(
HKCU
HKLM
)
do
(
for
%%k
in
(
HKCU
HKLM
)
do
(
...
...
This diff is collapsed.
Click to expand it.
devTools/concatFiles.bat
+
5
−
1
View file @
5b9699f3
...
@@ -8,10 +8,14 @@ CHCP 65001 > NUL
...
@@ -8,10 +8,14 @@ CHCP 65001 > NUL
:: TODO Proper temp file instead of bin\list.txt
:: TODO Proper temp file instead of bin\list.txt
IF
EXIST
%
3
DEL
%
3
IF
EXIST
%
3
DEL
%
3
SET
_LISTFILE
=
bin
\list.txt
SET
_LISTFILE
=
bin
\list.txt
SET
_SORT_CMD
=
sort
:: If SORT_MEM is defined, use memory option for SORT
IF
DEFINED
SORT_MEM
SET
_SORT_CMD
=
%_SORT_CMD%
/m
%SORT_MEM%
:: Collect sorted list of files
:: Collect sorted list of files
ECHO
"Ignore the first line to skip the BOM"
>
%_LISTFILE%
ECHO
"Ignore the first line to skip the BOM"
>
%_LISTFILE%
(
FOR
/R
"
%
~1"
%%F
IN
(
%
2
)
DO
echo
"
%%F
"
)
|
sort
>>
%_LISTFILE%
(
FOR
/R
"
%
~1"
%%F
IN
(
%
2
)
DO
echo
"
%%F
"
)
|
%_SORT_CMD%
>>
%_LISTFILE%
:: If we have powershell available, strip the absolute path information
:: If we have powershell available, strip the absolute path information
:: If not, fail silently (which is fine, but will leak path information into the built file)
:: If not, fail silently (which is fine, but will leak path information into the built file)
...
...
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