Use c-def-arrays package, include ragel 6.9

- Use c-def-arrays package
- Include ragel 6.9 Windows executable
- Build `packet_actions.cpp` automatically using Paver task

Author: cfobel

COPYING

@@ -0,0 +1,15 @@
+Embedded-friendly transport layer, inspired by ZeroMQ
+Copyright (C) 2013-2015 Christian Fobel
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, see <http://www.gnu.org/licenses/>.

SConstruct

@@ -1,3 +1,6 @@
-env = Environment(CPPPATH=Dir('#/nadamq/src').abspath, CCFLAGS=['-std=c++0x'])
+import c_array_defs
+
+env = Environment(CPPPATH=[Dir('#/nadamq/src').abspath] +
+                  c_array_defs.get_includes(), CCFLAGS=['-std=c++0x'])
 
 SConscript('nadamq/src/SConscript', variant_dir='build', exports={'env': env})

nadamq/src/Packet.h

@@ -14,7 +14,7 @@ using namespace std;
 #include <stdlib.h>
 #include "crc_common.h"
 #ifdef AVR
-#include "Array.h"
+#include "CArrayDefs.h"
 #endif  // #ifdef AVR
 
 

nadamq/src/SConscript

@@ -1,38 +1,24 @@
+import platform
+
 Import('env')
 
+if platform.system() == 'Windows':
+    ragel = r'nadamq\tools\ragel-6.9\ragel.exe'
+else:
+    ragel = 'ragel'
+
 socket_fsm_src = Command('packet_socket_fsm_actions.cpp',
                          'packet_socket_fsm_actions.rl',
-                         'ragel -G2 -o $TARGET $SOURCE')
-#socket_fsm_dot = Command('packet_socket_fsm.dot', 'packet_socket_fsm_actions.rl',
-                         #'ragel -V -p -o $TARGET $SOURCE')
-#socket_fsm_pdf = Command('packet_socket_fsm.pdf', socket_fsm_dot,
-                         #'dot -Tpdf -o $TARGET $SOURCE')
+                         '%s -G2 -o $TARGET $SOURCE' % ragel)
 
 Depends(socket_fsm_src, 'packet_socket_fsm.rl')
-#Depends(socket_fsm_dot, 'packet_socket_fsm.rl')
-#Depends(socket_fsm_pdf, 'packet_socket_fsm.rl')
 
 packet_actions_src = Command('packet_actions.cpp', 'packet_actions.rl',
                              'ragel -G2 -o $TARGET $SOURCE')
-#packet_dot = Command('packet_actions.dot', 'packet_actions.rl',
-                     #'ragel -V -o $TARGET $SOURCE')
-#packet_pdf = Command('packet_actions.pdf', packet_dot,
-                     #'dot -Tpdf -o $TARGET $SOURCE')
 
 Depends(packet_actions_src, 'packet.rl')
 #Depends(packet_dot, 'packet.rl')
 #Depends(packet_pdf, 'packet.rl')
 
 crc_objs = env.Object(['crc_common.cpp'])
 packet_actions = env.Object([packet_actions_src])
-                        #CPPDEFINES=['VERBOSE_STATES'])
-# env.Program(['tests/test_packet_parser.cpp', packet_actions, crc_objs],
-#             CCFLAGS=['-g', '-O0'])
-# env.Program(['tests/test_packet_socket.cpp', socket_fsm_src, packet_actions,
-#              crc_objs], CCFLAGS=['-g', '-O0'])
-# env.Program(['tests/test_circular_buffer.cpp'], CCFLAGS=['-g', '-O0'])
-# env.Program(['tests/test_deque.cpp'], CCFLAGS=['-g', '-O0'])
-# env.Program(['tests/test_buffer_allocator.cpp'], CCFLAGS=['-g', '-O0'])
-# env.Program(['tests/test_packet_stream.cpp', packet_actions, crc_objs],
-#             CCFLAGS=['-g', '-O0'])
-# env.Program(['tests/test_packet_writer.cpp', crc_objs], CCFLAGS=['-g', '-O0'])

nadamq/tools/ragel-6.9/AUTHORS

@@ -0,0 +1 @@
+See CREDITS.

nadamq/tools/ragel-6.9/COPYING

@@ -0,0 +1,34 @@
+                     Ragel State Machine Compiler -- CREDITS
+                     =======================================
+
+
+* Ragel was designed and written by Adrian Thurston <[email protected]>.
+
+* Many others have helped out along the way. Feedback, Packaging, and Fixes
+  provided by:
+
+    Bob Tennent, Robert Lemmen, Tobias Jahn, Cris Bailiff, Buddy Betts,
+    Scott Dixon, Steven Handerson, Michael Somos, Bob Paddock, Istvan Buki,
+    David Drai, Matthias Rahlf, Zinx Verituse, Markus W. Weissmann,
+    Marc Liyanage, Erich Ocean, Alan West, Steven Kibbler, Laurent Boulard,
+    Jon Oberheide, David Helder, Lexington Luthor, Jason Jobe, Colin Fleming,
+    Carlos Antunes, Steve Horne, Matt Mower, Josef Goettgens, Zed Shaw,
+    Marcus Rueckert, Jeremy Hinegardner, Aaron Campbell, Josh Purinton,
+    Judson Lester, Barry Arthur, Tim Potter, Ryan Phelps, David Waite,
+    Kenny MacDermid, MenTaLguY, Manoj Rajagopalan, Tim Chklovski,
+    Mikkel Fahnøe Jørgensen, Andrei Polushin, Evan Phoenix, David Balmain,
+    Ross Thomas, Mitchell Foral, John D. Mitchell, Diego 'Flameeyes' Pettenò,
+    Jose Quinteiro, William Morgan, _why, Iñaki Baz Castillo, Attila Sztupák,
+    Graham Miller, Ismael Luceno, Josh Stern, Denis Naumov, Arbor Networks,
+    Victor Hugo Borja, Daniel Tang, Justine Tunney, Johannes Pfau, ygrek
+
+* Ragel 6 Code generators contributed by:
+
+  - Objective-C: Erich Ocean
+  - D: Alan West
+  - Java: Colin Fleming
+  - Ruby: Victor Hugo Borja
+  - C#: Daniel Tang
+  - Go: Justine Tunney
+  - D2: Johannes Pfau
+  - OCaml: ygrek

nadamq/tools/ragel-6.9/CREDITS

@@ -40,6 +40,7 @@
       url='https://github.com/cfobel/nadamq',
       license='GPL',
       packages=['nadamq', ],
+      install_requires=['c-array-defs'],
       # Install data listed in `MANIFEST.in`
       include_package_data=True,
       ext_modules=extensions)
@@ -61,6 +62,17 @@ def build_arduino_library():
 
 
 @task
+def build_packet_actions():
+    sh('scons')
+
+
+@task
+def clean_packet_actions():
+    sh('scons -c')
+
+
+@task
+@needs(['build_packet_actions'])
 def copy_packet_actions():
     path('build/packet_actions.cpp').copy('nadamq/src')