Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
monticore
EmbeddedMontiArc
generators
EMAM2Middleware
Commits
be94088f
Commit
be94088f
authored
Feb 19, 2019
by
Alexander David Hellwig
Browse files
Fix: line endings for bash, directory for make
parent
62289d6b
Pipeline
#106146
passed with stages
in 8 minutes and 13 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/main/java/de/monticore/lang/monticar/generator/middleware/compile/BashCompilationGenerator.java
View file @
be94088f
...
...
@@ -52,7 +52,7 @@ public class BashCompilationGenerator extends CompilationGenerator {
@Override
protected
String
getScriptTemplate
()
{
return
TemplateHelper
.
getCompilationBashTemplate
();
return
TemplateHelper
.
getCompilationBashTemplate
()
.
replace
(
"\r\n"
,
"\n"
)
;
}
@Override
...
...
src/main/resources/de/monticore/lang/monticar/generator/middleware/compile.sh.template
View file @
be94088f
...
...
@@ -18,4 +18,4 @@ curDir=`dirname "$0"`
cmake
-B
"
$curDir
"
/build/
-H
"
$curDir
/src"
"
$@
"
# make
make
-j4
-C
"
$curDir
"
\ No newline at end of file
make
-j4
-C
"
$curDir
/build"
\ No newline at end of file
src/test/resources/results/compileScripts/NoRos/compile.sh
View file @
be94088f
...
...
@@ -40,4 +40,4 @@ curDir=`dirname "$0"`
cmake
-B
"
$curDir
"
/build/
-H
"
$curDir
/src"
"
$@
"
# make
make
-j4
-C
"
$curDir
"
\ No newline at end of file
make
-j4
-C
"
$curDir
/build"
\ No newline at end of file
src/test/resources/results/compileScripts/Ros/compile.sh
View file @
be94088f
...
...
@@ -47,4 +47,4 @@ curDir=`dirname "$0"`
cmake
-B
"
$curDir
"
/build/
-H
"
$curDir
/src"
"
$@
"
# make
make
-j4
-C
"
$curDir
"
\ No newline at end of file
make
-j4
-C
"
$curDir
/build"
\ No newline at end of file
src/test/resources/results/compileScripts/Ros2/compile.sh
View file @
be94088f
...
...
@@ -47,4 +47,4 @@ curDir=`dirname "$0"`
cmake
-B
"
$curDir
"
/build/
-H
"
$curDir
/src"
"
$@
"
# make
make
-j4
-C
"
$curDir
"
\ No newline at end of file
make
-j4
-C
"
$curDir
/build"
\ No newline at end of file
Write
Preview
Supports
Markdown
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