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
80367a6d
Commit
80367a6d
authored
5 years ago
by
Arkerthan
Browse files
Options
Downloads
Patches
Plain Diff
compile outside git repo without errors
parent
9df1bffb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!5560
compile outside git repo without errors
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
compile.sh
+16
-6
16 additions, 6 deletions
compile.sh
with
16 additions
and
6 deletions
compile.sh
+
16
−
6
View file @
80367a6d
...
@@ -63,12 +63,16 @@ function compile {
...
@@ -63,12 +63,16 @@ function compile {
exit
2
exit
2
esac
esac
fi
fi
COMMIT
=
$(
git rev-parse
--short
HEAD
)
# Find and insert current commit
if
[[
-d
.git
]]
;
then
if
[[
"
$usehash
"
]]
;
then
COMMIT
=
$(
git rev-parse
--short
HEAD
)
# Find and insert current commit
file
=
"bin/FC_pregmod_
${
COMMIT
}
.html"
if
[[
"
$usehash
"
]]
;
then
file
=
"bin/FC_pregmod_
${
COMMIT
}
.html"
else
sed
-Ei
"s/build: .releaseID/
\0
, commit:
$COMMIT
/"
src/gui/mainMenu/AlphaDisclaimer.tw
file
=
"bin/FC_pregmod.html"
fi
else
else
sed
-Ei
"s/build: .releaseID/
\0
, commit:
$COMMIT
/"
src/gui/mainMenu/AlphaDisclaimer.tw
file
=
"bin/FC_pregmod.html"
file
=
"bin/FC_pregmod.html"
fi
fi
...
@@ -81,7 +85,9 @@ function compile {
...
@@ -81,7 +85,9 @@ function compile {
#Make the output prettier, replacing \t with a tab and \n with a newline
#Make the output prettier, replacing \t with a tab and \n with a newline
sed
-i
-e
'/^.*<div id="store-area".*$/s/\\t/\t/g'
-e
'/^.*<div id="store-area".*$/s/\\n/\n/g'
$file
sed
-i
-e
'/^.*<div id="store-area".*$/s/\\t/\t/g'
-e
'/^.*<div id="store-area".*$/s/\\n/\n/g'
$file
git checkout
--
src/gui/mainMenu/AlphaDisclaimer.tw
# Revert AlphaDisclaimer for next compilation
if
[[
-d
.git
]]
;
then
git checkout
--
src/gui/mainMenu/AlphaDisclaimer.tw
# Revert AlphaDisclaimer for next compilation
fi
echoMessage
"Saved to
$file
."
echoMessage
"Saved to
$file
."
}
}
...
@@ -125,6 +131,10 @@ fi
...
@@ -125,6 +131,10 @@ fi
[
-n
"
$java
"
]
&&
./sanityCheck.sh java
[
-n
"
$java
"
]
&&
./sanityCheck.sh java
[
-n
"
$python
"
]
&&
./sanityCheck.sh
[
-n
"
$python
"
]
&&
./sanityCheck.sh
if
!
[[
-d
.git
]]
;
then
echoMessage
"No git repository. Git specfific actions disabled."
fi
#compile
#compile
if
[[
"
$dry
"
]]
;
then
if
[[
"
$dry
"
]]
;
then
echoMessage
"Dry run finished."
echoMessage
"Dry run finished."
...
...
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