Merge remote-tracking branch 'upstream/master'

recent updates to process.jl still need to be applied

Conflicts:
	.gitignore
	.gitmodules
	base/process.jl
	src/julia.expmap
	src/task.c

.gitignore

@@ -1,38 +1,26 @@
-*~
-*#
-.DS_Store
-
-/*.tar.gz
-/tmp
-
-/julia
-/julia-debug-*
-/julia-release-*
-/libjulia-debug.so
-/libjulia-debug.dylib
-/libjulia-release.so
-/libjulia-release.dylib
-
-/boot.j.inc
-/sys.ji
-/sys0.ji
-/h2j
-
-*.exe
-*.dll
-*.do
-*.o
-
-*.out
-
-*.files
-*.config
-*.includes
-*.creator
-*.user
-*.orig
-
-include
-lib
-
-/usr
+*~
+*#
+.DS_Store
+
+/*.tar.gz
+/tmp
+/dist
+
+/julia
+/h2j
+
+*.exe
+*.dll
+*.do
+*.o
+
+*.out
+
+*.files
+*.config
+*.includes
+*.creator
+*.user
+*.orig
+
+/usr

.gitmodules

@@ -1,6 +1,6 @@
-[submodule "deps/libuv"]
- path = deps/libuv
- url = https:https://github.com/JuliaLang/libuv.git
+[submodule "deps/libuv"]
+ path = deps/libuv
+ url = http:https://github.com/JuliaLang/libuv.git
 [submodule "deps/openlibm"]
  path = deps/openlibm
- url = https:https://github.com/JuliaLang/openlibm.git
+ url = http:https://github.com/JuliaLang/openlibm.git

Make.inc

@@ -102,6 +102,10 @@ endif
 #USE_SYSTEM_LAPACK=1
 #endif
 
+-include $(JULIAHOME)/Make.user
+
+# ===========================================================================
+
 ifeq ($(USE_SYSTEM_LIBUNWIND), 1)
 LIBUNWIND=-lunwind-generic -lunwind
 else
@@ -121,7 +125,7 @@ READLINE = $(USR)/lib/libreadline.a
 endif
 
 ifneq ($(OS),WINNT)
-READLINE += -lncurses -lcurses
+READLINE += -lncurses
 else
 READLINE += $(USR)/lib/libhistory.a
 endif
@@ -160,6 +164,9 @@ endif
 
 # OS specific stuff
 
+# must end with a / and have no trailing spaces
+INSTALL_NAME_ID_DIR = @executable_path/../lib/
+
 RPATH = 
 RPATH_ORIGIN = 
 
@@ -194,8 +201,9 @@ OSLIBS += -lkvm -lrt -Wl,--export-dynamic -Wl,--version-script=$(JULIAHOME)/src/
 endif
 
 ifeq ($(OS), Darwin)
-INSTALL_NAME_CMD = install_name_tool -id @executable_path/../lib/
+INSTALL_NAME_CMD = install_name_tool -id $(INSTALL_NAME_ID_DIR)
 INSTALL_NAME_CHANGE_CMD = install_name_tool -change
+RPATH = -Wl,-rpath,$(BUILD)/lib
 SHLIB_EXT = dylib
 OSLIBS += -ldl -Wl,-w -framework ApplicationServices
 WHOLE_ARCHIVE = -Xlinker -all_load

Makefile

@@ -48,6 +48,11 @@ PREFIX ?= julia-$(JULIA_COMMIT)
 install: release
  mkdir -p $(PREFIX)/{sbin,bin,etc,lib/julia,share/julia}
  cp $(BUILD)/bin/*julia* $(PREFIX)/bin
+ifeq ($(OS), Darwin)
+ install_name_tool -rpath $(BUILD)/lib $(PREFIX)/lib $(PREFIX)/bin/julia-release-basic
+ install_name_tool -rpath $(BUILD)/lib $(PREFIX)/lib $(PREFIX)/bin/julia-release-readline
+ install_name_tool -add_rpath $(PREFIX)/lib $(PREFIX)/bin/julia-release-webserver
+endif
  cd $(PREFIX)/bin && ln -s julia-release-$(DEFAULT_REPL) julia
  cp -R -L $(BUILD)/lib/julia/* $(PREFIX)/lib/julia
  -cp $(BUILD)/lib/lib{Rmath,amd,amos,arpack,cholmod,colamd,suitesparseconfig,fdm,fftw3,fftw3f,fftw3_threads,fftw3f_threads,glpk,glpk_wrapper,gmp,gmp_wrapper,grisu,history,julia-release,$(OPENBLASNAME),openlibm,pcre,random,readline,suitesparse_wrapper,umfpack}.$(SHLIB_EXT) $(PREFIX)/lib

README.md

@@ -50,7 +50,13 @@ Building julia requires 1.5GiB of diskspace and approximately 700MiB of virtual
 
 Once it is built, you can either run the `julia` executable using its full path in the directory created above, or add that directory to your executable path so that you can run the julia program from anywhere:
 
- export PATH="$(pwd)/julia:$PATH"
+In bash:
+
+ export PATH="$(pwd):$PATH"
+
+In csh / tcsh:
+
+ set path= ( $path $cwd )
 
 Now you should be able to run julia like this:
 
@@ -114,8 +120,9 @@ Building Julia requires that the following software be installed:
 - **[gcc, g++, gfortran][gcc]** — compiling and linking C, C++ and Fortran code.
 - **[git]** — contributions and version control.
 - **[perl]** — preprocessing of header files of libraries.
-- **[wget]** or **[curl]** — to automatically download external libraries (Linux defaults to `wget`, OS X and FreeBSD to `curl`).
+- **[wget]**, **[curl]**, or **fetch** — to automatically download external libraries.
 - **[m4]** — needed to build GMP.
+- **patch** — for modifying source code.
 
 Julia uses the following external libraries, which are automatically downloaded (or in a few cases, included in the Julia source repository) and then compiled from source the first time you run `make`:
 
@@ -227,7 +234,8 @@ Julia has a web REPL with very preliminary graphics capabilities. The web REPL i
 3. Point your browser to `http:https://localhost:2000/`.
 4. Try `plot(cumsum(randn(1000)))` and other things.
 
+<!---
 ### Try it Online
 
 Forio.com is generously hosting and maintaining an instance of Julia's web REPL here: [julia.forio.com](http:https://julia.forio.com)
-
+-->

base/Makefile

@@ -13,7 +13,7 @@ errno_h.jl:
 
 os_detect.jl: ../src/os_detect.h
  $(QUIET_PERL) ${CC} -E -P -DJULIA ../src/os_detect.h | perl -p -e 's/\\n/\n/g' > $@
- 
+
 clean:
  rm -f *# *~
  rm -f pcre_h.jl