Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c8039e9dd22d
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2456e795dd2d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 7, 2015

  1. Copy the full SHA
    1ddcfc1 View commit details
  2. Copy the full SHA
    2456e79 View commit details
Showing with 5 additions and 2 deletions.
  1. +1 −1 conda/artiq/build.sh
  2. +4 −1 conda/artiq/meta.yaml
2 changes: 1 addition & 1 deletion conda/artiq/build.sh
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ BIN_PREFIX=$ARTIQ_PREFIX/binaries
mkdir -p $ARTIQ_PREFIX/misc
cp misc/99-ppro.rules $ARTIQ_PREFIX/misc/
mkdir -p $BIN_PREFIX
cp $SRC_DIR/misoc/build/artiqminisoc-papilio_pro.bin $BIN_PREFIX/
cp $SRC_DIR/misoc/build/artiq_ppro-up-papilio_pro.bin $BIN_PREFIX/
cp $SRC_DIR/misoc/software/bios/bios.bin $BIN_PREFIX/
cp soc/runtime/runtime.fbi $BIN_PREFIX/
cp artiq/frontend/artiq_flash.sh $PREFIX/bin
5 changes: 4 additions & 1 deletion conda/artiq/meta.yaml
Original file line number Diff line number Diff line change
@@ -10,13 +10,16 @@ build:
number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
entry_points:
- artiq_client = artiq.frontend.artiq_client:main
- artiq_gui = artiq.frontend.artiq_gui:main # [not win]
- artiq_ctlmgr = artiq.frontend.artiq_ctlmgr:main
- artiq_master = artiq.frontend.artiq_master:main
- artiq_rpctool = artiq.frontend.artiq_rpctool:main
- artiq_run = artiq.frontend.artiq_run:main
- lda_controller = artiq.frontend.lda_controller:main
- novatech409b_controller = artiq.frontend.novatech409b_controller:main
- pdq2_client = artiq.frontend.pdq2_client:main
- pdq2_controller = artiq.frontend.pdq2_controller:main
- thorlabs_tcube_controller = artiq.frontend.thorlabs_tcube_controller:main
- artiq_gui = artiq.frontend.artiq_gui:main # [not win]

requirements:
build: