PDL::Primitive switch to new lib/*.pd scheme

PDLPorters · Nov 19, 2024 · 7a8302c · 7a8302c
1 parent bedcea3
commit 7a8302c
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 26 deletions.
diff --git a/Basic/.gitignore b/Basic/.gitignore
@@ -9,6 +9,9 @@ lib/PDL/Math.xs
 lib/PDL/Ops.c
 lib/PDL/Ops.pm
 lib/PDL/Ops.xs
+lib/PDL/Primitive.c
+lib/PDL/Primitive.pm
+lib/PDL/Primitive.xs
 lib/PDL/Slices.c
 lib/PDL/Slices.pm
 lib/PDL/Slices.xs

diff --git a/Basic/Makefile.PL b/Basic/Makefile.PL
@@ -65,8 +65,8 @@ push @cleanup, $cobj;
 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 Ops Slices Ufunc);
-my @DIRS_CORE = qw(Primitive MatrixOps);
+my @BUILD_CORE = qw(Bad Core Math Ops Primitive Slices Ufunc);
+my @DIRS_CORE = qw(MatrixOps);
 # the modules needed in "use PDL"
 my @DIRS_BASIC = qw(IO-Misc IO-Pnm Lib-Compression Lib-FFT Lib-ImageND Lib-ImageRGB);
 WriteMakefile(

diff --git a/Basic/Primitive/.gitignore b/Basic/Primitive/.gitignore
diff --git a/Basic/Primitive/Makefile.PL b/Basic/Primitive/Makefile.PL
diff --git a/Basic/Primitive/xoshiro256plus.c → Basic/lib/PDL/Primitive-xoshiro256plus.c b/Basic/Primitive/xoshiro256plus.c → Basic/lib/PDL/Primitive-xoshiro256plus.c
diff --git a/Basic/Primitive/primitive.pd → Basic/lib/PDL/Primitive.pd b/Basic/Primitive/primitive.pd → Basic/lib/PDL/Primitive.pd
@@ -5,6 +5,10 @@ my $F = [map $_->ppsym, grep $_->real && !$_->integer, types()];
 my $AF = [map $_->ppsym, grep !$_->integer, types];
 $AF = [(grep $_ ne 'D', @$AF), 'D']; # so defaults to D if non-float given
 
+{ # pass info back to Makefile.PL
+$PDL::Core::Dev::EXTRAS{$::PDLMOD}{OBJECT} .= " $::PDLBASE-xoshiro256plus\$(OBJ_EXT)";
+}
+
 pp_addpm({At=>'Top'},<<'EOD');
 use strict;
 use warnings;

diff --git a/MANIFEST b/MANIFEST
@@ -149,6 +149,8 @@ Basic/lib/PDL/PP/Dims.pm
 Basic/lib/PDL/PP/PDLCode.pm
 Basic/lib/PDL/PP/PdlParObj.pm
 Basic/lib/PDL/PP/Signature.pm
+Basic/lib/PDL/Primitive-xoshiro256plus.c
+Basic/lib/PDL/Primitive.pd
 Basic/lib/PDL/QuickStart.pod
 Basic/lib/PDL/Reduce.pm
 Basic/lib/PDL/Scilab.pod
@@ -174,9 +176,6 @@ Basic/MatrixOps/simq.c
 Basic/MatrixOps/sslib.c
 Basic/MatrixOps/sslib.h
 Basic/MatrixOps/svd.c
-Basic/Primitive/Makefile.PL
-Basic/Primitive/primitive.pd
-Basic/Primitive/xoshiro256plus.c
 Basic/script/pdl.c
 Basic/script/pdldoc
 Basic/script/perldl

diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
@@ -42,6 +42,7 @@ RCS
 ^Basic/lib/PDL/Bad(\.(pm|xs|c)$|-pp-)
 ^Basic/lib/PDL/Math(\.(pm|xs|c)$|-pp-)
 ^Basic/lib/PDL/Ops(\.(pm|xs|c)$|-pp-)
+^Basic/lib/PDL/Primitive(\.(pm|xs|c)$|-pp-)
 ^Basic/lib/PDL/Slices(\.(pm|xs|c)$|-pp-)
 ^Basic/lib/PDL/Ufunc(\.(pm|xs|c)$|-pp-)
 ^Basic/lib/PDL/Core\.c$
@@ -55,7 +56,6 @@ RCS
 ^Basic/Lib-ImageRGB/ImageRGB\..*
 ^Basic/Lib-Transform/Transform\..*
 ^Basic/MatrixOps/MatrixOps\..*
-^Basic/Primitive/Primitive\..*
 ^Basic/script/pdl$
 ^Graphics/TriD/OpenGLQ/OpenGLQ\.*
 ^Graphics/TriD/Rout/Rout\.*