GNOME.org
 

[gimp-perl] Change to XSMULTI

commit f64ae875dce37a797bad6757c5a1742b561077b0
Author: Ed J <edj src gnome org>
Date:   Thu Jan 8 19:29:52 2015 +0000

    Change to XSMULTI

 .gitignore                          |    8 +---
 Gimp/Makefile.PL                    |   15 --------
 MANIFEST                            |   65 ++++++++++++++++------------------
 Makefile.PL                         |   23 ++++++++----
 Net/Makefile.PL                     |   15 --------
 UI/Makefile.PL                      |   15 --------
 examples/Makefile.PL                |    4 +-
 Gimp.pm => lib/Gimp.pm              |    0
 Gimp.xs => lib/Gimp.xs              |    0
 {Gimp => lib/Gimp}/ColorDB.pm       |    0
 {Gimp => lib/Gimp}/Constant.pm      |    0
 {Gimp => lib/Gimp}/Data.pm          |    0
 {Gimp => lib/Gimp}/Extension.pm     |    0
 {Gimp => lib/Gimp}/Fu.pm            |    0
 {Gimp => lib/Gimp}/Lib.pm           |    0
 {Gimp => lib/Gimp}/Lib.xs           |    2 +-
 {Net => lib/Gimp}/Net.pm            |    0
 {Net => lib/Gimp}/Net.xs            |    2 +-
 {Gimp => lib/Gimp}/PixelRgn.pod     |    0
 {Gimp => lib/Gimp}/Pod.pm           |    0
 {UI => lib/Gimp}/UI.pm              |    0
 {UI => lib/Gimp}/UI.xs              |    0
 {Gimp => lib/Gimp}/Util.pm          |    0
 gimp-perl.h => lib/Gimp/gimp-perl.h |    0
 gppport.h => lib/Gimp/gppport.h     |    0
 perl-intl.h => lib/Gimp/perl-intl.h |    0
 logo.xpm => old-logo.xpm            |    0
 27 files changed, 53 insertions(+), 96 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 788ee36..62190a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,9 +8,5 @@ blib/
 pm_to_blib
 Makefile
 Makefile.old
-Gimp.c
-Gimp/Config.pm
-Gimp/IFiles.pm
-Gimp/Lib.c
-Net/Net.c
-UI/UI.c
+lib/Gimp/Install/Files.pm
+*.c
diff --git a/MANIFEST b/MANIFEST
index 8977add..9e2baaa 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,36 +1,18 @@
 AUTHORS
-ChangeLog
 COPYING
 COPYING.Artistic
 COPYING.GNU
-Makefile.PL
+ChangeLog
 MAINTAINERS
 MANIFEST
+Makefile.PL
 README
 README.win32
 TODO
-Gimp/ColorDB.pm
-Gimp/Constant.pm
-Gimp/Data.pm
-Gimp/Extension.pm
-Gimp/Fu.pm
-Gimp/Lib.pm
-Gimp/Lib.xs
-Gimp/Makefile.PL
-Gimp/PixelRgn.pod
-Gimp/Pod.pm
-Gimp/Util.pm
-Gimp.pm
-Gimp.xs
-Net/Makefile.PL
-Net/Net.pm
-Net/Net.xs
-UI/Makefile.PL
-UI/UI.pm
-UI/UI.xs
 examples/Makefile.PL
-examples/Perl-Server
 examples/Perl-Console
+examples/Perl-Server
+examples/README
 examples/animate_cells
 examples/autosave2
 examples/billboard
@@ -72,7 +54,6 @@ examples/pixelmap
 examples/prep4gif
 examples/randomart1
 examples/randomblends
-examples/README
 examples/redeye
 examples/registry_viewer
 examples/repdup
@@ -92,11 +73,31 @@ examples/xachlego
 examples/xachshadow
 examples/xachvision
 examples/yinyang
-gimp-perl.h
-gppport.h
-perl-intl.h
-po/ca.po
+lib/Gimp.pm
+lib/Gimp.xs
+lib/Gimp/ColorDB.pm
+lib/Gimp/Constant.pm
+lib/Gimp/Data.pm
+lib/Gimp/Extension.pm
+lib/Gimp/Fu.pm
+lib/Gimp/Lib.pm
+lib/Gimp/Lib.xs
+lib/Gimp/Net.pm
+lib/Gimp/Net.xs
+lib/Gimp/PixelRgn.pod
+lib/Gimp/Pod.pm
+lib/Gimp/UI.pm
+lib/Gimp/UI.xs
+lib/Gimp/Util.pm
+lib/Gimp/gimp-perl.h
+lib/Gimp/gppport.h
+lib/Gimp/perl-intl.h
+typemap
 po/ChangeLog
+po/Makefile.PL
+po/Makefile.in.in
+po/POTFILES.in
+po/ca.po
 po/cs.po
 po/da.po
 po/de.po
@@ -112,15 +113,12 @@ po/it.po
 po/ja.po
 po/ko.po
 po/makefile.cygwin
-po/Makefile.in.in
-po/Makefile.PL
 po/nl.po
 po/no.po
 po/oc.po
 po/pl.po
-po/POTFILES.in
-po/pt_BR.po
 po/pt.po
+po/pt_BR.po
 po/pxgettext
 po/ro.po
 po/ru.po
@@ -145,10 +143,9 @@ t/pdl.t
 t/perlplugin.t
 t/run.t
 t/supplied.t
-typemap
 utils/embedxpm
+utils/find-deprecated-procs.pl
 utils/gimpdoc
+utils/list-pdb-deprecations.pl
 utils/scm2perl
 utils/xcftopnm
-utils/find-deprecated-procs.pl
-utils/list-pdb-deprecations.pl
diff --git a/Makefile.PL b/Makefile.PL
index f409842..28b5872 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -17,20 +17,26 @@ tags: .
 
 # set \$VERSION in all modules
 setver:
-       $(PERL) -pi -e 's/^(\s*(?:our)?\s*\$$VERSION\s*=\s*)[^a-z]*;/$${1}"$(VERSION)";/' Gimp/*.pm UI/*.pm 
Net/*.pm
+       $(PERL) -pi -e 's/^(\s*(?:our)?\s*\$$VERSION\s*=\s*)[^a-z]*;/$${1}"$(VERSION)";/' lib/Gimp/*.pm
 
 EOF
 }
 
 my $pkg = ExtUtils::Depends->new(qw(Gimp Alien::Gimp Gtk2 PDL));
-$pkg->add_pm(map { ($_ => "\$(INST_LIB)/$_") } qw(Gimp.pm));
-$pkg->add_typemaps("typemap");
-$pkg->save_config('Gimp/IFiles.pm');
+my $IDIR = 'lib/Gimp/Install';
+my $IFILES = "$IDIR/Files.pm";
+mkdir $IDIR unless -d $IDIR;
+$pkg->save_config($IFILES);
+# reinit so no PM which breaks XSMULTI
+$pkg = ExtUtils::Depends->new(qw(Gimp Alien::Gimp Gtk2 PDL));
+# don't know why need -I here, works in EUMM "multi" test without
+$pkg->set_inc(q{-Ilib/Gimp -Ddatadir='""'});
 
 WriteMakefile(
   NAME => 'Gimp',
-  VERSION_FROM => 'Gimp.pm',
+  VERSION_FROM => 'lib/Gimp.pm',
   dist => { PREOP => 'make setver && chmod -R u=rwX,go=rX . ;' },
+  XSMULTI => 1,
   MIN_PERL_VERSION => '5.014001',
   PREREQ_PM    => {
     Gtk2               => 1.0,
@@ -44,6 +50,9 @@ WriteMakefile(
     Web::Scraper       => 0,
     HTML::Entities     => 0,
   },
+  CONFIGURE_REQUIRES   => {
+    'ExtUtils::MakeMaker'      => '7.05_06', # XSMULTI
+  },
   TEST_REQUIRES        => {
     'Test::More'       => '0.88',
   },
@@ -57,8 +66,8 @@ WriteMakefile(
       },
     },
   },
-  DIR  => [ qw/Gimp Net UI examples/ ],
+  DIR  => [ qw/examples/ ], # exclude po
   EXE_FILES => [ map { "utils/$_" } qw(gimpdoc xcftopnm embedxpm scm2perl) ],
-  clean        => { FILES => "Gimp/IFiles.pm" },
+  clean        => { FILES => $IFILES },
   $pkg->get_makefile_vars,
 );
diff --git a/examples/Makefile.PL b/examples/Makefile.PL
index b2390ed..747bc15 100644
--- a/examples/Makefile.PL
+++ b/examples/Makefile.PL
@@ -86,7 +86,7 @@ GIMP_PLUGINS = $plugindir
 
 install :: install-plugins
 
-pure_all :: pure_plugins
+pure_nolink :: pure_plugins
 
 pure_plugins : @{[ map { "\$(INST_PLUGINS)/".basename($_) } @pins ]}
 
@@ -100,7 +100,7 @@ EOF
 
 WriteMakefile(
     'NAME'     => 'Gimp',
-    'VERSION_FROM' => '../Gimp.pm',
+    'VERSION_FROM' => '../lib/Gimp.pm',
     NO_MYMETA  => 1,
     NO_META    => 1,
     macro      => { GTINSTALL => Alien::Gimp->gimptool . " --install-admin-bin" },
diff --git a/Gimp.pm b/lib/Gimp.pm
similarity index 100%
rename from Gimp.pm
rename to lib/Gimp.pm
diff --git a/Gimp.xs b/lib/Gimp.xs
similarity index 100%
rename from Gimp.xs
rename to lib/Gimp.xs
diff --git a/Gimp/ColorDB.pm b/lib/Gimp/ColorDB.pm
similarity index 100%
rename from Gimp/ColorDB.pm
rename to lib/Gimp/ColorDB.pm
diff --git a/Gimp/Constant.pm b/lib/Gimp/Constant.pm
similarity index 100%
rename from Gimp/Constant.pm
rename to lib/Gimp/Constant.pm
diff --git a/Gimp/Data.pm b/lib/Gimp/Data.pm
similarity index 100%
rename from Gimp/Data.pm
rename to lib/Gimp/Data.pm
diff --git a/Gimp/Extension.pm b/lib/Gimp/Extension.pm
similarity index 100%
rename from Gimp/Extension.pm
rename to lib/Gimp/Extension.pm
diff --git a/Gimp/Fu.pm b/lib/Gimp/Fu.pm
similarity index 100%
rename from Gimp/Fu.pm
rename to lib/Gimp/Fu.pm
diff --git a/Gimp/Lib.pm b/lib/Gimp/Lib.pm
similarity index 100%
rename from Gimp/Lib.pm
rename to lib/Gimp/Lib.pm
diff --git a/Gimp/Lib.xs b/lib/Gimp/Lib.xs
similarity index 99%
rename from Gimp/Lib.xs
rename to lib/Gimp/Lib.xs
index 31435dc..8171d08 100644
--- a/Gimp/Lib.xs
+++ b/lib/Gimp/Lib.xs
@@ -20,7 +20,7 @@
 #define pTHX_
 #endif
 
-#include "../perl-intl.h"
+#include "perl-intl.h"
 
 /* dirty is used in gimp.h AND in perl < 5.005 or with PERL_POLLUTE.  */
 #ifdef dirty
diff --git a/Net/Net.pm b/lib/Gimp/Net.pm
similarity index 100%
rename from Net/Net.pm
rename to lib/Gimp/Net.pm
diff --git a/Net/Net.xs b/lib/Gimp/Net.xs
similarity index 99%
rename from Net/Net.xs
rename to lib/Gimp/Net.xs
index 30c9f74..5c740df 100644
--- a/Net/Net.xs
+++ b/lib/Gimp/Net.xs
@@ -11,7 +11,7 @@
 # define printf PerlIO_stdoutf
 #endif
 
-#include "../perl-intl.h"
+#include "perl-intl.h"
 
 #define is_dynamic(sv)                         \
        (strEQ ((sv), "Gimp::Tile")             \
diff --git a/Gimp/PixelRgn.pod b/lib/Gimp/PixelRgn.pod
similarity index 100%
rename from Gimp/PixelRgn.pod
rename to lib/Gimp/PixelRgn.pod
diff --git a/Gimp/Pod.pm b/lib/Gimp/Pod.pm
similarity index 100%
rename from Gimp/Pod.pm
rename to lib/Gimp/Pod.pm
diff --git a/UI/UI.pm b/lib/Gimp/UI.pm
similarity index 100%
rename from UI/UI.pm
rename to lib/Gimp/UI.pm
diff --git a/UI/UI.xs b/lib/Gimp/UI.xs
similarity index 100%
rename from UI/UI.xs
rename to lib/Gimp/UI.xs
diff --git a/Gimp/Util.pm b/lib/Gimp/Util.pm
similarity index 100%
rename from Gimp/Util.pm
rename to lib/Gimp/Util.pm
diff --git a/gimp-perl.h b/lib/Gimp/gimp-perl.h
similarity index 100%
rename from gimp-perl.h
rename to lib/Gimp/gimp-perl.h
diff --git a/gppport.h b/lib/Gimp/gppport.h
similarity index 100%
rename from gppport.h
rename to lib/Gimp/gppport.h
diff --git a/perl-intl.h b/lib/Gimp/perl-intl.h
similarity index 100%
rename from perl-intl.h
rename to lib/Gimp/perl-intl.h
diff --git a/logo.xpm b/old-logo.xpm
similarity index 100%
rename from logo.xpm
rename to old-logo.xpm
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]