Skip to content

Commit

Permalink
Merge branch 'release/0.40.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
zhiayang committed Jun 26, 2019
2 parents 763e87d + e467c8c commit 83b0a1c
Show file tree
Hide file tree
Showing 215 changed files with 6,582 additions and 2,597 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ build/standalone
*.ll
*.bc

build/plots.txt
build/massive.flx

*.ir
shakefile.hi
shakefile
Expand All @@ -65,14 +68,15 @@ bug-repro

.vscode
*.vcxproj.filters
*.vcxproj.user

countloc.bat

prof.svg
prof_with_square.svg
build/cmake-output
.idea
CMakeLists.txt
# CMakeLists.txt

source_old

Expand Down
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ addons:
- libmpfr4
homebrew:
packages:
- mpfr
- llvm@7
update: true

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ Apache License
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2015 zhiayang@gmail.com
Copyright 2015 zhiayang

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
26 changes: 18 additions & 8 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,43 @@
image: Visual Studio 2017
image: Visual Studio 2019

clone_folder: c:\projects\flax

environment:
global:
DEPS_DBG_INCLUDES_DIR: c:\projects\lib\mpir\DebugNoSyms\include;c:\projects\lib\mpfr\DebugNoSyms\include;c:\projects\lib\llvm\DebugNoSyms\include
DEPS_REL_INCLUDES_DIR: c:\projects\lib\mpir\Release\include;c:\projects\lib\mpfr\Release\include;c:\projects\lib\llvm\Release\include
DEPS_DBG_LIBS_DIR: c:\projects\lib\mpir\DebugNoSyms\lib;c:\projects\lib\mpfr\DebugNoSyms\lib;c:\projects\lib\llvm\DebugNoSyms\lib
DEPS_REL_LIBS_DIR: c:\projects\lib\mpir\Release\lib;c:\projects\lib\mpfr\Release\lib;c:\projects\lib\llvm\Release\lib
MPIR_ROOT_DIR: c:\projects\lib\mpir
MPFR_ROOT_DIR: c:\projects\lib\mpfr
LLVM_ROOT_DIR: c:\projects\lib\llvm
LIBFFI_ROOT_DIR: c:\projects\lib\libffi

cache:
- c:\projects\lib -> appveyor.yml

install:
# Set up the build environment
- cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
- cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
# download our deps.
- ps: "[Net.ServicePointManager]::SecurityProtocol = 'Ssl3, Tls, Tls11, Tls12'"
- ps: >-
If (!(Test-Path c:\projects\lib -PathType Container)) {
Invoke-WebRequest 'https://github.com/flax-lang/flax/releases/download/win-build-deps/libraries.zip' -OutFile 'c:\projects\libs.zip'
7z x -y -oc:\projects\lib c:\projects\libs.zip
}
# Download ninja
- cmd: mkdir C:\ninja-build
- ps: (new-object net.webclient).DownloadFile('https://github.com/mesonbuild/cidata/raw/master/ninja.exe', 'C:\ninja-build\ninja.exe')
- cmd: set PYTHON_ROOT=C:\python37-x64
# Add neccessary paths to PATH variable
- cmd: set PATH=%cd%;C:\ninja-build;%PYTHON_ROOT%;%PYTHON_ROOT%\Scripts;%PATH%
# Install meson
- cmd: pip install meson

build_script:
- ps: msbuild -maxcpucount -verbosity:minimal -nologo -p:Configuration=Release c:\projects\flax\flax.vcxproj
- ps: meson --buildtype=release build/meson-rel
- ps: ninja -C build/meson-rel

test_script:
- ps: cd c:\projects\flax
- ps: New-Item -Force -Path build\sysroot\usr\local\lib\flaxlibs -ItemType Directory
- ps: Copy-Item -Recurse -Force libs\* build\sysroot\usr\local\lib\flaxlibs\
- ps: cmd /c build\sysroot\windows\Release\flaxc.exe -sysroot build\sysroot -run build\tester.flx
- ps: build\meson-rel\flaxc.exe -sysroot build\sysroot -run build\tester.flx > output.txt
- ps: cat output.txt
255 changes: 0 additions & 255 deletions build/expected_output.txt

This file was deleted.

2 changes: 1 addition & 1 deletion build/gltest.flx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// gltest.flx
// Copyright (c) 2014 - 2016, zhiayang@gmail.com
// Copyright (c) 2014 - 2016, zhiayang
// Licensed under the Apache License Version 2.0.

// import Foundation
Expand Down
33 changes: 0 additions & 33 deletions build/plots.txt

This file was deleted.

Loading

0 comments on commit 83b0a1c

Please sign in to comment.