mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: line ending issues with MSYS2

pull/7204/head
glx 2019-02-09 21:26:37 +01:00 committed by glx22
parent d242875d27
commit 70e1c57f81
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/script/api/generate_widget.sh
View File

@ -20,5 +20,5 @@ if [ "$?" != "0" ]; then
exit 1 exit 1
fi fi
${AWK} -f generate_widget.awk script_window.hpp > script_window.tmp ${AWK} -v BINMODE=1 -f generate_widget.awk script_window.hpp > script_window.tmp
mv script_window.tmp script_window.hpp mv script_window.tmp script_window.hpp

8
src/script/api/squirrel_export.sh
View File

@ -49,7 +49,7 @@ for f in `ls ../*.hpp`; do
# ScriptController has custom code, and should not be generated # ScriptController has custom code, and should not be generated
if [ "`basename ${f}`" = "script_controller.hpp" ]; then continue; fi if [ "`basename ${f}`" = "script_controller.hpp" ]; then continue; fi
${AWK} -v api=${apiuc} -f ${scriptdir}/squirrel_export.awk ${f} > ${bf}.tmp ${AWK} -v BINMODE=1 -v api=${apiuc} -f ${scriptdir}/squirrel_export.awk ${f} > ${bf}.tmp
if [ "`wc -l ${bf}.tmp | cut -d\ -f1`" = "0" ]; then if [ "`wc -l ${bf}.tmp | cut -d\ -f1`" = "0" ]; then
if [ -f "${bf}.sq" ]; then if [ -f "${bf}.sq" ]; then
@ -90,7 +90,7 @@ echo "
/Note: this line is a marker in squirrel_export.sh. Do not change!/ { /Note: this line is a marker in squirrel_export.sh. Do not change!/ {
print \$0 print \$0
gsub(\"^.*/\", \"\") gsub(\"^.*/\", \"\")
split(\"`grep '^void SQ'${apiuc}'.*_Register(Squirrel \*engine)$' *.hpp.sq | sed 's/:.*$//' | sort | uniq | tr -d '\r' | tr '\n' ' '`\", files, \" \") split(\"`grep '^void SQ'${apiuc}'.*_Register(Squirrel \*engine).\?$' *.hpp.sq | sed 's/:.*$//' | sort | uniq | tr -d '\r' | tr '\n' ' '`\", files, \" \")
for (i = 1; files[i] != \"\"; i++) { for (i = 1; files[i] != \"\"; i++) {
print \"#include \\\"../script/api/${apilc}/\" files[i] \"\\\"\" \$0 print \"#include \\\"../script/api/${apilc}/\" files[i] \"\\\"\" \$0
@ -104,7 +104,7 @@ echo "
gsub(\"^.*/\", \"\") gsub(\"^.*/\", \"\")
# List needs to be registered with squirrel before all List subclasses. # List needs to be registered with squirrel before all List subclasses.
print \" SQ${apiuc}List_Register(this->engine);\" \$0 print \" SQ${apiuc}List_Register(this->engine);\" \$0
split(\"`grep '^void SQ'${apiuc}'.*_Register(Squirrel \*engine)$' *.hpp.sq | grep -v 'SQ'${apiuc}'List_Register' | sed 's/^.*void //;s/Squirrel \*/this->/;s/$/;/;s/_Register/0000Register/g;' | sort | sed 's/0000Register/_Register/g' | tr -d '\r' | tr '\n' ' '`\", regs, \" \") split(\"`grep '^void SQ'${apiuc}'.*_Register(Squirrel \*engine).\?$' *.hpp.sq | grep -v 'SQ'${apiuc}'List_Register' | sed 's/^.*void //;s/Squirrel \*/this->/;s/$/;/;s/_Register/0000Register/g;' | sort | sed 's/0000Register/_Register/g' | tr -d '\r' | tr '\n' ' '`\", regs, \" \")
for (i = 1; regs[i] != \"\"; i++) { for (i = 1; regs[i] != \"\"; i++) {
if (regs[i] == \"SQ${apiuc}Controller_Register(this->engine);\") continue if (regs[i] == \"SQ${apiuc}Controller_Register(this->engine);\") continue
@ -117,7 +117,7 @@ echo "
{ print \$0; } { print \$0; }
" > ${f}.awk " > ${f}.awk
${AWK} -f ${f}.awk ${f} > ${f}.tmp ${AWK} -v BINMODE=1 -f ${f}.awk ${f} > ${f}.tmp
if ! [ -f "${f}" ] || [ -n "`diff -I '$Id' ${f} ${f}.tmp 2> /dev/null || echo boo`" ]; then if ! [ -f "${f}" ] || [ -n "`diff -I '$Id' ${f} ${f}.tmp 2> /dev/null || echo boo`" ]; then
mv ${f}.tmp ${f} mv ${f}.tmp ${f}