Merge branch 'master' of github.com:m-labs/artiq

.travis/get-toolchain.sh

@@ -19,10 +19,11 @@ do
 done
 
 export PATH=$PWD/packages/usr/local/llvm-or1k/bin:$PWD/packages/usr/local/bin:$PWD/packages/usr/bin:$PATH
-export LD_LIBRARY_PATH=$PWD/packages/usr/local/llvm-or1k/lib:$PWD/packages/usr/lib/x86_64-linux-gnu:$PWD/packages/usr/local/x86_64-unknown-linux-gnu/or1k-elf/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$PWD/packages/usr/lib/x86_64-linux-gnu:$PWD/packages/usr/local/x86_64-unknown-linux-gnu/or1k-elf/lib:$LD_LIBRARY_PATH
 
+echo "export LD_LIBRARY_PATH=$PWD/packages/usr/lib/x86_64-linux-gnu:$PWD/packages/usr/local/x86_64-unknown-linux-gnu/or1k-elf/lib:\$LD_LIBRARY_PATH" >> $HOME/.mlabs/build_settings.sh
 echo "export PATH=$PWD/packages/usr/local/llvm-or1k/bin:$PWD/packages/usr/local/bin:$PWD/packages/usr/bin:\$PATH" >> $HOME/.mlabs/build_settings.sh
-echo "export LD_LIBRARY_PATH=$PWD/packages/usr/local/llvm-or1k/lib:$PWD/packages/usr/lib/x86_64-linux-gnu:$PWD/packages/usr/local/x86_64-unknown-linux-gnu/or1k-elf/lib:\$LD_LIBRARY_PATH" >> $HOME/.mlabs/build_settings.sh
 
+or1k-linux-as --version
 llc --version
 clang --version

conda/README.md

@@ -5,14 +5,13 @@ Preparing:
 
   1. [Install miniconda][miniconda]
   2. `conda update -q conda`
-  3. `conda install conda-build`
+  3. `conda install conda-build jinja2 anaconda`
   4. `conda create -q -n py35 python=3.5`
   5. `conda config --add channels https://conda.anaconda.org/m-labs/channel/dev`
 
 Building:
 
-  1. `source activate py35`
+  1. `conda build pkgname --python 3.5`; this command displays a path to the freshly built package
-  2. `conda build pkgname --python 3.5`; this command displays a path to the freshly built package
+  2. `anaconda upload <package> -c main -c dev`
-  3. `anaconda upload <package> -c main -c dev`
 
 [miniconda]: http://conda.pydata.org/docs/install/quick.html#linux-miniconda-install

conda/lit/bld.bat

@@ -0,0 +1,2 @@
+"%PYTHON%" setup.py install
+if errorlevel 1 exit 1

conda/lit/build.sh

@@ -0,0 +1 @@
+$PYTHON setup.py install

conda/lit/meta.yaml

@@ -0,0 +1,27 @@
+package:
+  name: lit
+  version: 0.4.1
+
+source:
+  fn: lit-0.4.1.tar.gz
+  url: https://pypi.python.org/packages/source/l/lit/lit-0.4.1.tar.gz
+  md5: ea6f00470e1bf7ed9e4edcff0f650fe6
+
+build:
+  number: 0
+
+requirements:
+  build:
+    - python
+    - setuptools
+
+  run:
+    - python
+
+test:
+  commands:
+    - lit --version
+
+about:
+  home: http://llvm.org/docs/CommandGuide/lit.html
+  license: MIT

conda/llvmdev-or1k/meta.yaml

@@ -7,7 +7,7 @@ source:
   git_tag: master
 
 build:
-  number: 4
+  number: 5
 
 requirements:
   build:

conda/llvmlite-artiq/build.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-PATH=/usr/local/llvm-or1k/bin:$PATH $PYTHON setup.py install
+$PYTHON setup.py install

conda/llvmlite-artiq/meta.yaml

@@ -15,12 +15,12 @@ requirements:
         - python
 
 build:
-    number: 4
+    number: 5
 
 test:
     imports:
         - llvmlite_artiq
-        - llvmlite_artiq.llvmpy
+        - llvmlite_artiq.binding
 
 about:
     home: https://pypi.python.org/pypi/llvmlite/