Packaging

jeffreykegler · Feb 16, 2012 · c4ee9ed · c4ee9ed
1 parent d1ad6c8
commit c4ee9ed
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 27 deletions.
diff --git a/r2/MANIFEST b/r2/MANIFEST
@@ -143,13 +143,7 @@ libmarpa/test/dev/configure.ac
 libmarpa/test/dev/testleak.c
 libmarpa/theory/.gitignore
 libmarpa/theory/Makefile
-libmarpa/theory/README
 libmarpa/theory/ah2002_notes.ltx
-libmarpa/theory/ah_to_leo.ltx
-libmarpa/theory/lyx.d/ah2002_notes.lyx
-libmarpa/theory/lyx.d/ah_to_leo.lyx
-libmarpa/theory/lyx.d/proof.lyx
-libmarpa/theory/proof.ltx
 libmarpa/theory/recce.ltx
 pod/Advanced/Bibliography.pod
 pod/Advanced/Models.pod

diff --git a/r2/MANIFEST.SKIP b/r2/MANIFEST.SKIP
@@ -117,17 +117,12 @@
 ^libmarpa/test/work/
 ^libmarpa/theory/ah2002_notes[.]aux$
 ^libmarpa/theory/ah2002_notes[.]log$
-^libmarpa/theory/ah_to_leo[.]aux$
-^libmarpa/theory/ah_to_leo[.]log$
-^libmarpa/theory/ah_to_leo[.]toc$
 ^libmarpa/theory/aiia97[.]tex$
-^libmarpa/theory/proof[.]aux$
-^libmarpa/theory/proof[.]log$
-^libmarpa/theory/proof[.]toc$
 ^libmarpa/theory/recce[.]aux$
 ^libmarpa/theory/recce[.]bbl$
 ^libmarpa/theory/recce[.]blg$
 ^libmarpa/theory/recce[.]log$
+^libmarpa/theory/recce[.]toc$
 ^nogit
 ^nogit/
 ^nytprof/

diff --git a/r2/META.json b/r2/META.json
@@ -81,19 +81,19 @@
    "provides" : {
       "Marpa::R2" : {
          "file" : "lib/Marpa/R2.pm",
-         "version" : "0.001_019"
+         "version" : "0.001_020"
       },
       "Marpa::R2::Grammar" : {
          "file" : "lib/Marpa/R2/Grammar.pm",
-         "version" : "0.001_019"
+         "version" : "0.001_020"
       },
       "Marpa::R2::HTML" : {
          "file" : "html/lib/Marpa/R2/HTML.pm",
-         "version" : "0.001_019"
+         "version" : "0.001_020"
       },
       "Marpa::R2::HTML::Callback" : {
          "file" : "html/lib/Marpa/R2/HTML/Callback.pm",
-         "version" : "0.001_019"
+         "version" : "0.001_020"
       },
       "Marpa::R2::HTML::Internal" : {
          "file" : "html/lib/Marpa/R2/HTML.pm",
@@ -105,7 +105,7 @@
       },
       "Marpa::R2::Internal" : {
          "file" : "lib/Marpa/R2/Internal.pm",
-         "version" : "0.001_019"
+         "version" : "0.001_020"
       },
       "Marpa::R2::Internal::Grammar" : {
          "file" : "lib/Marpa/R2/Grammar.pm",
@@ -121,11 +121,11 @@
       },
       "Marpa::R2::Recognizer" : {
          "file" : "lib/Marpa/R2/Recognizer.pm",
-         "version" : "0.001_019"
+         "version" : "0.001_020"
       },
       "Marpa::R2::Value" : {
          "file" : "lib/Marpa/R2/Value.pm",
-         "version" : "0.001_019"
+         "version" : "0.001_020"
       }
    },
    "release_status" : "testing",

diff --git a/r2/META.yml b/r2/META.yml
@@ -47,16 +47,16 @@ no_index:
 provides:
   Marpa::R2:
     file: lib/Marpa/R2.pm
-    version: 0.001_019
+    version: 0.001_020
   Marpa::R2::Grammar:
     file: lib/Marpa/R2/Grammar.pm
-    version: 0.001_019
+    version: 0.001_020
   Marpa::R2::HTML:
     file: html/lib/Marpa/R2/HTML.pm
-    version: 0.001_019
+    version: 0.001_020
   Marpa::R2::HTML::Callback:
     file: html/lib/Marpa/R2/HTML/Callback.pm
-    version: 0.001_019
+    version: 0.001_020
   Marpa::R2::HTML::Internal:
     file: html/lib/Marpa/R2/HTML.pm
     version: 0
@@ -65,7 +65,7 @@ provides:
     version: 0
   Marpa::R2::Internal:
     file: lib/Marpa/R2/Internal.pm
-    version: 0.001_019
+    version: 0.001_020
   Marpa::R2::Internal::Grammar:
     file: lib/Marpa/R2/Grammar.pm
     version: 0
@@ -77,10 +77,10 @@ provides:
     version: 0
   Marpa::R2::Recognizer:
     file: lib/Marpa/R2/Recognizer.pm
-    version: 0.001_019
+    version: 0.001_020
   Marpa::R2::Value:
     file: lib/Marpa/R2/Value.pm
-    version: 0.001_019
+    version: 0.001_020
 recommends:
   HTML::Entities: 3.68
   HTML::Parser: 3.64

diff --git a/r2/inc/Marpa/R2/License.pm b/r2/inc/Marpa/R2/License.pm
@@ -82,7 +82,7 @@ a Creative Commons Attribution-NoDerivs 3.0 United States License.
 END_OF_CC_A_ND_LANGUAGE
 
 my $cc_a_nd_license = "$copyright_line\n$cc_a_nd_body";
-my $cc_a_nd_thanks = $copyright_line_in_tex . q{.} . "\n$cc_a_nd_body";
+my $cc_a_nd_thanks = $cc_a_nd_body;
 
 sub hash_comment {
     my ( $text, $char ) = @_;
@@ -615,6 +615,10 @@ sub tex_cc_a_nd {
         my $problem = "No CC-A-ND LaTeX thanks in $filename\n";
         push @problems, $problem;
     } ## end if ( ( index ${$text}, $tex_cc_a_nd_license ) != 0 )
+    if ( ( index ${$text}, $copyright_line_in_tex ) < 0 ) {
+        my $problem = "No copyright line in $filename\n";
+        push @problems, $problem;
+    } ## end if ( ( index ${$text}, $tex_cc_a_nd_license ) != 0 )
     if ( scalar @problems and $verbose >= 2 ) {
         my $problem =
               "=== license for $filename should be as follows:\n"