Merge pull request #175 from daviderickson/extensibility

Extensibility Improvements
This commit is contained in:
Brandon Heller
2013-07-19 13:55:33 -07:00
+11 -2
View File
@@ -185,7 +185,12 @@ function of13 {
unzip libpcre3-dev flex bison libboost-dev unzip libpcre3-dev flex bison libboost-dev
if [ ! -d "ofsoftswitch13" ]; then if [ ! -d "ofsoftswitch13" ]; then
git clone https://github.com/CPqD/ofsoftswitch13.git git clone https://github.com/CPqD/ofsoftswitch13.git
if [[ -n "$OF13_SWITCH_REV" ]]; then
cd ofsoftswitch13
git checkout ${OF13_SWITCH_REV}
cd ..
fi
fi fi
# Install netbee # Install netbee
@@ -221,7 +226,11 @@ function wireshark {
sudo apt-get install -y libwiretap-dev libwireshark-dev sudo apt-get install -y libwiretap-dev libwireshark-dev
cd $BUILD_DIR cd $BUILD_DIR
hg clone https://bitbucket.org/barnstorm/of-dissector hg clone https://bitbucket.org/barnstorm/of-dissector
cd of-dissector/src cd of-dissector
if [[ -n "$WS_DISSECTOR_REV" ]]; then
hg checkout ${WS_DISSECTOR_REV}
fi
cd src
export WIRESHARK=/usr/include/wireshark export WIRESHARK=/usr/include/wireshark
scons scons
# libwireshark0/ on 11.04; libwireshark1/ on later # libwireshark0/ on 11.04; libwireshark1/ on later