forked from JuliaLang/julia
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request JuliaLang#7761 from tkelman/msvc-again
RFC: MSVC continued
- Loading branch information
Showing
32 changed files
with
527 additions
and
60 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,191 @@ | ||
| #!/bin/sh | ||
| # Script to compile Julia in MSYS assuming 7zip is installed and on the path, | ||
| # or Cygwin assuming make, curl, and mingw64-$ARCH-gcc-g++ are installed | ||
|
|
||
| # Run in top-level Julia directory | ||
| cd `dirname "$0"`/../.. | ||
| # Stop on error | ||
| set -e | ||
|
|
||
| # If ARCH environment variable not set, choose based on uname -m | ||
| if [ -z "$ARCH" ]; then | ||
| export ARCH=`uname -m` | ||
| fi | ||
| if [ $ARCH = x86_64 ]; then | ||
| bits=64 | ||
| archsuffix=64 | ||
| else | ||
| bits=32 | ||
| archsuffix=86 | ||
| fi | ||
| echo "" > Make.user | ||
|
|
||
| # Set XC_HOST if in Cygwin | ||
| if [ -n "`uname | grep CYGWIN`" ]; then | ||
| if [ -z "$XC_HOST" ]; then | ||
| export XC_HOST="$ARCH-w64-mingw32" | ||
| fi | ||
| echo "override BUILD_MACHINE = $ARCH-pc-cygwin" >> Make.user | ||
| CROSS_COMPILE="$XC_HOST-" | ||
| # Set HOSTCC if we don't have Cygwin gcc installed | ||
| if [ -z "`which gcc 2>/dev/null`" ]; then | ||
| echo 'override HOSTCC = $(CROSS_COMPILE)gcc' >> Make.user | ||
| fi | ||
| else | ||
| CROSS_COMPILE="" | ||
| fi | ||
|
|
||
| # Download most recent Julia binary for dependencies | ||
| echo "" > get-deps.log | ||
| if ! [ -e julia-installer.exe ]; then | ||
| f=julia-nightly-win$bits.exe | ||
| echo "Downloading $f" | ||
| curl -kLsSo $f http://status.julialang.org/download/win$bits | ||
| echo "Extracting $f" | ||
| 7z x -y $f >> get-deps.log | ||
| fi | ||
| for i in bin/*.dll Git/bin/msys-1.0.dll Git/bin/msys-perl5_8.dll Git/bin/*.exe; do | ||
| if [ -z "$(file `which 7z` 2>/dev/null | grep shell)" ]; then | ||
| # Windows version of 7z.exe, use backslashes | ||
| 7z e -y julia-installer.exe "\$_OUTDIR/$i" \ | ||
| -ousr\\`dirname $i | sed -e 's|/julia||' -e 's|/|\\\\|g'` >> get-deps.log | ||
| else | ||
| # p7zip, use forward slashes | ||
| 7z e -y julia-installer.exe "\$_OUTDIR/$i" \ | ||
| -ousr/`dirname $i | sed -e 's|/julia||'` >> get-deps.log | ||
| fi | ||
| done | ||
| # Remove libjulia.dll if it was copied from downloaded binary | ||
| rm -f usr/bin/libjulia.dll | ||
| rm -f usr/bin/libjulia-debug.dll | ||
|
|
||
| mingw=http://sourceforge.net/projects/mingw | ||
| if [ -z "$USEMSVC" ]; then | ||
| if [ -z "`which ${CROSS_COMPILE}gcc 2>/dev/null`" ]; then | ||
| f=mingw-w$bits-bin-$ARCH-20140102.7z | ||
| if ! [ -e $f ]; then | ||
| echo "Downloading $f" | ||
| curl -kLOsS $mingw-w64-dgn/files/mingw-w64/$f | ||
| fi | ||
| echo "Extracting $f" | ||
| 7z x -y $f >> get-deps.log | ||
| export PATH=$PATH:$PWD/mingw$bits/bin | ||
| # If there is a version of make.exe here, it is mingw32-make which won't work | ||
| rm -f mingw$bits/bin/make.exe | ||
| fi | ||
| export AR=${CROSS_COMPILE}ar | ||
|
|
||
| f=llvm-3.3-$ARCH-w64-mingw32-juliadeps.7z | ||
| # The MinGW binary version of LLVM doesn't include libgtest or libgtest_main | ||
| mkdir -p usr/lib | ||
| $AR cr usr/lib/libgtest.a | ||
| $AR cr usr/lib/libgtest_main.a | ||
| else | ||
| echo "override USEMSVC = 1" >> Make.user | ||
| echo "override ARCH = $ARCH" >> Make.user | ||
| if [ $ARCH = x86_64 ]; then | ||
| echo "override MARCH = x86-64" >> Make.user | ||
| else | ||
| echo "override MARCH = $ARCH" >> Make.user | ||
| fi | ||
| echo "override XC_HOST = " >> Make.user | ||
| export CC="$PWD/deps/libuv/compile cl -nologo -MD -Z7" | ||
| export AR="$PWD/deps/libuv/ar-lib lib" | ||
| export LD="$PWD/linkld link" | ||
| echo "override CC = $CC" >> Make.user | ||
| echo 'override CXX = $(CC) -EHsc' >> Make.user | ||
| echo "override AR = $AR" >> Make.user | ||
| echo "override LD = $LD -DEBUG" >> Make.user | ||
|
|
||
| for i in share/julia/base/pcre_h.jl; do | ||
| 7z e -y julia-installer.exe "\$_OUTDIR/$i" -obase >> get-deps.log | ||
| done | ||
|
|
||
| f=llvm-3.3-$ARCH-msvc12-juliadeps.7z | ||
| fi | ||
|
|
||
| if ! [ -e $f ]; then | ||
| echo "Downloading $f" | ||
| curl -kLOsS http://sourceforge.net/projects/juliadeps-win/files/$f | ||
| fi | ||
| echo "Extracting $f" | ||
| 7z x -y $f >> get-deps.log | ||
| echo 'LLVM_CONFIG = $(JULIAHOME)/usr/bin/llvm-config' >> Make.user | ||
|
|
||
| if [ -z "`which make 2>/dev/null`" ]; then | ||
| if [ -n "`uname | grep CYGWIN`" ]; then | ||
| echo "Install the Cygwin package for 'make' and try again." | ||
| exit 1 | ||
| fi | ||
| f="/make/make-3.81-2/make-3.81-2-msys-1.0.11-bin.tar" | ||
| if ! [ -e `basename $f.lzma` ]; then | ||
| echo "Downloading `basename $f`" | ||
| curl -kLOsS $mingw/files/MSYS/Base$f.lzma | ||
| fi | ||
| 7z x -y `basename $f.lzma` >> get-deps.log | ||
| tar -xf `basename $f` | ||
| # msysgit has an ancient version of touch that fails with `touch -c nonexistent` | ||
| cp usr/Git/bin/echo.exe bin/touch.exe | ||
| export PATH=$PWD/bin:$PATH | ||
| fi | ||
|
|
||
| f=mingw$bits-pcre-8.34-2.fc21.noarch | ||
| if ! [ -e $f.rpm ]; then | ||
| echo "Downloading $f" | ||
| curl -kLOsS http://rpmfind.net/linux/fedora/linux/development/rawhide/x86_64/os/Packages/m/$f.rpm | ||
| fi | ||
| 7z x -y $f.rpm >> get-deps.log | ||
| 7z x -y $f.cpio >> get-deps.log | ||
| echo 'override PCRE_CONFIG = $(JULIAHOME)/usr/bin/pcre-config' >> Make.user | ||
| # Move downloaded bin, lib, and include files into build tree | ||
| mv usr/$ARCH-w64-mingw32/sys-root/mingw/bin/* usr/bin | ||
| mv usr/$ARCH-w64-mingw32/sys-root/mingw/lib/*.dll.a usr/lib | ||
| mv usr/$ARCH-w64-mingw32/sys-root/mingw/include/* usr/include | ||
| # Modify prefix in pcre-config | ||
| sed -i "s|prefix=/usr/$ARCH-w64-mingw32/sys-root/mingw|prefix=$PWD/usr|" usr/bin/pcre-config | ||
| chmod +x usr/bin/* | ||
|
|
||
| for lib in LLVM SUITESPARSE ARPACK BLAS LAPACK FFTW \ | ||
| GMP MPFR PCRE LIBUNWIND RMATH OPENSPECFUN; do | ||
| echo "USE_SYSTEM_$lib = 1" >> Make.user | ||
| done | ||
| echo 'LIBBLAS = -L$(JULIAHOME)/usr/bin -lopenblas' >> Make.user | ||
| echo 'LIBBLASNAME = libopenblas' >> Make.user | ||
| echo 'override LIBLAPACK = $(LIBBLAS)' >> Make.user | ||
| echo 'override LIBLAPACKNAME = $(LIBBLASNAME)' >> Make.user | ||
|
|
||
| # Remaining dependencies: | ||
| # openlibm since we need it as a static library to work properly | ||
| # mojibake since its headers are not in the binary download | ||
| echo 'override STAGE1_DEPS = uv' >> Make.user | ||
| echo 'override STAGE2_DEPS = mojibake' >> Make.user | ||
| echo 'override STAGE3_DEPS = ' >> Make.user | ||
| make -C deps get-openlibm get-mojibake | ||
|
|
||
| # Disable git and enable verbose make in AppVeyor | ||
| if [ -n "$APPVEYOR" ]; then | ||
| echo 'override NO_GIT = 1' >> Make.user | ||
| echo 'VERBOSE = 1' >> Make.user | ||
| fi | ||
|
|
||
| if [ -n "$USEMSVC" ]; then | ||
| # Create a modified version of compile for wrapping link | ||
| sed -e 's/-link//' -e 's/cl/link/g' -e 's/ -Fe/ -OUT:/' \ | ||
| -e 's|$dir/$lib|$dir/lib$lib|g' deps/libuv/compile > linkld | ||
| chmod +x linkld | ||
|
|
||
| # Openlibm doesn't build well with MSVC right now | ||
| echo 'USE_SYSTEM_OPENLIBM = 1' >> Make.user | ||
| # Since we don't have a static library for openlibm | ||
| echo 'override UNTRUSTED_SYSTEM_LIBM = 0' >> Make.user | ||
|
|
||
| # Compile libuv and mojibake without -TP first, then add -TP | ||
| make -C deps install-uv install-mojibake | ||
| cp usr/lib/uv.lib usr/lib/libuv.a | ||
| echo 'override CC += -TP' >> Make.user | ||
| else | ||
| echo 'override STAGE1_DEPS += openlibm' >> Make.user | ||
| fi | ||
|
|
||
| make | ||
| #make debug |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule libmojibake
updated
from bc357b to df71da
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.