Fix: line endings for bash, directory for make

parent 62289d6b
Pipeline #106146 passed with stages
in 8 minutes and 13 seconds
...@@ -52,7 +52,7 @@ public class BashCompilationGenerator extends CompilationGenerator { ...@@ -52,7 +52,7 @@ public class BashCompilationGenerator extends CompilationGenerator {
@Override @Override
protected String getScriptTemplate() { protected String getScriptTemplate() {
return TemplateHelper.getCompilationBashTemplate(); return TemplateHelper.getCompilationBashTemplate().replace("\r\n", "\n");
} }
@Override @Override
......
...@@ -18,4 +18,4 @@ curDir=`dirname "$0"` ...@@ -18,4 +18,4 @@ curDir=`dirname "$0"`
cmake -B"$curDir"/build/ -H"$curDir/src" "$@" cmake -B"$curDir"/build/ -H"$curDir/src" "$@"
# make # make
make -j4 -C "$curDir" make -j4 -C "$curDir/build"
\ No newline at end of file \ No newline at end of file
...@@ -40,4 +40,4 @@ curDir=`dirname "$0"` ...@@ -40,4 +40,4 @@ curDir=`dirname "$0"`
cmake -B"$curDir"/build/ -H"$curDir/src" "$@" cmake -B"$curDir"/build/ -H"$curDir/src" "$@"
# make # make
make -j4 -C "$curDir" make -j4 -C "$curDir/build"
\ No newline at end of file \ No newline at end of file
...@@ -47,4 +47,4 @@ curDir=`dirname "$0"` ...@@ -47,4 +47,4 @@ curDir=`dirname "$0"`
cmake -B"$curDir"/build/ -H"$curDir/src" "$@" cmake -B"$curDir"/build/ -H"$curDir/src" "$@"
# make # make
make -j4 -C "$curDir" make -j4 -C "$curDir/build"
\ No newline at end of file \ No newline at end of file
...@@ -47,4 +47,4 @@ curDir=`dirname "$0"` ...@@ -47,4 +47,4 @@ curDir=`dirname "$0"`
cmake -B"$curDir"/build/ -H"$curDir/src" "$@" cmake -B"$curDir"/build/ -H"$curDir/src" "$@"
# make # make
make -j4 -C "$curDir" make -j4 -C "$curDir/build"
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment