Skip to content

Commit

Permalink
run file from cmd instead of cygwin
Browse files Browse the repository at this point in the history
  • Loading branch information
tkelman committed Mar 12, 2014
1 parent de8cd5b commit 010ba03
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 21 deletions.
33 changes: 16 additions & 17 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@ install:
# Run installer silently, output to C:\projects\julia-prev
- C:\projects\julia-prev.exe /S /D=C:\projects\julia-prev
# Copy libs and libuv includes from julia-prev to julia/usr
# - mkdir C:\projects\julia\usr\bin
# - copy C:\projects\julia-prev\bin\*.dll C:\projects\julia\usr\bin
# - mkdir C:\projects\julia\usr\lib
# - copy C:\projects\julia-prev\lib\julia\*.a C:\projects\julia\usr\lib
# - mkdir C:\projects\julia\usr\include
# - copy C:\projects\julia-prev\include\julia\uv*.h C:\projects\julia\usr\include
# - copy C:\projects\julia-prev\include\julia\tree.h C:\projects\julia\usr\include
- mkdir C:\projects\julia\usr\bin
- copy C:\projects\julia-prev\bin\*.dll C:\projects\julia\usr\bin
- mkdir C:\projects\julia\usr\lib
- copy C:\projects\julia-prev\lib\julia\*.a C:\projects\julia\usr\lib
- mkdir C:\projects\julia\usr\include
- copy C:\projects\julia-prev\include\julia\uv*.h C:\projects\julia\usr\include
- copy C:\projects\julia-prev\include\julia\tree.h C:\projects\julia\usr\include
# Install Cygwin and build-time dependencies
# - "cinst cyg-get > cyg-get.log"
# - set PATH=%PATH%;C:\cygwin
# - "cyg-get make >> cyg-get.log"
# - "cyg-get wget >> cyg-get.log"
# - "cyg-get bsdtar >> cyg-get.log"
# - ps: 'if ($env:XC_HOST -eq "x86_64-w64-mingw32") {cyg-get mingw64-x86_64-gcc-g++ >> cyg-get.log} else {cyg-get mingw64-i686-gcc-g++ >> cyg-get.log}'
- "cinst cyg-get > cyg-get.log"
- set PATH=%PATH%;C:\cygwin
- "cyg-get make >> cyg-get.log"
- "cyg-get wget >> cyg-get.log"
- "cyg-get bsdtar >> cyg-get.log"
- ps: 'if ($env:XC_HOST -eq "x86_64-w64-mingw32") {cyg-get mingw64-x86_64-gcc-g++ >> cyg-get.log} else {cyg-get mingw64-i686-gcc-g++ >> cyg-get.log}'
# python, gcc-g++, and diffutils are required to build llvm from source
# - "cyg-get python >> cyg-get.log"
# - "cyg-get gcc-g++ >> cyg-get.log"
Expand All @@ -34,8 +34,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"
- cd C:\projects\julia-prev\share\julia\test && C:\projects\julia-prev\bin\julia-debug-readline runtests.jl all
- C:\cygwin\bin\sh.exe --login -c "cd /cygdrive/c/projects/julia && sh -o igncr contrib/cygwin_build.sh"

#test_script:
# - cd test && ..\usr\bin\julia-basic runtests.jl all
test_script:
- cd test && ..\usr\bin\julia-debug-readline runtests.jl all
8 changes: 4 additions & 4 deletions contrib/cygwin_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ echo 'LIBBLASNAME = libopenblas' >> Make.user
echo 'override LIBLAPACK = $(LIBBLAS)' >> Make.user
echo 'override LIBLAPACKNAME = $(LIBBLASNAME)' >> Make.user
# OpenBlas uses HOSTCC to compile getarch, but we might not have Cygwin GCC installed
if [ -z `which gcc 2>/dev/null` ]; then
if [ -z "`which gcc 2>/dev/null`" ]; then
echo 'override HOSTCC = $(CROSS_COMPILE)gcc' >> Make.user
fi
echo 'override LIBUV = $(JULIAHOME)/usr/lib/libuv.a' >> Make.user
Expand All @@ -136,6 +136,6 @@ if [ -n "$APPVEYOR" ]; then
echo 'VERBOSE = 1' >> Make.user
fi

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

0 comments on commit 010ba03

Please sign in to comment.