Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
frama-c
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pub
frama-c
Commits
c6be844b
Commit
c6be844b
authored
2 years ago
by
Andre Maroneze
Committed by
David Bühler
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[dev] use DUNE_WS variable for compiling/installing dune-workspaces
parent
ac08b11b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Makefile
+7
-1
7 additions, 1 deletion
Makefile
share/Makefile.installation
+8
-2
8 additions, 2 deletions
share/Makefile.installation
with
15 additions
and
3 deletions
Makefile
+
7
−
1
View file @
c6be844b
...
...
@@ -43,6 +43,12 @@ FRAMAC_LINTCK_SRC:=tools/lint
.PHONY
:
all
ifneq
(${DUNE_WS},)
WORKSPACE_OPT
:=
--workspace
dev/dune-workspace.
${
DUNE_WS
}
else
WORKSPACE_OPT
:=
endif
all
::
ifeq
(${FRAMAC_DEVELOPER},yes)
dune build
--no-print-directory
--root
${
FRAMAC_LINTCK_SRC
}
...
...
@@ -53,7 +59,7 @@ ifneq ($(DISABLED_PLUGINS),)
rm
-rf
_build .merlin
./dev/disable-plugins.sh
${
DISABLED_PLUGINS
}
endif
dune build
$
(
DUNE_BUILD_OPTS
)
@install
dune build
$
{
WORKSPACE_OPT
}
${
DUNE_BUILD_OPTS
}
@install
clean
::
purge-tests
#
to be done before a "dune" command
ifeq
(${FRAMAC_DEVELOPER},yes)
...
...
This diff is collapsed.
Click to expand it.
share/Makefile.installation
+
8
−
2
View file @
c6be844b
...
...
@@ -52,6 +52,12 @@ endif
.PHONY
:
install uninstall
ifneq
(${DUNE_WS},)
WORKSPACE_OPT
:=
--workspace
dev/dune-workspace.
${
DUNE_WS
}
else
WORKSPACE_OPT
:=
endif
ifneq
($(INSTALL_TARGET),)
INSTALL_TARGET
:=
"
$(
INSTALL_TARGET
)
"
endif
...
...
@@ -68,12 +74,12 @@ endif
ifeq
($(PREFIX),$(OPAM_SWITCH_PREFIX))
@echo
"Installing $(INSTALL_TARGET)to current Opam switch"
@printf
" Copying and relocating files..."
dune
install
--root
.
${MANDIR_OPT}
2>
/dev/null
dune
install
${WORKSPACE_OPT}
--root
.
${MANDIR_OPT}
2>
/dev/null
@echo
" (done)"
else
@echo
"Installing $(INSTALL_TARGET)to ${PREFIX}"
@printf
" Copying and relocating files..."
dune
install
--root
.
--prefix
${PREFIX}
${MANDIR_OPT}
2>
/dev/null
dune
install
${WORKSPACE_OPT}
--root
.
--prefix
${PREFIX}
${MANDIR_OPT}
2>
/dev/null
@echo
" (done)"
@echo 'DO NOT FORGET TO EXPAND YOUR OCAMLPATH VARIABLE
:
'
@
echo
' export OCAMLPATH="
${
PREFIX
}
/lib:$$OCAMLPATH"'
...
...
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