Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-common
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Timo Koch
dune-common
Commits
e6cec83f
Commit
e6cec83f
authored
9 years ago
by
Christoph Grüninger
Browse files
Options
Downloads
Patches
Plain Diff
[dunecontrol][cleanup] Replace tabs by spaces.
parent
fd07a5a1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
bin/dunecontrol
+23
-23
23 additions, 23 deletions
bin/dunecontrol
with
23 additions
and
23 deletions
bin/dunecontrol
+
23
−
23
View file @
e6cec83f
...
...
@@ -143,15 +143,15 @@ build_module() {
# build the modules
local
path
=
"
$(
eval
"echo
\$
PATH_
${
module
}
"
)
"
eval echo
"--- calling
$command
for
\$
NAME_
${
module
}
---"
trap
onbuildfailure EXIT
trap
onbuildfailure EXIT
if
!
(
set
-e
cd
"
$path
"
export
module
export
ABS_BUILDDIR
=
$(
abs_builddir
$module
$BUILDDIR
)
export
ABS_BUILDDIR
=
$(
abs_builddir
$module
$BUILDDIR
)
eval_control
$runcommand
"
$path
/
$CONTROL
"
)
;
then
eval echo
"--- Failed to build
\$
NAME_
${
module
}
---"
;
exit
1
;
fi
trap
onfailure EXIT
trap
onfailure EXIT
eval echo
"---
\$
NAME_
${
module
}
done ---"
done
...
...
@@ -237,12 +237,12 @@ abs_builddir()
local
name
=
"
$(
eval echo
\$
NAME_
$m
)
"
local
path
=
"
$(
eval echo
\$
PATH_
$m
)
"
case
$BUILDDIR
in
/
*
)
echo
$builddir
/
$name
;;
*
)
echo
$path
/
$builddir
;;
/
*
)
echo
$builddir
/
$name
;;
*
)
echo
$path
/
$builddir
;;
esac
}
...
...
@@ -662,7 +662,7 @@ run_default_configure () {
ACLOCAL_FLAGS
=
"
$ACLOCAL_FLAGS
-I
$dir
"
fi
done
local
m_ABS_BUILDDIR
=
$(
abs_builddir
$m
$BUILDDIR
)
local
m_ABS_BUILDDIR
=
$(
abs_builddir
$m
$BUILDDIR
)
if
test
-d
"
$m_ABS_BUILDDIR
"
;
then
PARAMS
=
"
$PARAMS
\"
--with-
$name
=
$m_ABS_BUILDDIR
\"
"
else
...
...
@@ -672,16 +672,16 @@ run_default_configure () {
fi
if
test
"x
$LOCAL_USE_CMAKE
"
=
"xyes"
;
then
if
test
-d
"
$m_ABS_BUILDDIR
"
;
then
CMAKE_PARAMS
=
"
$CMAKE_PARAMS
\"
-D""
$name
""_DIR=
$m_ABS_BUILDDIR
\"
"
CMAKE_PARAMS
=
"
$CMAKE_PARAMS
\"
-D""
$name
""_DIR=
$m_ABS_BUILDDIR
\"
"
else
TMP_PARAMS
=
"
\"
-D""
$name
""_DIR=
$path
\"
"
for
i
in
$MULTIARCH_LIBDIR
lib lib64 lib32
;
do
if
test
-d
"
$path
/
$i
/cmake/
$name
"
;
then
TMP_PARAMS
=
"
\"
-D""
$name
""_DIR=
$path
/
$i
/cmake/
$name
\"
"
break
;
fi
done
CMAKE_PARAMS
=
"
$CMAKE_PARAMS
$TMP_PARAMS
"
TMP_PARAMS
=
"
\"
-D""
$name
""_DIR=
$path
\"
"
for
i
in
$MULTIARCH_LIBDIR
lib lib64 lib32
;
do
if
test
-d
"
$path
/
$i
/cmake/
$name
"
;
then
TMP_PARAMS
=
"
\"
-D""
$name
""_DIR=
$path
/
$i
/cmake/
$name
\"
"
break
;
fi
done
CMAKE_PARAMS
=
"
$CMAKE_PARAMS
$TMP_PARAMS
"
fi
fi
done
...
...
@@ -768,9 +768,9 @@ run_default_make () {
echo
make
"
$PARAMS
"
eval
$MAKE
"
$PARAMS
"
else
# prepend '--' to separate cmake and make parameters
if
!
$(
echo
"
$PARAMS
"
|
grep
-q
--
'--'
)
;
then
PARAMS
=
"--
$PARAMS
"
# prepend '--' to separate cmake and make parameters
if
!
$(
echo
"
$PARAMS
"
|
grep
-q
--
'--'
)
;
then
PARAMS
=
"--
$PARAMS
"
fi
echo
$CMAKE
--build
.
"
$PARAMS
"
eval
$CMAKE
--build
.
"
$PARAMS
"
...
...
@@ -1235,7 +1235,7 @@ EOF
EOF
fi
done
### ANALYSE MODULE
### ANALYSE MODULE
sort_modules
$mainmod
### DEPENDENCIES
for
mod
in
$SORTEDMODULES_DEPS
;
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