submodule test

mnunberg · Apr 6, 2012 · 87f4838 · 87f4838
1 parent 1a2501d
commit 87f4838
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 17 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "jsonsl"]
+	path = jsonsl
+	url = git://github.com/mnunberg/jsonsl.git
diff --git a/Changes b/Changes
@@ -1,4 +1,10 @@
 Revision history for JSON-SL
+0.04    april 6 2012
+        Added left-out dependency
+
+0.03    april 6 2012
+        Tuba
+
 0.02    april 4 2012
         Added object drip, some more work on tuba
 

diff --git a/MANIFEST b/MANIFEST
@@ -11,13 +11,14 @@ srcutil/method_dispatch.pl
 srcutil/accessors.pl
 
 srcout/option_accessors.xs
+srcout/tuba_dispatch_getmeth.h
 
 perl-jsonsl.h
 jsonxs_inline.h
-tuba_dispatch_getmeth.h
 
-jsonsl.h
+jsonsl/jsonsl.c
-jsonsl.c
+jsonsl/jsonsl.h
+
 ppport.h
 
 SL.xs

diff --git a/Makefile.PL b/Makefile.PL
@@ -20,6 +20,7 @@ WriteMakefile(
 #    OPTIMIZE            => '-Wall -ggdb3 -O3 -std=gnu89 -pedantic',
     PREREQ_PM => {
         'Test::More' => 0,
+        'Constant::Generate' => '0.16'
     },
     dist                => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
     clean               => { FILES => 'JSON-SL-*' },

diff --git a/SL.xs b/SL.xs
@@ -809,7 +809,7 @@ pltuba_get_method_info(PLTUBA *tuba,
         goto GT_RETASGN;
     }
 #define PLTUBA_METH_GETMETH
-#include "tuba_dispatch_getmeth.h"
+#include "srcout/tuba_dispatch_getmeth.h"
 #undef PLTUBA_METH_GETMETH
     GT_RETASGN:
     if (gvpp) {

diff --git a/jsonsl b/jsonsl
@@ -0,0 +1 @@
+/home/mordy/src/jsonsl/
diff --git a/jsonsl.c b/jsonsl.c
diff --git a/jsonsl.h b/jsonsl.h
diff --git a/lib/JSON/SL.pm b/lib/JSON/SL.pm
@@ -16,7 +16,7 @@ use base qw(Exporter);
 our @EXPORT_OK = qw(decode_json unescape_json_string);
 
 BEGIN {
-    $VERSION = '0.0_3';
+    $VERSION = '0.0_4';
     require XSLoader;
     XSLoader::load(__PACKAGE__, $VERSION);
 }

diff --git a/lib/JSON/SL/Tuba.pm b/lib/JSON/SL/Tuba.pm
@@ -2,8 +2,6 @@ package JSON::SL::Tuba;
 use strict;
 use warnings;
 use JSON::SL;
-use Data::Dumper;
-use Log::Fu;
 use base qw(Exporter);
 our @EXPORT;
 
@@ -109,10 +107,6 @@ foreach (['key', '#'],
     }
 }
 
-sub on_any {
-    log_warn("Unhandled..");
-}
-
 1;
 
 __END__

diff --git a/perl-jsonsl.h b/perl-jsonsl.h
@@ -59,8 +59,8 @@
  * non-exportable
  */
 #define JSONSL_API static
-#include "jsonsl.h"
+#include "jsonsl/jsonsl.h"
-#include "jsonsl.c"
+#include "jsonsl/jsonsl.c"
 
 /**
  * For threaded perls, this stores the THX/my_perl context
@@ -204,7 +204,7 @@ typedef enum {
 
 
 #define PLTUBA_DEFINE_XMETHGV
-#include "tuba_dispatch_getmeth.h"
+#include "srcout/tuba_dispatch_getmeth.h"
 #undef PLTUBA_DEFINE_XMETHGV
 
 /* These are stringified as the 'Info' keys */
@@ -256,7 +256,7 @@ typedef struct {
     } options;
 
 #define PLTUBA_METHGV_STRUCT
-#include "tuba_dispatch_getmeth.h"
+#include "srcout/tuba_dispatch_getmeth.h"
 #undef PLTUBA_METHGV_STRUCT
     /* The accumulators */
     SV *accum;

diff --git a/tuba_dispatch_getmeth.h → srcout/tuba_dispatch_getmeth.h b/tuba_dispatch_getmeth.h → srcout/tuba_dispatch_getmeth.h