From 4376fea43cb5fbc15d3a42cfa26c8bc911cc0bf7 Mon Sep 17 00:00:00 2001 From: Han Wang Date: Sat, 23 Dec 2017 10:02:20 -0800 Subject: [PATCH] update travis and readme --- .gitmodules | 6 +++--- .travis.yml | 42 +----------------------------------------- README.md | 10 ++++++++-- 3 files changed, 12 insertions(+), 46 deletions(-) diff --git a/.gitmodules b/.gitmodules index 83aef7b..22e3cf9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "p4c"] path = p4c - url = git@github.com:p4lang/p4c.git + url = https://github.com/p4lang/p4c.git [submodule "connectal"] path = connectal - url = git@github.com:cambridgehackers/connectal.git + url = https://github.com/cambridgehackers/connectal.git [submodule "fpgamake"] path = fpgamake - url = git@github.com:cambridgehackers/fpgamake.git + url = https://github.com/cambridgehackers/fpgamake.git diff --git a/.travis.yml b/.travis.yml index 0fd9cc3..be2c339 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,54 +2,14 @@ language: cpp cache: pip: true directories: -before_script: -- if [ -d Bluespec-2015.09.beta2 ] ; then echo bluespec cached; else curl http://www.bluespec.com/downloads/Bluespec-2015.09.beta2.tar.gz | tar -zxf - ; fi -- mkdir -p lib -- ln -s /usr/lib/x86_64-linux-gnu/libgmp.so.10 lib/libgmp.so.3 -- git clone git@github.com:hanw/connectal.git ../connectal -- git clone git@github.com:hanw/sonic-lite.git ../sonic-lite -- git clone git@github.com:hanw/p4c.git ../p4c -- pip install ply env: global: - - BLUESPECDIR=$PWD/Bluespec-2015.09.beta2/lib - - PATH=$PATH:$PWD/Bluespec-2015.09.beta2/bin - - LD_LIBRARY_PATH=$PWD/lib - - DEV_ROOT=$PWD/.. - - CONNECTAL=$PWD/../connectal - - P4C=$PWD/../p4c - P4FPGA=$PWD - matrix: - - CONNECTAL_TEST=$P4FPGA/examples/benchmark/benchmark-runtime CONNECTAL_ARCH=bluesim - - CONNECTAL_TEST=$P4FPGA/examples/benchmark/benchmark-parser CONNECTAL_ARCH=bluesim - - CONNECTAL_TEST=$P4FPGA/examples/benchmark/benchmark-mdp CONNECTAL_ARCH=bluesim script: -- ls Bluespec-2015.09.beta2 -- export PYTHONPATH=$PWD/scripts; cd $CONNECTAL; make scripts/syntax/parsetab.py; -#- cd $P4C; bash bootstrap.sh; ln -s extensions/c++ $P4FPGA/src; cd build; make -j8 -- export PATH=$PATH:$P4C/build/; cd $CONNECTAL_TEST; make build.$CONNECTAL_ARCH -j4; make run.$CONNECTAL_ARCH +- cd $P4FPGA; ./bootstrap_env.sh; ./bootstrap.sh; cd build; make -j4 sudo: required dist: trusty os: - linux -addons: - apt: - sources: - - sourceline: 'ppa:jamey-hicks/connectal' - packages: - - python-dev - - libgmp10 - - libjsoncpp-dev - - verilator - - libpcap-dev - - libtool - - libgc-dev - - bison - - flex - - libgmp-dev - - libboost-dev - - python-scapy - - python-ipaddr - - python-ply notifications: email: false diff --git a/README.md b/README.md index 07d8510..59e703d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.com/hanw/p4fpga.svg?token=QcAxzpNcQodXfewmHgNA&branch=master)](https://travis-ci.com/hanw/p4fpga) +[![Build Status](https://travis-ci.org/p4fpga/p4fpga.svg?branch=master)](https://travis-ci.org/p4fpga/p4fpga) # Join P4FPGA email list: @@ -6,10 +6,16 @@ https://groups.google.com/forum/#!forum/p4fpga-dev As a member of P4FPGA-dev, you can send support requests to p4fpga-dev@googlegroups.com +# Bootstrap environment + +``` +bash bootstrap_env.sh +``` + # Build P4FPGA from Source ``` git submodule update --init --recursive -./bootstrap.sh +bash bootstrap.sh cd build make -j8 ```