Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
E
EMAM2Middleware
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
4
Issues
4
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Security & Compliance
Security & Compliance
Dependency List
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
monticore
EmbeddedMontiArc
generators
EMAM2Middleware
Commits
450898ad
Commit
450898ad
authored
Apr 13, 2019
by
Alexander David Hellwig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix test results for compile scripts
parent
a3d31e01
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
52 additions
and
50 deletions
+52
-50
src/test/resources/results/compileScripts/Ros/compile.sh
src/test/resources/results/compileScripts/Ros/compile.sh
+20
-19
src/test/resources/results/compileScripts/Ros2/compile.sh
src/test/resources/results/compileScripts/Ros2/compile.sh
+20
-19
src/test/resources/results/compileScripts/Ros2/compileMsbuild.bat
.../resources/results/compileScripts/Ros2/compileMsbuild.bat
+12
-12
No files found.
src/test/resources/results/compileScripts/Ros/compile.sh
100755 → 100644
View file @
450898ad
#!/usr/bin/env bash
set
-e
export
CMAKE_PREFIX_PATH
=
$AMENT_PREFIX_PATH
:
$CMAKE_PREFIX_PATH
# add *_HOME to PATH temporarily
if
[
-n
"
$cmake_HOME
"
]
then
export
PATH
=
"
$cmake_HOME
:
$PATH
"
export
PATH
=
"
$cmake_HOME
:
$PATH
"
fi
if
[
-n
"
$make_HOME
"
]
then
export
PATH
=
"
$make_HOME
:
$PATH
"
export
PATH
=
"
$make_HOME
:
$PATH
"
fi
# check if needed programs are in PATH
if
[[
`
command
-v
cmake
`
]]
then
echo
"Found cmake"
echo
"Found cmake"
else
echo
"Can not find cmake in PATH! Aborting."
echo
"Try setting the environment variable cmake_HOME to the base of your installation or adding it to your PATH!"
exit
1
echo
"Can not find cmake in PATH! Aborting."
echo
"Try setting the environment variable cmake_HOME to the base of your installation or adding it to your PATH!"
exit
1
fi
if
[[
`
command
-v
make
`
]]
then
echo
"Found make"
echo
"Found make"
else
echo
"Can not find make in PATH! Aborting."
echo
"Try setting the environment variable make_HOME to the base of your installation or adding it to your PATH!"
exit
1
echo
"Can not find make in PATH! Aborting."
echo
"Try setting the environment variable make_HOME to the base of your installation or adding it to your PATH!"
exit
1
fi
# source additional environment variables
...
...
@@ -35,16 +37,15 @@ source "$ROS_HOME"/setup.bash
# Post source check if needed programs are in PATH
if
[[
`
command
-v
roscore
`
]]
then
echo
"Found roscore"
echo
"Found roscore"
else
echo
"Can not find roscore in PATH! Aborting."
echo
"Try setting the environment variable ROS_HOME to the base of your installation or adding it to your PATH!"
exit
1
echo
"Can not find roscore in PATH! Aborting."
echo
"Try setting the environment variable ROS_HOME to the base of your installation or adding it to your PATH!"
exit
1
fi
# cmake
curDir
=
`
dirname
"
$0
"
`
cmake
-B
"
$curDir
"
/build/
-H
"
$curDir
/src"
"
$@
"
# make
make
-j4
-C
"
$curDir
/build"
\ No newline at end of file
# configure cmake
cmake
-B
"
$curDir
/build/"
-H
"
$curDir
/src/"
-DCMAKE_INSTALL_PREFIX
=
"
$curDir
/install"
"
$@
"
# build
cmake
--build
"
$curDir
/build/"
--target
install
--config
Release
src/test/resources/results/compileScripts/Ros2/compile.sh
100755 → 100644
View file @
450898ad
#!/usr/bin/env bash
set
-e
export
CMAKE_PREFIX_PATH
=
$AMENT_PREFIX_PATH
:
$CMAKE_PREFIX_PATH
# add *_HOME to PATH temporarily
if
[
-n
"
$cmake_HOME
"
]
then
export
PATH
=
"
$cmake_HOME
:
$PATH
"
export
PATH
=
"
$cmake_HOME
:
$PATH
"
fi
if
[
-n
"
$make_HOME
"
]
then
export
PATH
=
"
$make_HOME
:
$PATH
"
export
PATH
=
"
$make_HOME
:
$PATH
"
fi
# check if needed programs are in PATH
if
[[
`
command
-v
cmake
`
]]
then
echo
"Found cmake"
echo
"Found cmake"
else
echo
"Can not find cmake in PATH! Aborting."
echo
"Try setting the environment variable cmake_HOME to the base of your installation or adding it to your PATH!"
exit
1
echo
"Can not find cmake in PATH! Aborting."
echo
"Try setting the environment variable cmake_HOME to the base of your installation or adding it to your PATH!"
exit
1
fi
if
[[
`
command
-v
make
`
]]
then
echo
"Found make"
echo
"Found make"
else
echo
"Can not find make in PATH! Aborting."
echo
"Try setting the environment variable make_HOME to the base of your installation or adding it to your PATH!"
exit
1
echo
"Can not find make in PATH! Aborting."
echo
"Try setting the environment variable make_HOME to the base of your installation or adding it to your PATH!"
exit
1
fi
# source additional environment variables
...
...
@@ -35,16 +37,15 @@ source "$ROS2_HOME"/setup.bash
# Post source check if needed programs are in PATH
if
[[
`
command
-v
ros2
`
]]
then
echo
"Found ros2"
echo
"Found ros2"
else
echo
"Can not find ros2 in PATH! Aborting."
echo
"Try setting the environment variable ROS2_HOME to the base of your installation or adding it to your PATH!"
exit
1
echo
"Can not find ros2 in PATH! Aborting."
echo
"Try setting the environment variable ROS2_HOME to the base of your installation or adding it to your PATH!"
exit
1
fi
# cmake
curDir
=
`
dirname
"
$0
"
`
cmake
-B
"
$curDir
"
/build/
-H
"
$curDir
/src"
"
$@
"
# make
make
-j4
-C
"
$curDir
/build"
\ No newline at end of file
# configure cmake
cmake
-B
"
$curDir
/build/"
-H
"
$curDir
/src/"
-DCMAKE_INSTALL_PREFIX
=
"
$curDir
/install"
"
$@
"
# build
cmake
--build
"
$curDir
/build/"
--target
install
--config
Release
src/test/resources/results/compileScripts/Ros2/compileMsbuild.bat
View file @
450898ad
@ECHO
Off
@echo
off
:: add *_HOME to PATH temporarily
IF
NOT
[
%cmake_HOME%
]
==
[]
(
set
PATH
=
"
%cmake_HOME%
;
%PATH%
"
...
...
@@ -11,13 +13,13 @@ IF NOT [%msbuild_HOME%] == [] (
where
cmake
IF
NOT
%ERRORLEVEL%
EQU
0
(
echo
"Can not find cmake in PATH
!
Aborting."
echo
"Try setting the environment variable cmake_HOME to the base of your installation or adding it to your PATH
!
"
echo
"Try setting the environment variable cmake_HOME to the base of your installation or adding it to your PATH
!
"
exit
/B
1
)
where
vcvars64
.bat
IF
NOT
%ERRORLEVEL%
EQU
0
(
echo
"Can not find vcvars64.bat in PATH
!
Aborting."
echo
"Try setting the environment variable msbuild_HOME to the base of your installation or adding it to your PATH
!
"
echo
"Try setting the environment variable msbuild_HOME to the base of your installation or adding it to your PATH
!
"
exit
/B
1
)
...
...
@@ -29,20 +31,18 @@ call %ROS2_HOME%\local_setup.bat
where
msbuild
IF
NOT
%ERRORLEVEL%
EQU
0
(
echo
"Can not find msbuild in PATH
!
Aborting."
echo
"Try setting the environment variable msbuild_HOME to the base of your installation or adding it to your PATH
!
"
echo
"Try setting the environment variable msbuild_HOME to the base of your installation or adding it to your PATH
!
"
exit
/B
1
)
where
ros2
IF
NOT
%ERRORLEVEL%
EQU
0
(
echo
"Can not find ros2 in PATH
!
Aborting."
echo
"Try setting the environment variable ROS2_HOME to the base of your installation or adding it to your PATH
!
"
echo
"Try setting the environment variable ROS2_HOME to the base of your installation or adding it to your PATH
!
"
exit
/B
1
)
:: cmake
cmake
-B
./build/
-G
"Visual Studio 15 2017 Win64"
%
*
./src
:: msbuild
cd
.\build
msbuild
/m /t
:build
/p
:Configuration
=
Release
ALL_BUILD
.vcxproj
cd
..
\ No newline at end of file
SET
curDir
=
%~dp0
:: configure cmake
cmake
-B
%curDir%
/build
/
-H
%curDir%
/src
/
-DCMAKE
_INSTALL_PREFIX
=
%curDir%
/install -G
"Visual Studio 15 2017 Win64"
%
*
:: build
cmake
-
-build
%curDir%
/build
/
-
-target
install
-
-config
Release
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment