Skip to content

Commit

Permalink
First merge with inet integration
Browse files Browse the repository at this point in the history
  • Loading branch information
aarizaq committed Oct 13, 2014
1 parent dbc06ba commit ed6aaef
Show file tree
Hide file tree
Showing 5,419 changed files with 517,748 additions and 510,344 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1,171 changes: 601 additions & 570 deletions .cproject

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions .gdbinit.py
@@ -1,12 +1,12 @@
import sys
import os

# add the pretty printer classes to the system class path
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))+"/misc/gdb")

if 'register_inet_printers' in dir():
print 'inet pretty printers already initialized.'
else:
from inet.printers import register_inet_printers
register_inet_printers(None)
print 'Pretty printers initialized: inet'
import sys
import os

# add the pretty printer classes to the system class path
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))+"/misc/gdb")

if 'register_inet_printers' in dir():
print 'inet pretty printers already initialized.'
else:
from inet.printers import register_inet_printers
register_inet_printers(None)
print 'Pretty printers initialized: inet'
8 changes: 4 additions & 4 deletions .gitattributes
@@ -1,4 +1,4 @@
.cproject merge=ours
.nedfolders merge=ours
.oppbuildspec merge=ours
.project merge=ours
.cproject merge=ours
.nedfolders merge=ours
.oppbuildspec merge=ours
.project merge=ours
100 changes: 52 additions & 48 deletions .gitignore
@@ -1,48 +1,52 @@
# ignore generated files
.settings/
*_m.h
*_m.cc
*_sm.h
*_sm.cc
src/Makefile
src/Makefile.vc
/doc/doxy/
/doc/neddoc/
/examples/*/results/
/examples/*/*/results/
/examples/*/*/*/results/
/tests/*/work/
*.pyc
*.pcap
*.sca
*.vec
*.anf
# ignore binary files
out/
*.so
*.dylib
*.dll
*.a
*.lib
*.exe
*.o
*.obj
*.pdb
*.idb
*.manifest
.tkenvrc
.tkenvlog
.cmdenv-log
netanim-trace.txt
*.out
gcc-debug

# ignore backup and temp files
*.bak
backups
*~
xxx
/3rdparty
/tmp/
/src/.tmp*

# ignore generated files
.settings/
*_m.h
*_m.cc
*_sm.h
*_sm.cc
src/Makefile
src/Makefile.vc
/doc/doxy/
/doc/neddoc/
/examples/*/results/
/examples/*/*/results/
/examples/*/*/*/results/
/tests/*/work/
/tests/*/results*/
*.log
*.sim
*.pyc
*.pcap
*.sca
*.vec
*.anf
.buildlog*
# ignore binary files
out/
*.so
*.dylib
*.dll
*.a
*.lib
*.exe
*.o
*.obj
*.pdb
*.idb
*.manifest
.tkenvrc
.tkenvlog
.cmdenv-log
netanim-trace.txt
*.out
gcc-debug

# ignore backup and temp files
*.bak
backups
*~
xxx
/3rdparty
/tmp/
/src/.tmp*

4 changes: 2 additions & 2 deletions .nedfolders
@@ -1,9 +1,9 @@
examples
src
-inet.examples.ieee802_1d
-inet.transportlayer.tcp_lwip
-inet.underTest.Ieee80211
-inet.underTest.ieee8021d
-inet.applications.voiptool
-inet.transportlayer.tcp_nsc
-inet.examples.WIMAX.WiMAXHandover
-inet.underTest._4gsim
-inet.transport.tcp_lwip
Expand Down
8 changes: 4 additions & 4 deletions .oppbuildspec
@@ -1,4 +1,4 @@
<buildspec version="4.0">
<dir makemake-options="--deep --nolink -O out --meta:recurse --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="." type="custom"/>
<dir makemake-options="--deep --make-so -o inet -O out -pINET --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="src" type="makemake"/>
</buildspec>
<buildspec version="4.0">
<dir makemake-options="--deep --nolink -O out --meta:recurse --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="." type="custom"/>
<dir makemake-options="--deep --make-so -o inet -O out -pINET --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="src" type="makemake"/>
</buildspec>

0 comments on commit ed6aaef

Please sign in to comment.