Packets: Add MPLSPacket image

[senf.git] / Packets / SConscript

diff --git a/Packets/SConscript b/Packets/SConscript
index 153a67c..1732162 100644 (file)
--- a/Packets/SConscript
+++ b/Packets/SConscript
@@ -5,28 +5,60 @@ import SENFSCons, glob
 
 ###########################################################################
 
-def makeAllIncludesHH(target = None, source = None, env = None):
-    file(target[0].abspath,"w").write("".join([ '#include "%s"\n' % f
-                                                for f in env['SOURCE_HEADERS']]))
-makeAllIncludesHH = env.Action(makeAllIncludesHH, varlist=['SOURCE_HEADERS'])
-
-###########################################################################
-
-sources = SENFSCons.GlobSources()
+sources, includes = SENFSCons.Glob(env)
 
 SENFSCons.StandardTargets(env)
-
-env.Command('all_includes.hh', 'SConscript', makeAllIncludesHH,
-            SOURCE_HEADERS = [ f for f in glob.glob("*.hh")
-                               if 'defined(SENF_PACKETS_DECL_ONLY)' in file(f).read() ])
-
-SENFSCons.Lib(env,
-              library = 'Packets',
-              sources = sources,
-              LIBS = [ 'Socket', 'Utils' ])
-
+SENFSCons.Lib(env, sources)
 SENFSCons.Doxygen(env, extra_sources = [
-    env.Dia2Png("structure.dia")
+    env.Dia2Png("structure.dia"),
+    env.Dia2Png("80221Bundle/TLV.dia"),
+    env.PkgDraw("MPEGDVBBundle/DTCPPacket.hh"),
+    env.PkgDraw("DefaultBundle/EthernetPacket.hh",
+                PKGDRAWPACKETS = "EthernetPacketParser"),
+    env.PkgDraw("DefaultBundle/EthVLanPacket.png", "DefaultBundle/EthernetPacket.hh",
+                PKGDRAWPACKETS = "EthVLanPacketParser"),
+    env.PkgDraw("DefaultBundle/IPv4Packet.hh"),
+    env.PkgDraw("DefaultBundle/IPv6Packet.hh"),
+    env.PkgDraw("DefaultBundle/LlcSnapPacket.hh"),
+    env.PkgDraw("DefaultBundle/UDPPacket.hh"),
+    env.PkgDraw("DefaultBundle/IPv6Extensions_Fragment.png", "DefaultBundle/IPv6Extensions.hh",
+                PKGDRAWPACKETS = "IPv6PacketParserExtension_Fragment"),
+    env.PkgDraw("DefaultBundle/IPv6Extensions_Routing.png", "DefaultBundle/IPv6Extensions.hh",
+                PKGDRAWPACKETS = "IPv6PacketParserExtension_Routing"),
+    env.PkgDraw("DefaultBundle/IPv6Extensions_HopByHop.png", "DefaultBundle/IPv6Extensions.hh",
+                PKGDRAWPACKETS = "IPv6PacketParserExtension_HopByHop"),
+    env.PkgDraw("DefaultBundle/IPv6Extensions_Destination.png", "DefaultBundle/IPv6Extensions.hh",
+                PKGDRAWPACKETS = "IPv6PacketParserExtension_Destination"),
+    env.PkgDraw("DefaultBundle/ICMPv6Packet.hh"),
+    env.PkgDraw("DefaultBundle/ICMPv6EchoRequest.png", "DefaultBundle/ICMPv6TypePacket.hh",
+                PKGDRAWPACKETS = "ICMPv6EchoRequestParser"),
+    env.PkgDraw("DefaultBundle/ICMPv6EchoReply.png", "DefaultBundle/ICMPv6TypePacket.hh",
+                PKGDRAWPACKETS = "ICMPv6EchoReplyParser"),
+    env.PkgDraw("DefaultBundle/ICMPv6ErrDestUnreachable.png", "DefaultBundle/ICMPv6TypePacket.hh",
+                PKGDRAWPACKETS = "ICMPv6ErrDestUnreachableParser"),
+    env.PkgDraw("DefaultBundle/ICMPv6ErrTooBig.png", "DefaultBundle/ICMPv6TypePacket.hh",
+                PKGDRAWPACKETS = "ICMPv6ErrTooBigParser"),
+    env.PkgDraw("DefaultBundle/ICMPv6ErrTimeExceeded.png", "DefaultBundle/ICMPv6TypePacket.hh",
+                PKGDRAWPACKETS = "ICMPv6ErrTimeExceededParser"),
+    env.PkgDraw("DefaultBundle/ICMPv6ErrParamProblem.png", "DefaultBundle/ICMPv6TypePacket.hh",
+                PKGDRAWPACKETS = "ICMPv6ErrParamProblemParser"),
+    env.PkgDraw("DefaultBundle/MLDv2ListenerQuery.png", "DefaultBundle/ICMPv6TypePacket.hh",
+                PKGDRAWPACKETS = "MLDv2ListenerQueryParser"),
+    env.PkgDraw("DefaultBundle/MLDv2ListenerReport.png", "DefaultBundle/ICMPv6TypePacket.hh",
+                PKGDRAWPACKETS = "MLDv2ListenerReportParser"),
+    env.PkgDraw("DefaultBundle/MLDv2AddressRecord.png", "DefaultBundle/ICMPv6TypePacket.hh",
+                PKGDRAWPACKETS = "MLDv2AddressRecordParser"),
+    env.PkgDraw("80221Bundle/MIHPacket.hh",
+                PKGDRAWPACKETS = "MIHPacketParser"),
+    env.PkgDraw("80211Bundle/WLANPacket.hh"),
+    env.PkgDraw("80211Bundle/RadiotapPacket.hh"),
+    env.PkgDraw("MPEGDVBBundle/GREPacket.hh"),
+    env.PkgDraw("MPEGDVBBundle/MPESection.hh"),
+    env.PkgDraw("MPEGDVBBundle/SNDUPacket.hh"),
+    env.PkgDraw("MPEGDVBBundle/TransportPacket.hh"),
+    env.PkgDraw("DefaultBundle/MPLSPacket.hh"),
 ])
+SENFSCons.InstallIncludeFiles(env, includes)
 
 SConscript(glob.glob("*/SConscript"))
+