Skip to content

Commit

Permalink
PDL::ImageND switch to new lib/*.pd scheme
Browse files Browse the repository at this point in the history
  • Loading branch information
mohawk2 committed Nov 20, 2024
1 parent 3c01655 commit c072729
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 43 deletions.
3 changes: 3 additions & 0 deletions Basic/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ lib/PDL/IO/Misc.xs
lib/PDL/IO/Pnm.c
lib/PDL/IO/Pnm.pm
lib/PDL/IO/Pnm.xs
lib/PDL/ImageND.c
lib/PDL/ImageND.pm
lib/PDL/ImageND.xs
lib/PDL/ImageRGB.c
lib/PDL/ImageRGB.pm
lib/PDL/ImageRGB.xs
Expand Down
3 changes: 0 additions & 3 deletions Basic/Lib-ImageND/.gitignore

This file was deleted.

11 changes: 0 additions & 11 deletions Basic/Lib-ImageND/Makefile.PL

This file was deleted.

30 changes: 5 additions & 25 deletions Basic/Makefile.PL
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ EOT
io-misc
);
$text .= <<EOF;
basictest : basicdtest
basictest : basic pm_to_blib core
\$(FULLPERLRUN) "$::Config{bin}/prove" -I ../blib/lib -I ../blib/arch $basictest
coretest : core
coretest : core pm_to_blib
\$(FULLPERLRUN) "$::Config{bin}/prove" -I ../blib/lib -I ../blib/arch $coretest
update-ppport:
\$(PERLRUN) -MDevel::PPPort -e'Devel::PPPort::WriteFile' && \$(PERLRUN) lib/PDL/Core/ppport.h --strip
Expand Down Expand Up @@ -73,12 +73,10 @@ 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/Misc IO/Pnm ImageRGB);
my @DIRS_BASIC = qw(Lib-ImageND);
my @BUILD_BASIC = qw(Compression FFT IO/Misc IO/Pnm ImageND ImageRGB);
WriteMakefile(
NAME => 'PDL',
VERSION_FROM => 'lib/PDL/Core.pm',
DIR => [@DIRS_BASIC],
EXE_FILES => \@exe_files,
XSMULTI => 1,
XSBUILD => {
Expand Down Expand Up @@ -139,26 +137,8 @@ sub coretarget {
# @prereqs are named targets - undef=[]
# all a left's rights are made concurrently, no sequence - list ALL prereqs
my @left2rights = (
[core => [ map qq{build_\$(LINKTYPE)_PDL_}.(s#/#_#gr), @BUILD_CORE ]],
[
basic => [
(map qq{build_\$(LINKTYPE)_PDL_}.(s#/#_#gr), @BUILD_BASIC),
map [
[$_],
[ qw(pm_to_blib linkext) ],
[ 'core' ],
], @DIRS_BASIC,
]
],
[
basicdtest => [
map [
[$_],
[ 'test' ],
[ 'basic' ],
], @DIRS_BASIC,
]
],
[core => [ map qq{build_\$(LINKTYPE)_PDL_}.(s#/#_#gr), @BUILD_CORE ]],
[basic => [(map qq{build_\$(LINKTYPE)_PDL_}.(s#/#_#gr), @BUILD_BASIC)]],
);
join "\n", map flatten_parallel_target($self, $_), @left2rights;
}
Expand Down
File renamed without changes.
File renamed without changes.
5 changes: 2 additions & 3 deletions MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -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/Lib-ImageND/imagend.pd
Basic/Lib-ImageND/Makefile.PL
Basic/Lib-ImageND/t/imagend.t
Basic/lib/Inline/Pdlpp.pm
Basic/lib/PDL.pm
Basic/lib/PDL/API.pod
Expand Down Expand Up @@ -68,6 +65,7 @@ Basic/lib/PDL/FFT.pd
Basic/lib/PDL/FFT/fftn.c
Basic/lib/PDL/FFT/fftn.h
Basic/lib/PDL/Graphics.pod
Basic/lib/PDL/ImageND.pd
Basic/lib/PDL/ImageRGB.pd
Basic/lib/PDL/ImageRGB/pdlppm.h
Basic/lib/PDL/ImageRGB/ppm_quant.c
Expand Down Expand Up @@ -186,6 +184,7 @@ Basic/t/flexraw-iotypes.t
Basic/t/flexraw.t
Basic/t/flexraw_fortran.t
Basic/t/func.pdl
Basic/t/imagend.t
Basic/t/imagergb.t
Basic/t/inline-with.t
Basic/t/inlinepdlpp.t
Expand Down
2 changes: 1 addition & 1 deletion MANIFEST.SKIP
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ RCS
^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/ImageND(\.(pm|xs|c)$|-pp-)
^Basic/lib/PDL/ImageRGB(\.(pm|xs|c)$|-pp-)
^Basic/lib/PDL/Math(\.(pm|xs|c)$|-pp-)
^Basic/lib/PDL/MatrixOps(\.(pm|xs|c)$|-pp-)
Expand All @@ -55,7 +56,6 @@ RCS
^Basic/lib/PDL/Core\.c$
^Basic/lib/PDL/Core/pdl\.h$
^Basic/IO-Storable/Storable\..*
^Basic/Lib-ImageND/ImageND\..*
^Basic/script/pdl$
^Graphics/TriD/OpenGLQ/OpenGLQ\.*
^Graphics/TriD/Rout/Rout\.*
Expand Down

0 comments on commit c072729

Please sign in to comment.