Thanks. I tried editing the conflict marker out in a couple ways that seemed reasonable to me, but I got other compile errors. Does anyone know if there is a known working version of this branch in the repository, and how I can get back to it?
Thanks, Andreas 2011/10/25 Zoltán Lajos Kis <zoltan.lajos....@ericsson.com> > Seems like someone checked in a conflict marker to that file: > > > http://noxrepo.org/cgi-bin/gitweb.cgi?p=nox;a=blob;f=src/nox/coreapps/pyrt/context.i;h=cb8641d72feb3a1f0543e97830a2addd55d502b9;hb=dev/destiny-fast#l83 > > Z. > > ________________________________________ > From: nox-dev-boun...@noxrepo.org [nox-dev-boun...@noxrepo.org] On Behalf > Of Andreas Voellmy [andreas.voel...@gmail.com] > Sent: Wednesday, October 26, 2011 4:40 AM > To: nox-dev@noxrepo.org > Subject: [nox-dev] Error building dev/destiny-fast branch > > Hi, > > I'd like to try the destiny-fast branch (I saw it mentioned here: > http://www.openflow.org/wk/index.php/Controller_Performance_Comparisons), > so I did the following > > git clone git://noxrepo.org/nox<http://noxrepo.org/nox> > cd nox > git checkout dev/destiny-fast > > Is that the right way to get this branch? After that I ran > ./boot.sh > mkdir build > cd build > ../configure > make > > and got the following error: > > Making all in pyrt > make[8]: Entering directory > `/home/av/Download/nox-destiny/nox/build/src/nox/coreapps/pyrt' > /usr/bin/swig -c++ -python -DSWIGWORDSIZE64 > -I../../../../../src/include/openflow -I../../../../../src/nox/lib/ -outdir > ./. -o oxidereactor_wrap.cc -module oxidereactor > ../../../../../src/nox/coreapps/pyrt/oxidereactor.i > /usr/bin/swig -c++ -python -DSWIGWORDSIZE64 -outdir ./. -o > deferredcallback_wrap.cc -module deferredcallback > ../../../../../src/nox/coreapps/pyrt/deferredcallback.i > /usr/bin/swig -c++ -python -DSWIGWORDSIZE64 > -I../../../../../src/include/openflow -I../../../../../src/nox/lib/ -outdir > ./. -o pycomponent_wrap.cc -module pycomponent > ../../../../../src/nox/coreapps/pyrt/component.i > ../../../../../src/nox/coreapps/pyrt/context.i:79: Error: Syntax error in > input(3). > make[8]: *** [pycomponent.py] Error 1 > > Does anyone know what went wrong and how to fix this? > > Thanks, > Andreas > >
_______________________________________________ nox-dev mailing list nox-dev@noxrepo.org http://noxrepo.org/mailman/listinfo/nox-dev