Skip to content

Commit cb6c37b

Browse files
committed
prod: fixes for NED errors (added missing emulation showcase feature)
1 parent a257607 commit cb6c37b

7 files changed

Lines changed: 14 additions & 33 deletions

File tree

.cproject

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,7 @@
113113

114114
<sourceEntries>
115115

116-
<entry excluding="inet/linklayer/ext|inet/transportlayer/tcp_nsc|inet/transportlayer/tcp_lwip|inet/routing/extras|transport/tcp_nsc|transport/tcp_lwip" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
117-
118-
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="tutorials/queueing"/>
116+
<entry excluding="inet/applications/voipstream|inet/emulation|inet/linklayer/ext|inet/transportlayer/tcp_nsc|inet/transportlayer/tcp_lwip|inet/routing/extras|transport/tcp_nsc|transport/tcp_lwip" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
119117

120118
</sourceEntries>
121119

@@ -229,7 +227,7 @@
229227

230228
<sourceEntries>
231229

232-
<entry excluding="inet/linklayer/ext|inet/transportlayer/tcp_nsc|inet/transportlayer/tcp_lwip|inet/routing/extras|transport/tcp_nsc|transport/tcp_lwip" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src"/>
230+
<entry excluding="inet/applications/voipstream|inet/emulation|inet/linklayer/ext|inet/transportlayer/tcp_nsc|inet/transportlayer/tcp_lwip|inet/routing/extras|transport/tcp_nsc|transport/tcp_lwip" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
233231

234232
</sourceEntries>
235233

.gitmodules

Whitespace-only changes.

.oppfeatures

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,6 +1201,18 @@
12011201
compileFlags = ""
12021202
linkerFlags = ""
12031203
/>
1204+
<feature
1205+
id="emulation_showcases"
1206+
name="Emulation showcases"
1207+
description = "Showcases that demonstrate communication with external systems/components."
1208+
initiallyEnabled = "false"
1209+
requires = "VoIPStream Ethernet Ieee80211 ExternalInterface"
1210+
labels = "showcase emulation"
1211+
nedPackages = "inet.showcases.emulation"
1212+
extraSourceFolders = ""
1213+
compileFlags = ""
1214+
linkerFlags = ""
1215+
/>
12041216
<feature
12051217
id="visualizer_showcases"
12061218
name="Visualization showcases"

releng/makedist

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ rm -rf $INET_ROOT/out/$DIRNAME
3030
mkdir -p $INET_ROOT/out/$DIRNAME
3131

3232
git checkout-index -a -f --prefix=$INET_ROOT/out/$DIRNAME/ || { echo --- error copying repo ---; exit 1;}
33-
(cd showcases; git checkout-index -a -f --prefix=$INET_ROOT/out/$DIRNAME/showcases/ || { echo --- error copying showcases ---; exit 1;})
34-
(cd tutorials; git checkout-index -a -f --prefix=$INET_ROOT/out/$DIRNAME/tutorials/ || { echo --- error copying tutorials ---; exit 1;})
3533

3634
echo "inet-$BUILDID" > $INET_ROOT/out/$DIRNAME/Version
3735

showcases/emulation/voip/run_veth

100644100755
File mode changed.

tutorials/queueing/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

tutorials/queueing/DemultiplexerNetwork

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)