fix issue #52 ; missing rinutils in archive

diff --git a/fortune-mod/CMakeLists.txt b/fortune-mod/CMakeLists.txt
index 0325920e819bfa1bdcd5ce8d18f6086cfb4643f6..13f8e31a3821cd26cc2a09f422423ab521c1b7c8 100644 (file)
--- a/fortune-mod/CMakeLists.txt
+++ b/fortune-mod/CMakeLists.txt
@@ -33,13 +33,13 @@ SET(CPACK_SOURCE_GENERATOR "TXZ")
 SET (base_with_ver "fortune-mod-[0-9]+\\\\.[0-9]+\\\\.[0-9]+")
 
 SET(CPACK_SOURCE_IGNORE_FILES
-    "/.deps/"
+    "/\\\\.deps/"
     "/\\\\.git/"
     "/\\\\.tidyall\\\\.d/"
     "~$"
     "\\\\.pyc$"
     "/tags$"
-    "/(build|BUILD|B)/"
+    # "/(build|BUILD|B)/"
 )
 
 IF(WIN32 AND NOT UNIX)

diff --git a/fortune-mod/ChangeLog b/fortune-mod/ChangeLog
index cf597471bfd803292c63e64ca2c4703392b15af3..90c591232c20555855a5c8af193fa152a9dcac85 100644 (file)
--- a/fortune-mod/ChangeLog
+++ b/fortune-mod/ChangeLog
@@ -1,6 +1,12 @@
 (Note: this file has been re-arranged to be in reverse chronological
 order, which is The Right Thing for ChangeLogs - DLC)
 
+May 31, 2021 (fortune-mod 3.6.1)
+
+       Fix missing rinutils in release tarball.
+       ( https://github.com/shlomif/fortune-mod/issues/52 ; thanks
+       to @Vonfry )
+
 April 20, 2021 (fortune-mod 3.6.0)
 
        Some lib-recode handling fixes.

diff --git a/fortune-mod/fortune/fortune.c b/fortune-mod/fortune/fortune.c
index 879dad5ed9e4b7dec98ef711d684a6f450db9942..2f201eaaee3dde95c157ce025ada32e69ee11d4b 100644 (file)
--- a/fortune-mod/fortune/fortune.c
+++ b/fortune-mod/fortune/fortune.c
@@ -1147,7 +1147,7 @@ static void getargs(int argc, char **argv)
             (void)fprintf(stderr, "%s",
                 "fortune: can't match fortunes on this system (Sorry)\n");
             exit(0);
-#else /* NO_REGEX */
+#else             /* NO_REGEX */
         case 'm': /* dump out the fortunes */
             Match = true;
             pat = optarg;
@@ -1155,7 +1155,7 @@ static void getargs(int argc, char **argv)
         case 'i': /* case-insensitive match */
             ignore_case = true;
             break;
-#endif /* NO_REGEX */
+#endif            /* NO_REGEX */
         case 'u': /* Don't recode the fortune */
             No_recode = true;
             break;

diff --git a/fortune-mod/tests/t/check-rinutils.t b/fortune-mod/tests/t/check-rinutils.t
new file mode 100644 (file)
index 0000000..c5605ef
--- /dev/null
+++ b/fortune-mod/tests/t/check-rinutils.t
@@ -0,0 +1,36 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use Path::Tiny qw/ path /;
+
+use Test::More tests => 1;
+
+sub check_file
+{
+    my ($fn) = @_;
+    my @l = path($fn)->lines_utf8;
+    if ( @l < 4 )
+    {
+        return "too few lines";
+    }
+    return "";
+}
+
+sub mytest
+{
+    foreach my $fn ("rinutils/rinutils/include/rinutils/portable_time.h")
+    {
+        my $err = check_file("$ENV{SRC_DIR}/${fn}");
+        if ( $err ne '' )
+        {
+            fail("$fn failed - $err.");
+            return;
+        }
+    }
+    pass("All are ok.");
+}
+
+# TEST
+mytest();

diff --git a/fortune-mod/util/strfile.h b/fortune-mod/util/strfile.h
index 848f5b1beb0c61e19dc7ee7d52745c1f2f5b0c3f..582e0ca3a949012ac7b15faaa3bbbff29537ed23 100644 (file)
--- a/fortune-mod/util/strfile.h
+++ b/fortune-mod/util/strfile.h
@@ -50,8 +50,8 @@ typedef struct
     uint32_t str_longlen;  /* length of longest string */
     uint32_t str_shortlen; /* length of shortest string */
 #define STR_RANDOM 0x1     /* randomized pointers */
-#define STR_ORDERED 0x2 /* ordered pointers */
-#define STR_ROTATED 0x4 /* rot-13'd text */
+#define STR_ORDERED 0x2    /* ordered pointers */
+#define STR_ROTATED 0x4    /* rot-13'd text */
     uint32_t str_flags;    /* bit field for flags */
     uint8_t stuff[4];      /* long aligned space */
 #define str_delim stuff[0] /* delimiting character */

diff --git a/fortune-mod/ver.txt b/fortune-mod/ver.txt
index 40c341bdcdbe83bbbda981fa85368c0e1a63d0c7..9575d51bad249b78b01fa517932882eb917cb750 100644 (file)
--- a/fortune-mod/ver.txt
+++ b/fortune-mod/ver.txt
@@ -1 +1 @@
-3.6.0
+3.6.1