Browse Source

fix: Guarantee the dist command generates correct newline

pull/65/head
Tom G. Huang 4 years ago
parent
commit
aac9cffdc5
  1. 10
      tools/build
  2. 10
      tools/build.bat

10
tools/build

@ -63,6 +63,7 @@ dist () {
cp -r ../examples ../dist
rm -rf ../dist/examples/bin
rm -rf ../dist/examples/build
find ../dist -name '*' | xargs dos2unix
}
get_ver () {
@ -84,7 +85,6 @@ elif [ "$1" = "cleanall" ]; then
elif [ "$1" = "tar" ]; then
dist
ver=$(get_ver)
find ../dist -name '*' | xargs dos2unix
tar -cvzf argtable-$ver-amalgamation.tar.gz ../dist
exit 0
elif [ "$1" = "zip" ]; then
@ -103,9 +103,11 @@ elif [ "$1" = "help" ]; then
echo "Usage: build <command>"
echo ""
echo "Available commands:"
echo " dist build the amalgamation package"
echo " cleanall delete all generated folders/files"
echo " help display usage information"
echo " dist build the amalgamation package"
echo " tar build the amalgamation package in UNIX archive format"
echo " zip build the amalgamation package in Windows archive format"
echo " cleanall delete all generated folders/files"
echo " help display usage information"
exit 0
else
echo "Unknown command"

10
tools/build.bat

@ -62,9 +62,11 @@ echo.
echo Usage: build ^<command^>
echo.
echo Available commands:
echo dist build the amalgamation package
echo cleanall delete all generated folders/files
echo help display usage information
echo dist build the amalgamation package
echo tar build the amalgamation package in UNIX archive format
echo zip build the amalgamation package in Windows archive format
echo cleanall delete all generated folders/files
echo help display usage information
goto :EOF
@ -99,6 +101,7 @@ copy ..\README.md ..\dist
xcopy ..\tests ..\dist\tests\ /H /K /Y
copy ..\src\argtable3_private.h ..\dist\tests
xcopy ..\examples ..\dist\examples\ /H /K /Y
for /R ..\dist %%G in (*) do unix2dos "%%G"
goto :EOF
@ -122,7 +125,6 @@ goto :EOF
:build_zip
call:dist
call:get_ver
for /R ..\dist %%G in (*) do unix2dos "%%G"
zip -r argtable-%ARGTABLE_VER%-amalgamation.zip ..\dist
goto :EOF

Loading…
Cancel
Save