conda: add artiq-pipistrello-nist_qc1.

m-labs · Oct 22, 2015 · 15b6ad7 · 15b6ad7
1 parent 8b78fe4
commit 15b6ad7
Showing 5 changed files with 18 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,13 +7,16 @@ env:
     - secure: "DUk/Ihg8KbbzEgPF0qrHqlxU8e8eET9i/BtzNvFddIGX4HP/P2qz0nk3cVkmjuWhqJXSbC22RdKME9qqPzw6fJwJ6dpJ3OR6dDmSd7rewavq+niwxu52PVa+yK8mL4yf1terM7QQ5tIRf+yUL9qGKrZ2xyvEuRit6d4cFep43Ws="
   matrix:
     - BUILD_SOC=none
+    - BUILD_SOC=pipistrello-nist_qc1
 install:
   - mkdir -p $HOME/.mlabs
-  - if [ $TRAVIS_PULL_REQUEST != false ]; then BUILD_SOC=none; fi
-  - if [ $BUILD_SOC != none ]; then ./.travis/get-xilinx.sh; ./.travis/get-toolchain.sh; fi
+  - [ $TRAVIS_PULL_REQUEST != false ] && BUILD_SOC=none
+  - [ $BUILD_SOC != none ] && ./.travis/get-xilinx.sh
+  - [ $BUILD_SOC != none ] && ./.travis/get-toolchain.sh
+  - [ $BUILD_SOC != none ] && ./.travis/get-misoc.sh
   - . ./.travis/get-anaconda.sh
   - source $HOME/miniconda/bin/activate py35
-  - conda install -q pip coverage anaconda-client migen=0.0 cython
+  - conda install -q pip coverage anaconda-client cython
   - pip install coveralls
   # workaround for https://github.com/conda/conda-build/issues/466
   - mkdir -p /home/travis/miniconda/conda-bld/linux-64
@@ -23,9 +26,12 @@ script:
   - conda install -q --use-local artiq
   - |
       if [ $BUILD_SOC == none ]; then
-        PACKAGES="$(conda build --output --python 3.5 conda/artiq) $PACKAGES"
         coverage run --source=artiq setup.py test
         make -C doc/manual html
+        PACKAGES="$(conda build --output --python 3.5 conda/artiq) $PACKAGES"
+      else
+        conda build --python 3.5 conda/artiq-$BUILD_SOC
+        PACKAGES="$(conda build --output --python 3.5 conda/artiq-$BUILD_SOC) $PACKAGES"
       fi
 after_success:
   - |

diff --git a/.travis/get-misoc.sh b/.travis/get-misoc.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+git clone --recursive https://github.com/m-labs/misoc $HOME/misoc
+echo "export MSCDIR=$HOME/misoc" >> $HOME/.m-labs/build_settings.sh
diff --git a/.travis/get-toolchain.sh b/.travis/get-toolchain.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 packages="http://us.archive.ubuntu.com/ubuntu/pool/universe/i/iverilog/iverilog_0.9.7-1_amd64.deb"
-archives="http://fehu.whitequark.org/files/llvm-or1k.tbz2"
 
 mkdir -p packages
 
@@ -12,18 +11,5 @@ do
 	dpkg -x $pkg_name packages
 done
 
-for a in $archives
-do
-  wget $a
-  (cd packages && tar xf ../$(basename $a))
-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/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
-
-or1k-linux-as --version
-llc --version
-clang --version
+echo "export LD_LIBRARY_PATH=$PWD/packages/usr/lib/x86_64-linux-gnu" >> $HOME/.m-labs/build_settings.sh
+echo "export PATH=$PWD/packages/usr/bin:\$PATH" >> $HOME/.m-labs/build_settings.sh
diff --git a/.travis/get-xilinx.sh b/.travis/get-xilinx.sh
@@ -30,7 +30,7 @@ git clone https://github.com/fallen/impersonate_macaddress
 make -C impersonate_macaddress
 # Tell mibuild where Xilinx toolchains are installed
 # and feed it the mac address corresponding to the license
-cat >> $HOME/.mlabs/build_settings.sh << EOF
+cat >> $HOME/.m-labs/build_settings.sh << EOF
 MISOC_EXTRA_VIVADO_CMDLINE="-Ob vivado_path $HOME/Xilinx/Vivado"
 MISOC_EXTRA_ISE_CMDLINE="-Ob ise_path $HOME/opt/Xilinx/"
 export MACADDR=$macaddress

diff --git a/conda/artiq-pipistrello-nist_qc1 b/conda/artiq-pipistrello-nist_qc1