Skip to content

Commit

Permalink
fix installation issues with SuiteSparse update and COMMIT file
Browse files Browse the repository at this point in the history
  • Loading branch information
vtjnash committed Apr 23, 2013
1 parent 56ecb4b commit 8f379b8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@
*.kate-swp

/usr
/COMMIT
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,25 +42,25 @@ $(BUILD)/share/julia/helpdb.jl: doc/helpdb.jl | $(BUILD)/share/julia

# use sys.ji if it exists, otherwise run two stages
$(BUILD)/$(JL_PRIVATE_LIBDIR)/sys.ji: VERSION base/*.jl base/pkg/*.jl base/linalg/*.jl $(BUILD)/share/julia/helpdb.jl
@#echo `git rev-parse --short HEAD`-$(OS)-$(ARCH) \(`date +"%Y-%m-%d %H:%M:%S"`\) > COMMIT
@echo `git rev-parse --short HEAD`-$(OS)-$(ARCH) \(`date +"%Y-%m-%d %H:%M:%S"`\) > COMMIT
$(QUIET_JULIA) cd base && \
(test -f $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys.ji || $(JULIA_EXECUTABLE) -bf sysimg.jl) && $(JULIA_EXECUTABLE) -f sysimg.jl || echo "*** This error is usually fixed by running 'make clean'. If the error persists, try 'make cleanall'. ***"

run-julia-debug run-julia-release: run-julia-%:
$(MAKE) $(QUIET_MAKE) run-julia JULIA_EXECUTABLE="$(JULIA_EXECUTABLE_$*)"
run-julia:
#winedbg --gdb
#wine winedbg
$(JULIA_EXECUTABLE)

# public libraries, that are installed in $(PREFIX)/lib
JL_LIBS = julia-release julia-debug

# private libraries, that are installed in $(PREFIX)/lib/julia
JL_PRIVATE_LIBS = amd arpack cholmod colamd fftw3 fftw3f fftw3_threads \
fftw3f_threads gmp grisu \
openlibm openlibm-extras pcre \
random Rmath spqr suitesparse_wrapper \
umfpack z openblas
JL_PRIVATE_LIBS = amd arpack camd ccolamd cholmod colamd \
fftw3 fftw3f fftw3_threads fftw3f_threads \
gmp grisu openlibm openlibm-extras pcre \
random Rmath spqr suitesparse_wrapper \
umfpack z openblas

PREFIX ?= julia-$(JULIA_COMMIT)
install: release
Expand Down Expand Up @@ -93,7 +93,7 @@ ifeq ($(OS), WINNT)
-cp $(JULIAHOME)/contrib/windows/* $(PREFIX)
endif
cp $(JULIAHOME)/VERSION $(PREFIX)/share/julia/VERSION
echo `git rev-parse --short HEAD`-$(OS)-$(ARCH) \(`date +"%Y-%m-%d %H:%M:%S"`\) > $(PREFIX)/share/julia/COMMIT
cp $(JULIAHOME)/COMMIT $(PREFIX)/share/julia/COMMIT

dist:
rm -fr julia-*.tar.gz julia-$(JULIA_COMMIT)
Expand Down

0 comments on commit 8f379b8

Please sign in to comment.