Merge branch 'master' of github.com:JuliaLang/julia

external/.gitignore

@@ -2,9 +2,9 @@
 /llvm-*
 /readline-*
 /pcre-*
+/dsfmt-*
 /openblas-*
 /lapack-*
 /arpack-*
 /fftw-*
 /mongoose-*
-/dSFMT-*

external/Makefile

@@ -130,17 +130,20 @@ distclean-fdlibm: clean-fdlibm
 ## dSFMT ##
 
 DSFMT_OBJ_TARGET = $(EXTROOTLIB)/libdSFMT.$(SHLIB_EXT)
-DSFMT_OBJ_SOURCE = dSFMT-src-$(DSFMT_VER)/libdSFMT.$(SHLIB_EXT)
+DSFMT_OBJ_SOURCE = dsfmt-$(DSFMT_VER)/libdSFMT.$(SHLIB_EXT)
 
 compile-dsfmt: $(DSFMT_OBJ_SOURCE)
 install-dsfmt: $(DSFMT_OBJ_TARGET)
 
-dSFMT-src-$(DSFMT_VER).tar.gz:
- curl -o dSFMT-src-$(DSFMT_VER).tar.gz -Lk https://www.math.sci.hiroshima-u.ac.jp/~m-mat/bin/dl/dl.cgi?SFMT:dSFMT-src-$(DSFMT_VER).tar.gz
-dSFMT-src-$(DSFMT_VER)/Makefile: dSFMT-src-$(DSFMT_VER).tar.gz
- tar zxf dSFMT-src-$(DSFMT_VER).tar.gz
-$(DSFMT_OBJ_SOURCE): dSFMT-src-$(DSFMT_VER)/Makefile
- cd dSFMT-src-$(DSFMT_VER) && $(CC) -O3 -finline-functions -fomit-frame-pointer -DNDEBUG -fno-strict-aliasing --param max-inline-insns-single=1800 -Wmissing-prototypes -Wall -std=c99 -DDSFMT_MEXP=19937 -fPIC -shared dSFMT.c -o libdSFMT.$(SHLIB_EXT)
+dsfmt-$(DSFMT_VER).tar.gz:
+ curl https://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-2.1.tar.gz > $@
+dsfmt-$(DSFMT_VER)/Makefile: dsfmt-$(DSFMT_VER).tar.gz
+ mkdir -p dsfmt-$(DSFMT_VER) && \
+ tar -C dsfmt-$(DSFMT_VER) --strip-components 1 -xf $<
+ touch $@
+$(DSFMT_OBJ_SOURCE): dsfmt-$(DSFMT_VER)/Makefile
+ cd dsfmt-$(DSFMT_VER) && \
+ $(CC) -O3 -finline-functions -fomit-frame-pointer -DNDEBUG -fno-strict-aliasing --param max-inline-insns-single=1800 -Wmissing-prototypes -Wall -std=c99 -DDSFMT_MEXP=19937 -fPIC -shared dSFMT.c -o libdSFMT.$(SHLIB_EXT)
 $(DSFMT_OBJ_TARGET): $(DSFMT_OBJ_SOURCE)
  mkdir -p $(EXTROOTLIB)
  cp $< $@

j/client.j

@@ -97,39 +97,43 @@ function color_available()
 end
 
 jl_banner_plain =
- " _ \n" *
- " _ _ _(_)_ |\n"
- " (_) | (_) (_) | A fresh approach to technical computing.\n" *
- " _ _ _| |_ __ _ | pre-release version\n" *
- " | | | | | | |/ _` | |\n" *
- " | | |_| | | | (_| | |\n" *
- " _/ |\\__'_|_|_|\\__'_| |\n" *
- "|__/ |\n\n"
+L" _
+ _ _ _(_)_ |
+ (_) | (_) (_) | A fresh approach to technical computing.
+ _ _ _| |_ __ _ | pre-release version
+ | | | | | | |/ _` | |
+ | | |_| | | | (_| | |
+ _/ |\__'_|_|_|\__'_| |
+|__/ |
+
+"
 
 jl_banner_color =
- "\033[1m \033[32m_\033[37m \n" *
- " \033[34m_\033[37m _ \033[31m_\033[32m(_)\033[35m_\033[37m |\n" *
- " \033[34m(_)\033[37m | \033[31m(_) \033[35m(_)\033[37m | A fresh approach to technical computing.\n" *
- " _ _ _| |_ __ _ | pre-release version\n" *
- " | | | | | | |/ _` | |\n" *
- " | | |_| | | | (_| | |\n" *
- " _/ |\\__'_|_|_|\\__'_| |\n" *
- "|__/ |\033[0m\n\n"
+"\033[1m \033[32m_\033[37m
+ \033[34m_\033[37m _ \033[31m_\033[32m(_)\033[35m_\033[37m |
+ \033[34m(_)\033[37m | \033[31m(_) \033[35m(_)\033[37m | A fresh approach to technical computing.
+ _ _ _| |_ __ _ | pre-release version
+ | | | | | | |/ _` | |
+ | | |_| | | | (_| | |
+ _/ |\\__'_|_|_|\\__'_| |
+|__/ |\033[0m
+
+"
 
 function _start()
  try
  ccall(:jl_start_io_thread, Void, ())
  global Workqueue = {}
  global Waiting = HashTable(64)
- 
+
  if !anyp(a->(a=="--worker"), ARGS)
  # start in "head node" mode
  global Scheduler = Task(()->event_loop(true), 1024*1024)
  global PGRP = ProcessGroup(1, {LocalProcess()}, {Location("",0)})
  end
- 
+
  (quiet,repl) = process_options(ARGS)
- 
+
  if repl
  if !quiet
  if color_available()