Skip to content

Commit

Permalink
no debug, simpler line endings
Browse files Browse the repository at this point in the history
  • Loading branch information
tkelman committed Mar 12, 2014
1 parent 6c56d5d commit 4a69ad5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
8 changes: 6 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ environment:
- XC_HOST: "i686-w64-mingw32"
# - XC_HOST: "x86_64-w64-mingw32"

init:
# Carriage returns are bad
- git config --global core.eol lf

install:
# Download most-recent Julia binary for dependencies
- ps: if ($env:XC_HOST -eq "x86_64-w64-mingw32") {(new-object net.webclient).DownloadFile($($env:JL_URL+"x64"+$env:JL_VER+"64.exe"), "C:\projects\julia-prev.exe")} else {(new-object net.webclient).DownloadFile($($env:JL_URL+"x86"+$env:JL_VER+"32.exe"), "C:\projects\julia-prev.exe")}
Expand Down Expand Up @@ -34,7 +38,7 @@ install:
# - ps: 'if ($env:XC_HOST -eq "x86_64-w64-mingw32") {cyg-get mingw64-x86_64-gcc-fortran >> cyg-get.log} else {cyg-get mingw64-i686-gcc-fortran >> cyg-get.log}'

build_script:
- C:\cygwin\bin\sh.exe --login -c "cd /cygdrive/c/projects/julia && sh -o igncr contrib/cygwin_build.sh"
- C:\cygwin\bin\sh.exe --login -c "cd /cygdrive/c/projects/julia && contrib/cygwin_build.sh"

test_script:
- cd test && ..\usr\bin\julia-debug-readline runtests.jl all
- cd test && ..\usr\bin\julia-readline runtests.jl all
9 changes: 1 addition & 8 deletions contrib/cygwin_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,6 @@
# Stop on error
set -e

# Fix line endings in shell scripts used by Makefile
for f in contrib/relative_path.sh deps/jldownload deps/find_python_for_llvm base/version_git.sh; do
tr -d '\r' < $f > $f.d2u
mv $f.d2u $f
chmod +x $f
done

# If XC_HOST environment variable not set, choose based on arch
if [ -z "$XC_HOST" ]; then
if [ `arch` = x86_64 ]; then
Expand Down Expand Up @@ -136,6 +129,6 @@ if [ -n "$APPVEYOR" ]; then
echo 'VERBOSE = 1' >> Make.user
fi

make -j 4 debug release
make -j 4
#make -C test file
#make testall

0 comments on commit 4a69ad5

Please sign in to comment.