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

.gitignore

@@ -16,5 +16,7 @@
 *.obj
 *.dylib
 *.dSYM
+*.jl.cov
+*.jl.mem
 
 .DS_Store

.mailmap

@@ -182,3 +182,5 @@ Tracy Wadleigh <[email protected]> <[email protected]>
 Tracy Wadleigh <[email protected]> <[email protected]>
 
 Mike Innes <[email protected]>
+
+Sean Garborg <[email protected]>

CONTRIBUTING.md

@@ -70,13 +70,17 @@ Julia's documentation is stored in the `doc` directory, and like everything else
 
 The Julia community uses [GitHub issues](https://github.com/JuliaLang/julia/issues) to track and discuss problems, feature requests, and pull requests. You can make pull requests for incomplete features to get code review. The convention is to prefix the pull request title with "WIP:" for Work In Progress, or "RFC:" for Request for Comments when work is completed and ready for merging. This will prevent accidental merging of work that is in progress.
 
-Note: These instructions are for adding functionality to the base library. Usually, this is not encouraged, and before doing so, it is essential to discuss the proposed changes or additions on the mailing list or in a github issue. Changing stuff in the base can potentially break a lot of things. Make sure you test your code as described here, together with the latest Julia updates, to avoid problems. Add new code to Julia's base libraries as follows:
+Note: These instructions are for adding to or improving functionality in the base library. Before getting started, it can be helpful to discuss the proposed changes or additions on the mailing list or in a github issue---it's possible your proposed change belongs in a package rather than the core language. Also, keep in mind that changing stuff in the base can potentially break a lot of things. Finally, because of the time required to build julia, note that it's usually faster to develop your code in stand-alone files, get it working, and then migrate it into the base libraries.
 
- 1. Add files to the `base/` directory, and tests into `test/`. Often, this may not be necessary and you may be able to add your code to an existing file in `base/`.
+Add new code to Julia's base libraries as follows:
 
- 2. Add any new files to `sysimg.jl` in order to build them into the Julia system image and export necessary symbols in `exports.jl`.
+ 1. Edit the appropriate file in the `base/` directory, or add new files if necessary. Create tests for your functionality and add them to files in the `test/` directory. If you're editing C or Scheme code, most likely it lives in `src/` or one of its subdirectories, although some aspects of julia's REPL initialization live in `ui/`.
 
- 3. Include your tests in `test/Makefile` and `test/runtests.jl`.
+ 2. Add any new files to `sysimg.jl` in order to build them into the Julia system image.
+
+ 3. Add any necessary export symbols in `exports.jl`.
+
+ 4. Include your tests in `test/Makefile` and `test/runtests.jl`.
 
 Build as usual, and do `make clean testall` to test your contribution. If your contribution includes changes to Makefiles or external dependencies, make sure you can build Julia from a clean tree using `git clean -fdx` or equivalent (be careful – this command will delete any files lying around that aren't checked into git). Make sure that [Travis](http:https://www.travis-ci.org) greenlights the pull request with a `Good to merge` message.
 

Make.inc

@@ -693,7 +693,7 @@ else #USEMSVC
 OSLIBS += kernel32.lib ws2_32.lib psapi.lib advapi32.lib iphlpapi.lib shell32.lib winmm.lib
 JLDFLAGS = -stack:8388608
 endif
-JCPPFLAGS += -D_WIN32_WINNT=0x0600
+JCPPFLAGS += -D_WIN32_WINNT=0x0502
 UNTRUSTED_SYSTEM_LIBM = 1
 endif
 

Makefile

@@ -67,7 +67,7 @@ release-candidate: release test
  @$(MAKE) -C doc helpdb.jl #Rebuild Julia online documentation for help(), apropos(), etc...
 
  @# Check to see if the above make invocations changed anything important
- @if [ -n "$(git status --porcelain)" ]; then \
+ @if [ -n "$$(git status --porcelain)" ]; then \
  echo "Git repository dirty; Verify and commit changes to the repository, then retry"; \
  exit 1; \
  fi

README.md

@@ -378,7 +378,7 @@ Now you should be able to run Julia like this:
 
  julia
 
-On Windows, double-click `julia.bat`.
+On Windows, double-click `usr/bin/julia.exe`.
 
 If everything works correctly, you will see a Julia banner and an interactive prompt into which you can enter expressions for evaluation.
 You can read about [getting started](http:https://julialang.org/manual/getting-started) in the manual.

README.windows.md

@@ -47,11 +47,11 @@ or edit `%USERPROFILE%\.gitconfig` and add/edit the lines:
 # Source distribution
 
 ## Supported build platforms
-
+- Windows 10: supported (32 and 64 bits)
 - Windows 8: supported (32 and 64 bits)
 - Windows 7: supported (32 and 64 bits)
-- Windows Vista: unknown
-- Windows XP: not supported (however, there have been some reports of success following the msys2 steps)
+- Windows Vista: not officially supported (but probably works anyways)
+- Windows XP: not officially supported (but may work anyways)
 
 ## Compiling with MinGW/MSYS2
 
@@ -198,16 +198,10 @@ Julia can be also compiled from source in [Cygwin](http:https://www.cygwin.com), using
  make -j 4 # Adjust the number of cores (4) to match your build environment.
 ```
 
-7. Run Julia with _either_ of:
- - Using `make`
- ```
- make run-julia
- ```
- (the full syntax is `make run-julia[-release|-debug]`)
-
- - Using the Julia executables directly
+7. Run Julia using the Julia executables directly
  ```
- usr/bin/julia
+ usr/bin/julia.exe
+ usr/bin/julia-debug.exe
 ```
 
 ## Cross-compiling from Unix