Merge pull request JuliaLang#4 from JuliaLang/master

Rebase to f189271
burrowsa · Mar 3, 2014 · ac74a0f · ac74a0f
2 parents a890d2e + f189271
commit ac74a0f
Show file tree

Hide file tree

Showing 17 changed files with 1,912 additions and 1,462 deletions.
diff --git a/README.windows.md b/README.windows.md
@@ -1,7 +1,7 @@
 # General Information for Windows
 
-This file describes how to use and build Julia on Windows.
-For more information about Julia, please see the [main README](https://github.com/JuliaLang/julia/blob/master/README.md) 
+This file describes how to install or build Julia on Windows.
+For more information about Julia, please see the [main README](https://github.com/JuliaLang/julia/blob/master/README.md)
 
 # Binary distribution
 
@@ -15,21 +15,123 @@ Julia runs on Windows XP SP2 or later (including Windows Vista, Windows 7, and W
 
 # Source distribution
 
+## Supported build platforms
+
+- Windows 8: supported
+- Windows 7: supported (32 and 64 bits)
+- Windows Vista: unknown
+- Windows XP: not supported
+
+## Compiling with MinGW/MSYS2
+
+### MSYS2 provides a robust MSYS experience. 
+### The instructions in this section were tested with the latest versions of all packages specified as of 2014-02-28.
+
+1. Install [7-Zip](http://www.7-zip.org/download.html).
+
+2. Install [Python 2.x](http://www.python.org/download/releases). Do **not** install Python 3.
+
+3. Install [MinGW-builds](http://sourceforge.net/projects/mingwbuilds/), a Windows port of GCC, as follows. Do **not** use the regular MinGW distribution.
+  1. Download the [MinGW-builds installer](http://downloads.sourceforge.net/project/mingwbuilds/mingw-builds-install/mingw-builds-install.exe). 
+  2. Run the installer. When prompted, choose:
+    - Version: the most recent version (these instructions were tested with 4.8.1)
+    - Architecture: x32 or x64 as appropriate and desired.
+    - Threads: win32 (not posix)
+    - Exception: sjlj (for x32) or seh (for x64). Do not choose dwarf2.
+    - Build revision: most recent available (tested with 5)
+  3. Do **not** install to a directory with spaces in the name. You will have to change the default installation path, for example,
+    - `C:\mingw-builds\x64-4.8.1-win32-seh-rev5` for 64 bits
+    - `C:\mingw-builds\x32-4.8.1-win32-sjlj-rev5` for 32 bits
+
+4. Install and configure [MSYS2](http://sourceforge.net/projects/msys2), a minimal POSIX-like environment for Windows.
+
+  1. Download the latest base [32-bit](http://sourceforge.net/projects/msys2/files/Base/i686/) or [64-bit](http://sourceforge.net/projects/msys2/files/Base/x86_64/) distribution, consistent with the architecture you chose for MinGW-builds. The archive will have a name like `msys2-base-x86_64-yyyymmdd.tar.xz` and these instructions were tested with `msys2-base-x86_64-20140216.tar.xz`.
+
+  2. Using [7-Zip](http://www.7-zip.org/download.html), extract the archive to any convenient directory. 
+    - *N.B.* Some versions of this archive contain zero-byte files that clash with existing files. If prompted, choose **not** to overwrite existing files.
+    - You may need to extract the tarball in a separate step. This will create an `msys32` or `msys64` directory, according to the architecture you chose.
+    - Move the `msys32` or `msys64` directory into your MinGW-builds directory, which is `C:\mingw-builds` if you followed the suggestions in step 3. We will omit the "32" or "64" in the steps below and refer to this as "the msys directory".
+
+  3. Double-click `msys2_shell.bat` in the msys directory. This will initialize MSYS2. The shell will tell you to `exit` and restart the shell. For now, ignore it.
+
+  4. Update MSYS2 and install packages required to build julia, using the `pacman` package manager included in MSYS2:
+
+     ```
+    pacman-key --init     #Download keys
+    pacman -Syu           #Update package database and full system upgrade
+```
+    Now `exit` the MSYS2 shell and restart it,  *even if you already restarted it above*. This is necessary in case the system upgrade updated the main MSYS2 libs. Reopen the MSYS2 shell and continue with:
+
+    ```
+    pacman -S diffutils git m4 make patch tar
+```
+
+  5. Configure your MSYS2 shell for convenience:
+
+     ```
+    echo "mount C:/Python27 /python" >> ~/.bashrc
+    # uncomment ONE of the following two lines
+    #echo "mount C:/mingw-builds/x64-4.8.1-win32-seh-rev5/mingw64 /mingw" >> ~/.bashrc
+    #echo "mount C:/mingw-builds/x32-4.8.1-win32-sjlj-rev5/mingw32 /mingw" >> ~/.bashrc
+    echo "export PATH=/usr/local/bin:/usr/bin:/opt/bin:/mingw/bin:/python" >> ~/.bashrc
+```
+
+     *N.B.* The `export` clobbers whatever `$PATH` is already defined. This is suggested to avoid path-masking. If you use MSYS2 for purposes other than building Julia, you may prefer to append rather than clobber.
+
+     *N.B.* All of the path-separators in the mount commands are unix-style. 
+
+
+  6. Configuration of the toolchain is complete. Now `exit` the MSYS2 shell.
+
+5. Build Julia and its dependencies from source.
+  1. Relaunch the MSYS2 shell and type
+
+     ```
+    . ~/.bashrc  # Some versions of MSYS2 do not run this automatically
+```
+
+     Ignore any warnings you see from `mount` about `/mingw` and `/python` not existing.
+
+  2. Get the Julia sources and start the build:
+    ```
+    git clone https://github.com/JuliaLang/julia.git
+    cd julia
+    make -j 4   # Adjust the number of cores (4) to match your build environment.
+```
+
+  3. The Julia build can (as of 2014-02-28) fail after building OpenBLAS.  This appears (?) to be a result of the OpenBLAS build trying to run the Microsoft Visual C++ `lib.exe` tool  -- which we don't need to do -- without checking for its existence. This uncaught error kills the Julia build. If this happens, follow the instructions in the helpful error message and continue the build, *viz.*
+    ```
+    cd deps/openblas-v0.2.9.rc1   # This path will depend on the version of OpenBLAS.
+    make install
+    cd ../..
+    make -j 4   # Adjust the number of cores (4) to match your build environment.
+```
+
+  4. Some versions of PCRE (*e.g.* 8.31) will compile correctly but fail a test.
+  This will cause the Julia build to fail. To circumvent testing for PCRE and allow the rest
+  of the build to continue, 
+    ```
+    touch deps/pcre-8.31/checked  # This path will depend on the version of PCRE.
+    make -j 4   # Adjust the number of cores (4) to match your build environment.
+```
+
 ## Building on Windows with MinGW-builds/MSYS
 
-1. Download and install the full [7-Zip](http://www.7-zip.org/download.html) program.
+### The MSYS build of `make` is fragile and may not reliably support parallel builds. Use MSYS2 as described above, if you can. If you must use MSYS, take care to notice the special comments in this section.
+
+1. Install [7-Zip](http://www.7-zip.org/download.html).
 
-2. Download and install the latest [Python 2.x](http://www.python.org/download/releases) release. Do not install Python 3.x.
+2. Install [Python 2.x](http://www.python.org/download/releases). Do **not** install Python 3.
 
-3. Install [MinGW-builds](http://sourceforge.net/projects/mingwbuilds/), a Windows port of GCC. (Do not use the regular MinGW distribution.)
-  1. Download the [MinGW-builds installer](http://downloads.sourceforge.net/project/mingwbuilds/mingw-builds-install/mingw-builds-install.exe) from the [MinGW-builds homepage](http://sourceforge.net/projects/mingwbuilds/). 
+3. Install [MinGW-builds](http://sourceforge.net/projects/mingwbuilds/), a Windows port of GCC. as follows. Do **not** use the regular MinGW distribution.
+  1. Download the [MinGW-builds installer](http://downloads.sourceforge.net/project/mingwbuilds/mingw-builds-install/mingw-builds-install.exe). 
   2. Run the installer. When prompted, choose:
     - Version: the most recent version (these instructions were tested with 4.8.1)
-    - Architecture: x32 or x64 as desired 
+    - Architecture: x32 or x64 as appropriate and desired.
     - Threads: win32 (not posix)
     - Exception: sjlj (for x32) or seh (for x64). Do not choose dwarf2.
     - Build revision: most recent available (tested with 5)
-  3. Do **not** install to a directory with spaces in the name. You will have to change the default installation path. Choose instead something like `C:\mingw-builds\x64-4.8.1-win32-seh-rev5\mingw64`.
+  3. Do **not** install to a directory with spaces in the name. You will have to change the default installation path. The following instructions will assume `C:\mingw-builds\x64-4.8.1-win32-seh-rev5\mingw64`.
 
 4. Download and extract the [MSYS distribution for MinGW-builds](http://sourceforge.net/projects/mingwbuilds/files/external-binary-packages/) (e.g. msys+7za+wget+svn+git+mercurial+cvs-rev13.7z) to a directory *without* spaces in the name, e.g. `C:/mingw-builds/msys`.
 
@@ -38,7 +140,7 @@ Julia runs on Windows XP SP2 or later (including Windows Vista, Windows 7, and W
 6. Run the `msys.bat` installed in Step 4. Set up MSYS by running at the MSYS prompt:
 
    ```
-    mount C:/mingw-builds/x64-4.8.1-win32-seh-rev5/mingw64/bin /mingw
+    mount C:/mingw-builds/x64-4.8.1-win32-seh-rev5/mingw64 /mingw
     mount C:/Python27 /python
     export PATH=$PATH:/mingw/bin:/python
    ```
@@ -71,67 +173,21 @@ Julia runs on Windows XP SP2 or later (including Windows Vista, Windows 7, and W
 ```
     (or `julia-basic` if you prefer)
 
-## Compiling with MinGW/MSYS2 (experimental)
-
-1. Download and install [7-Zip](http://www.7-zip.org/download.html), [Python 2.x](http://www.python.org/download/releases) and [MinGW-builds](http://sourceforge.net/projects/mingwbuilds/) as described in the previous section.
-
-2. Install and configure [MSYS2](http://sourceforge.net/projects/msys2), a minimal POSIX-like environment for Windows.
-  1. Download the latest base [32-bit](http://sourceforge.net/projects/msys2/files/Base/32-bit) or [64-bit](http://sourceforge.net/projects/msys2/files/Base/64-bit) distribution as apprpriate.
-  2. Using [7-Zip](http://www.7-zip.org/download.html), extract the archive to a convenient directory, e.g. **C:\msys2\x64-20131126**. You may need to extract the tarball in a separate step. This will create an additional `msys32`/`msys64` subdirectory.
-    - Some versions of this archive contain zero-byte files that clash with existing files. If prompted, choose to not overwrite all existing files.
-  3. Launch `msys2_shell.bat`, which will initialize MSYS2.
-  4. Install the necessary packages:
-
-     ```
-    pacman-key --init #Download keys
-    pacman -Syu #Update package database and full system upgrade
-    pacman -S diffutils git m4 make patch python2 tar
-    ln -s /usr/bin/python{2.exe,} #Fixes python2 not found error
-```
-
-  5. Edit the `/etc/fstab` file and append a line of the form
-
-     ```
-    C:/mingw-builds/x64-4.8.1-win32-seh-rev5/mingw64 /mingw ext3 binary 0 0
-```
-
-   Use the actual installation directory of MinGW from Step 2c. Consult the
-  [Cygwin manual](http://cygwin.com/cygwin-ug-net/using.html#mount-table) for
-  details of how to enter the directory name.
-
-  6. Edit the `~/.bashrc` file and append the line
-     ```   
-    export PATH=$PATH:/mingw/bin
-```
-
-  7. `exit` the MSYS2 shell.
-
-3. Build Julia and its dependencies from source.
-  1. Relaunch the MSYS2 shell and type
-
-     ```
-    . ~/.bashrc #Some versions of MSYS2 do not run this automatically
-    git clone https://github.com/JuliaLang/julia.git
-    cd julia
-    make
-```
-
-  2. Some versions of PCRE (e.g. 8.31) will compile correctly but have a single
-  test fail with an error like `** Failed to set locale "fr_FR`
-  which will break the entire build. To circumvent the test and allow the rest
-  of the build to continue, create an empty `checked` file in the `deps/pcre*`
-  directory and rerun `make`.
-
-
 ## Cross-compiling
 
 If you prefer to cross-compile, the following steps should get you started.
 
 ### Ubuntu and Mac Dependencies (these steps will work for almost any linux platform)
 
-First, you will need to ensure your system has the required dependencies. We need wine, a system compiler, and some downloaders.
+First, you will need to ensure your system has the required dependencies. We need wine (>=1.7.5),
+a system compiler, and some downloaders.
 
-On Ubuntu: ```apt-get install wine subversion cvs gcc wget p7zip-full```
+On Ubuntu: 
+
+    apt-add repository ppa:ubuntu-wine/ppa
+    apt-get upate
+    apt-get install wine1.7 subversion cvs gcc wget p7zip-full
+
 
 On Mac: Install XCode, XCode command line tools, X11 (now [XQuartz](http://xquartz.macosforge.org/)),
 and [MacPorts](http://www.macports.org/install.php) or [Homebrew](http://mxcl.github.io/homebrew/).

diff --git a/base/array.jl b/base/array.jl
@@ -199,12 +199,12 @@ fill(v, dims::Integer...) = fill!(Array(typeof(v), dims...), v)
 
 for (fname, felt) in ((:zeros,:zero),
                       (:ones,:one),
-                      (:infs,:inf), 
+                      (:infs,:inf),
                       (:nans,:nan))
     @eval begin
-        ($fname){T}(::Type{T}, dims...) = fill!(Array(T, dims...), ($felt)(T))
-        ($fname)(dims...)               = fill!(Array(Float64, dims...), ($felt)(Float64))
-        ($fname){T}(x::AbstractMatrix{T}) = ($fname)(T, size(x, 1), size(x, 2))
+        ($fname){T}(::Type{T}, dims...)  = fill!(Array(T, dims...), ($felt)(T))
+        ($fname)(dims...)                = fill!(Array(Float64, dims...), ($felt)(Float64))
+        ($fname){T}(x::AbstractArray{T}) = ($fname)(T, size(x))
     end
 end
 

diff --git a/base/task.jl b/base/task.jl
@@ -93,14 +93,20 @@ function produce(v)
     #t = shift!(q.waitq)
     #empty = isempty(q.waitq)
     ct = current_task()
-    q = ct.consumers
-    if isa(q,Condition)
-        t = shift!(q.waitq)
-        empty = isempty(q.waitq)
-    else
-        t = q
-        ct.consumers = nothing
-        empty = true
+    local empty, t, q
+    while true
+        q = ct.consumers
+        if isa(q,Task)
+            t = q
+            ct.consumers = nothing
+            empty = true
+            break
+        elseif isa(q,Condition) && !isempty(q.waitq)
+            t = shift!(q.waitq)
+            empty = isempty(q.waitq)
+            break
+        end
+        wait()
     end
 
     t.state = :runnable
@@ -144,9 +150,7 @@ function consume(P::Task, values...)
     if P.consumers === nothing || (isa(P.consumers,Condition)&&isempty(P.consumers.waitq))
         P.consumers = ct
     else
-        if P.consumers === nothing
-            P.consumers = Condition()
-        elseif isa(P.consumers, Task)
+        if isa(P.consumers, Task)
             t = P.consumers
             P.consumers = Condition()
             push!(P.consumers.waitq, t)

diff --git a/contrib/stringpatch.c b/contrib/stringpatch.c
@@ -15,7 +15,7 @@ int main( int argc, char ** argv ) {
 
 	FILE * f = fopen( argv[4], "r+" );
 	if( !f ) {
-		printf( "ERROR: Could not open %s for writing!\n", argv[3] );
+		printf( "ERROR: Could not open %s for writing!\n", argv[4] );
 		return -1;
 	}
 

diff --git a/deps/libuv b/deps/libuv
diff --git a/doc/manual/embedding.rst b/doc/manual/embedding.rst
@@ -19,6 +19,8 @@ We start with a simple C program that initializes Julia and calls some Julia cod
   int main(int argc, char *argv[])
   {
       jl_init(NULL);
+      JL_SET_STACK_BASE;
+
       jl_eval_string("print(sqrt(2.0))");
 
       return 0;
@@ -30,7 +32,11 @@ In order to build this program you have to put the path to the Julia header into
 
 Alternatively, look at the ``embedding.c`` program in the julia source tree in the ``examples/`` folder.
 
-The first thing that has do be done before calling any other Julia C function is to initialize Julia. This is done by calling ``jl_init``, which takes as argument a C string (``const char*``) to the location where Julia is installed. When the argument is ``NULL``, a standard Julia location is assumed. The second statement in the test program evaluates a Julia statement using a call to ``jl_eval_string``.
+The first thing that has do be done before calling any other Julia C function is to initialize Julia. This is done by calling ``jl_init``, which takes as argument a C string (``const char*``) to the location where Julia is installed. When the argument is ``NULL``, Julia tries to determine the install location automatically.
+
+The second statement initializes Julia's task scheduling system. This statement must appear in a function that will not return as long as calls into Julia will be made (``main`` works fine). Strictly speaking, this statement is optional, but operations that switch tasks will cause problems if it is omitted.
+
+The third statement in the test program evaluates a Julia statement using a call to ``jl_eval_string``.
 
 Converting Types
 ========================