Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RFC: Move trailing-whitespace check to a Makefile target #9553

Closed
wants to merge 2 commits into from
Closed

RFC: Move trailing-whitespace check to a Makefile target #9553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78dbe25
Move whitespace check to a Makefile target
tkelman Jan 2, 2015
1061333
skip doctest, which won't work without building julia
tkelman Jan 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 41 additions & 34 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@ language: cpp
os:
- linux
- osx
env:
- DOCCHECK="yes"
- DOCCHECK="no"
matrix:
exclude:
- os: osx
env: DOCCHECK="yes"
notifications:
email: false
irc:
Expand All @@ -15,48 +22,48 @@ notifications:
- http://criid.ee.washington.edu:8000/travis-hook
- http://julia.mit.edu:8000/travis-hook
before_install:
- if [ `uname` = "Linux" ]; then
BUILDOPTS="USEGCC=1 LLVM_CONFIG=llvm-config-3.3 LLVM_LLC=llc-3.3 VERBOSE=1 USE_BLAS64=0";
- if [ `uname` = "Linux" -a "$DOCCHECK" = "no" ]; then
BUILDOPTS="USEGCC=1 LLVM_CONFIG=llvm-config-3.3 LLVM_LLC=llc-3.3 VERBOSE=1 USE_BLAS64=0" &&
for lib in LLVM ZLIB SUITESPARSE ARPACK BLAS FFTW LAPACK GMP MPFR PCRE LIBUNWIND OPENLIBM RMATH; do
export BUILDOPTS="$BUILDOPTS USE_SYSTEM_$lib=1";
done;
sudo apt-get update -qq -y;
sudo apt-get install zlib1g-dev;
sudo add-apt-repository ppa:staticfloat/julia-deps -y;
sudo apt-get update -qq -y;
done &&
sudo apt-get update -qq -y &&
sudo apt-get install zlib1g-dev &&
sudo add-apt-repository ppa:staticfloat/julia-deps -y &&
sudo apt-get update -qq -y &&
sudo apt-get install patchelf gfortran llvm-3.3-dev libsuitesparse-dev libopenblas-dev liblapack-dev libarpack2-dev libfftw3-dev libgmp-dev libpcre3-dev libunwind7-dev libopenlibm-dev librmath-dev libmpfr-dev -y;
elif [ `uname` = "Darwin" ]; then
brew tap staticfloat/julia;
brew rm --force $(brew deps --HEAD julia);
brew update;
brew install -v --only-dependencies --HEAD julia;
BUILDOPTS="USECLANG=1 LLVM_CONFIG=$(brew --prefix llvm33-julia)/bin/llvm-config-3.3 VERBOSE=1 USE_BLAS64=0 SUITESPARSE_INC=-I$(brew --prefix suite-sparse-julia)/include";
BUILDOPTS="$BUILDOPTS LIBBLAS=-lopenblas LIBBLASNAME=libopenblas LIBLAPACK=-lopenblas LIBLAPACKNAME=libopenblas";
brew tap staticfloat/julia &&
brew rm --force $(brew deps --HEAD julia) &&
brew update &&
brew install -v --only-dependencies --HEAD julia &&
BUILDOPTS="USECLANG=1 LLVM_CONFIG=$(brew --prefix llvm33-julia)/bin/llvm-config-3.3 VERBOSE=1 USE_BLAS64=0 SUITESPARSE_INC=-I$(brew --prefix suite-sparse-julia)/include" &&
BUILDOPTS="$BUILDOPTS LIBBLAS=-lopenblas LIBBLASNAME=libopenblas LIBLAPACK=-lopenblas LIBLAPACKNAME=libopenblas" &&
for lib in LLVM ZLIB SUITESPARSE ARPACK BLAS FFTW LAPACK GMP MPFR PCRE LIBUNWIND LIBGIT2; do
export BUILDOPTS="$BUILDOPTS USE_SYSTEM_$lib=1";
done;
export LDFLAGS="-L$(brew --prefix openblas-julia)/lib -L$(brew --prefix suite-sparse-julia)/lib";
export DYLD_FALLBACK_LIBRARY_PATH="/usr/local/lib:/lib:/usr/lib:$(brew --prefix openblas-julia)/lib:$(brew --prefix suite-sparse-julia)/lib:$(brew --prefix arpack-julia)/lib";
done &&
export LDFLAGS="-L$(brew --prefix openblas-julia)/lib -L$(brew --prefix suite-sparse-julia)/lib" &&
export DYLD_FALLBACK_LIBRARY_PATH="/usr/local/lib:/lib:/usr/lib:$(brew --prefix openblas-julia)/lib:$(brew --prefix suite-sparse-julia)/lib:$(brew --prefix arpack-julia)/lib" &&
make $BUILDOPTS -C contrib -f repackage_system_suitesparse4.make;
fi
script:
- if git --no-pager grep --color -n --full-name ' $' -- \*.jl \*.scm \*.c \*.cpp \*.h; then
echo "Error trailing whitespace found in source file(s)";
echo "";
echo "This can often be fixed with:";
echo " git rebase --whitespace=fix HEAD~1";
echo "or";
echo " git rebase --whitespace=fix master";
echo "and then a forced push of the correct branch";
exit 1;
- if [ "$DOCCHECK" = "yes" ]; then
make check-whitespace &&
make -C doc html &&
make -C doc latex &&
make -C doc linkcheck &&
make -C doc helpdb.jl;
else
make $BUILDOPTS prefix=/tmp/julia install &&
if [ `uname` = "Darwin" ]; then
for name in spqr umfpack colamd cholmod amd suitesparse_wrapper; do
install -pm755 usr/lib/lib${name}*.dylib* /tmp/julia/lib/julia/;
done;
fi &&
cd .. && mv julia julia2 &&
cd /tmp/julia/share/julia/test &&
/tmp/julia/bin/julia-debug --check-bounds=yes runtests.jl all &&
/tmp/julia/bin/julia-debug --check-bounds=yes runtests.jl pkg &&
cd - && mv julia2 julia;
fi
- make $BUILDOPTS prefix=/tmp/julia install
- if [ `uname` = "Darwin" ]; then
for name in spqr umfpack colamd cholmod amd suitesparse_wrapper; do
install -pm755 usr/lib/lib${name}*.dylib* /tmp/julia/lib/julia/;
done;
fi
- cd .. && mv julia julia2
- cd /tmp/julia/share/julia/test && /tmp/julia/bin/julia-debug --check-bounds=yes runtests.jl all && /tmp/julia/bin/julia-debug --check-bounds=yes runtests.jl pkg
- cd - && mv julia2 julia
- echo "Ready for packaging..."
16 changes: 16 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,22 @@ perf: release
perf-%: release
@$(MAKE) $(QUIET_MAKE) -C test/perf $*

check-whitespace:
ifneq ($(NO_GIT), 1)
@if git --no-pager grep --color -n --full-name ' $$' -- \*.jl \*.scm \*.c \*.cpp \*.h; then \
echo "Error: trailing whitespace found in source file(s)"; \
echo ""; \
echo "This can often be fixed with:"; \
echo " git rebase --whitespace=fix HEAD~1"; \
echo "or"; \
echo " git rebase --whitespace=fix master"; \
echo "and then a forced push of the correct branch"; \
exit 1; \
fi
else
$(warn "Skipping whitespace check because git is unavailable")
endif

# download target for some hardcoded windows dependencies
.PHONY: win-extras wine_path
win-extras:
Expand Down