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
7f57ce93
Commit
7f57ce93
authored
5 years ago
by
vas
Browse files
Options
Downloads
Patches
Plain Diff
remove dupe lines, initialise variables better
parent
d17f734b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!4610
port build system to make
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Makefile
+12
-11
12 additions, 11 deletions
Makefile
with
12 additions
and
11 deletions
Makefile
+
12
−
11
View file @
7f57ce93
MAKEFLAGS
+=
-r
MAKEFLAGS
+=
-r
export
TWEEGO_PATH
=
devTools/tweeGo/storyFormats
HASH
:=
$(
shell git rev-list
-n
1
--abbrev-commit
HEAD
)
HASH
:=
$(
shell git rev-list
-n
1
--abbrev-commit
HEAD
)
COMMIT
:=
$(
shell git rev-parse
--short
HEAD
)
COMMIT
:=
$(
shell git rev-parse
--short
HEAD
)
uname
:=
$(
shell
uname
-s
)
uname
:=
$(
shell
uname
-s
)
arch
:=
$(
shell
uname
-m
)
arch
:=
$(
shell
uname
-m
)
arch
:=
$(
shell
if
test
$(
arch
)
=
x86_64
-o
$(
arch
)
=
amd64
;
then
echo
64
;
else
echo
32
;
fi
)
TWEEGO
:=
$(
shell
command
-v
tweego
||
echo
"
$$
?"
)
TWEEGO
:=
$(
shell
command
-v
tweego
||
echo
"
$$
?"
)
ifeq
($(TWEEGO),1)
ifeq
($(TWEEGO),1)
ifeq
($(uname),Linux)
ifeq
($(uname),Linux)
ifeq
($(arch),
x86_
64)
ifeq
($(arch),64)
TWEEGO
:=
./
devTools/tweeGo/tweego_nix64
TWEEGO
:=
devTools/tweeGo/tweego_nix64
else
else
TWEEGO
:=
./
devTools/tweeGo/tweego_nix86
TWEEGO
:=
devTools/tweeGo/tweego_nix86
endif
endif
else
ifeq
($(uname),Darwin)
else
ifeq
($(uname),Darwin)
ifeq
($(arch),
x86_
64)
ifeq
($(arch),64)
TWEEGO
:=
./
devTools/tweeGo/tweego_osx64
TWEEGO
:=
devTools/tweeGo/tweego_osx64
else
else
TWEEGO
:=
./
devTools/tweeGo/tweego_osx86
TWEEGO
:=
devTools/tweeGo/tweego_osx86
endif
endif
endif
endif
endif
endif
...
@@ -27,17 +29,16 @@ git: bin/FC_pregmod_$(HASH).html bin/resources
...
@@ -27,17 +29,16 @@ git: bin/FC_pregmod_$(HASH).html bin/resources
bin/resources
:
resources
bin/resources
:
resources
test
-L
"
$@
"
||
ln
-s
"../
$<
"
bin/
test
-L
"
$@
"
||
ln
-s
"../
$<
"
bin/
bin/
FC_pregmod
%.html
:
bin/
FC_pregmod_
tmp
bin/%.html
:
bin/tmp
git checkout
--
src/gui/mainMenu/AlphaDisclaimer.tw
git checkout
--
src/gui/mainMenu/AlphaDisclaimer.tw
mv
$<
$@
mv
$<
$@
bin/
FC_pregmod_
tmp
:
bin/ src/gui/mainMenu/AlphaDisclaimer.tw
bin/tmp
:
bin/ src/gui/mainMenu/AlphaDisclaimer.tw
TWEEGO_PATH
=
devTools/tweeGo/storyFormats
$(
TWEEGO
)
-o
$@
src/
--head
devTools/head.html
$(
TWEEGO
)
src/
--head
devTools/head.html
>
$@
./
devTools/embed_favicon.py
$@
devTools/embed_favicon.py
$@
src/gui/mainMenu/AlphaDisclaimer.tw
:
src/gui/mainMenu/AlphaDisclaimer.tw
:
sed
-Ei
"s/build .releaseID/
\0
commit
$(
COMMIT
)
/"
$@
sed
-Ei
"s/build .releaseID/
\0
commit
$(
COMMIT
)
/"
$@
sed
-Ei
"s/build .releaseID/
\0
commit
$(
COMMIT
)
/"
$@
bin/
:
bin/
:
mkdir
-p
$@
mkdir
-p
$@
...
...
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