PDL::IO::Misc switch to new lib/*.pd scheme

PDLPorters · Nov 20, 2024 · 3c01655 · 3c01655
1 parent 8b12bfd
commit 3c01655
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 22 deletions.
diff --git a/Basic/.gitignore b/Basic/.gitignore
@@ -9,6 +9,9 @@ lib/PDL/Core/pdl.h
 lib/PDL/FFT.c
 lib/PDL/FFT.pm
 lib/PDL/FFT.xs
+lib/PDL/IO/Misc.c
+lib/PDL/IO/Misc.pm
+lib/PDL/IO/Misc.xs
 lib/PDL/IO/Pnm.c
 lib/PDL/IO/Pnm.pm
 lib/PDL/IO/Pnm.xs

diff --git a/Basic/IO-Misc/.gitignore b/Basic/IO-Misc/.gitignore
diff --git a/Basic/IO-Misc/Makefile.PL b/Basic/IO-Misc/Makefile.PL
diff --git a/Basic/Makefile.PL b/Basic/Makefile.PL
@@ -32,7 +32,8 @@ EOT
     slice subclass thread thread_def ufunc
   );
   my $basictest = join ' ', map catfile('t', $_.'.t'), qw(
-    compression fft imagergb picnorgb picrgb pic_16bit pnm rim
+    compression fft imagergb picnorgb picrgb pic_16bit io-pnm pic-rim
+    io-misc
   );
   $text .= <<EOF;
 basictest : basicdtest
@@ -72,8 +73,8 @@ my $core_obj = catfile(qw(lib PDL), 'Core$(OBJ_EXT)');
 # the modules in PDL::LiteF, used in t/core.t
 my @BUILD_CORE = qw(Bad Core Math MatrixOps Ops Primitive Slices Ufunc);
 # the modules needed in "use PDL"
-my @BUILD_BASIC = qw(Compression FFT IO/Pnm ImageRGB);
-my @DIRS_BASIC = qw(IO-Misc Lib-ImageND);
+my @BUILD_BASIC = qw(Compression FFT IO/Misc IO/Pnm ImageRGB);
+my @DIRS_BASIC = qw(Lib-ImageND);
 WriteMakefile(
   NAME	=> 'PDL',
   VERSION_FROM => 'lib/PDL/Core.pm',

diff --git a/Basic/IO-Misc/misc.pd → Basic/lib/PDL/IO/Misc.pd b/Basic/IO-Misc/misc.pd → Basic/lib/PDL/IO/Misc.pd
diff --git a/Basic/IO-Misc/t/misc.t → Basic/t/io-misc.t b/Basic/IO-Misc/t/misc.t → Basic/t/io-misc.t
diff --git a/Basic/t/pnm.t → Basic/t/io-pnm.t b/Basic/t/pnm.t → Basic/t/io-pnm.t
diff --git a/Basic/t/rim.t → Basic/t/pic-rim.t b/Basic/t/rim.t → Basic/t/pic-rim.t
diff --git a/MANIFEST b/MANIFEST
@@ -10,9 +10,6 @@ Basic/examples/PDL-Parallel-threads/barrier-sync.pl
 Basic/examples/PDL-Parallel-threads/perl-barrier.pl
 Basic/examples/PDL-Parallel-threads/simple-parallelize.pl
 Basic/examples/PDL-Parallel-threads/test-memory-consumption.pl
-Basic/IO-Misc/Makefile.PL
-Basic/IO-Misc/misc.pd
-Basic/IO-Misc/t/misc.t
 Basic/Lib-ImageND/imagend.pd
 Basic/Lib-ImageND/Makefile.PL
 Basic/Lib-ImageND/t/imagend.t
@@ -84,6 +81,7 @@ Basic/lib/PDL/IO/Dumper.pm
 Basic/lib/PDL/IO/FastRaw.pm
 Basic/lib/PDL/IO/FITS.pm
 Basic/lib/PDL/IO/FlexRaw.pm
+Basic/lib/PDL/IO/Misc.pd
 Basic/lib/PDL/IO/Pic.pm
 Basic/lib/PDL/IO/Pnm.pd
 Basic/lib/PDL/IO/Pnm/get.c
@@ -191,6 +189,8 @@ Basic/t/func.pdl
 Basic/t/imagergb.t
 Basic/t/inline-with.t
 Basic/t/inlinepdlpp.t
+Basic/t/io-misc.t
+Basic/t/io-pnm.t
 Basic/t/lvalue.t
 Basic/t/m51.fits.fz
 Basic/t/math.t
@@ -203,10 +203,10 @@ Basic/t/ops-bitwise.t
 Basic/t/ops.t
 Basic/t/pdl_from_string.t
 Basic/t/pdlchar.t
+Basic/t/pic-rim.t
 Basic/t/pic_16bit.t
 Basic/t/picnorgb.t
 Basic/t/picrgb.t
-Basic/t/pnm.t
 Basic/t/pp_croaking.t
 Basic/t/pp_line_numbers.t
 Basic/t/ppt-01_ref_counting.t
@@ -229,7 +229,6 @@ Basic/t/primitive-vector.t
 Basic/t/primitive-vsearch.t
 Basic/t/pthread.t
 Basic/t/reduce.t
-Basic/t/rim.t
 Basic/t/scope.t
 Basic/t/slice.t
 Basic/t/storable.t

diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
@@ -42,6 +42,7 @@ RCS
 ^Basic/lib/PDL/Bad(\.(pm|xs|c)$|-pp-)
 ^Basic/lib/PDL/Compression(\.(pm|xs|c)$|-pp-)
 ^Basic/lib/PDL/FFT(\.(pm|xs|c)$|-pp-)
+^Basic/lib/PDL/IO/Misc(\.(pm|xs|c)$|-pp-)
 ^Basic/lib/PDL/IO/Pnm(\.(pm|xs|c)$|-pp-)
 ^Basic/lib/PDL/ImageRGB(\.(pm|xs|c)$|-pp-)
 ^Basic/lib/PDL/Math(\.(pm|xs|c)$|-pp-)
@@ -53,7 +54,6 @@ RCS
 ^Basic/lib/PDL/Ufunc(\.(pm|xs|c)$|-pp-)
 ^Basic/lib/PDL/Core\.c$
 ^Basic/lib/PDL/Core/pdl\.h$
-^Basic/IO-Misc/Misc\..*
 ^Basic/IO-Storable/Storable\..*
 ^Basic/Lib-ImageND/ImageND\..*
 ^Basic/script/pdl$