GNOME.org
 

[perl-Gtk2] Move some files to standard locations

commit 2357f59b64034ed9790e9414cece381d2a61c948
Author: Torsten SchÃnfeld <kaffeetisch gmx de>
Date:   Fri Oct 7 21:48:24 2011 +0200

    Move some files to standard locations

 MANIFEST                          |   18 +++++++-------
 Makefile.PL                       |   47 +++++++++++++++++++------------------
 Gtk2.pm => lib/Gtk2.pm            |    0
 CodeGen.pm => lib/Gtk2/CodeGen.pm |    0
 {pm => lib/Gtk2}/Helper.pm        |    0
 {pm => lib/Gtk2}/Pango.pm         |    0
 {pm => lib/Gtk2}/SimpleList.pm    |    0
 {pm => lib/Gtk2}/SimpleMenu.pm    |    0
 {pm => lib/Gtk2}/TestHelper.pm    |    0
 api.pod => lib/Gtk2/api.pod       |    0
 devel.pod => lib/Gtk2/devel.pod   |    0
 11 files changed, 33 insertions(+), 32 deletions(-)
---
diff --git a/MANIFEST b/MANIFEST
index 92cc9b0..d77e3d0 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,11 +1,8 @@
-api.pod
 AUTHORS
 ChangeLog.pre-git
-CodeGen.pm
 constants-2.0
 constants-2.18
 copyright.pod
-devel.pod
 doctypes
 examples/accel_groups.pl
 examples/adding_stock_icons.pl
@@ -86,9 +83,17 @@ gtk-demo/tree_store.pl
 gtk-demo/ui_manager.pl
 gtk.typemap
 Gtk2.exports
-Gtk2.pm
 gtk2perl-private.h
 gtk2perl.h
+lib/Gtk2.pm
+lib/Gtk2/api.pod
+lib/Gtk2/CodeGen.pm
+lib/Gtk2/devel.pod
+lib/Gtk2/Helper.pm
+lib/Gtk2/Pango.pm
+lib/Gtk2/SimpleList.pm
+lib/Gtk2/SimpleMenu.pm
+lib/Gtk2/TestHelper.pm
 LICENSE
 Makefile.PL
 MANIFEST
@@ -114,11 +119,6 @@ maps_pango-1.8
 NEWS
 perl-Gtk2.doap
 perl-Gtk2.spec.in
-pm/Helper.pm
-pm/Pango.pm
-pm/SimpleList.pm
-pm/SimpleMenu.pm
-pm/TestHelper.pm
 README
 t/00.Gtk2.t
 t/01.GtkWindow.t
diff --git a/Makefile.PL b/Makefile.PL
index 02d8921..659b29b 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -62,8 +62,9 @@ unless (eval "use ExtUtils::Depends '$build_reqs{'perl-ExtUtils-Depends'}';"
 	exit 1; # not reached
 }
 
-require './CodeGen.pm'; # other modules should 'use Gtk2::CodeGen;' --
-                        # we can't because it's not installed yet.
+# other modules should 'use Gtk2::CodeGen;' -- we can't because it's not
+# installed yet.
+require './lib/Gtk2/CodeGen.pm';
 
 # all the generated stuff will go into this subdir...
 mkdir 'build', 0777;
@@ -145,28 +146,28 @@ ExtUtils::PkgConfig->write_version_macros(
 # install paths for the modules and man files by hand.
 #
 our %pm_files = (
-	'Gtk2.pm'          => '$(INST_LIBDIR)/Gtk2.pm',
-	'build/Keysyms.pm' => '$(INST_LIBDIR)/Gtk2/Gdk/Keysyms.pm',
-	'CodeGen.pm'       => '$(INST_LIBDIR)/Gtk2/CodeGen.pm',
-	'pm/Helper.pm'     => '$(INST_LIBDIR)/Gtk2/Helper.pm',
-	'pm/Pango.pm'      => '$(INST_LIBDIR)/Gtk2/Pango.pm',
-	'pm/SimpleList.pm' => '$(INST_LIBDIR)/Gtk2/SimpleList.pm',
-	'pm/SimpleMenu.pm' => '$(INST_LIBDIR)/Gtk2/SimpleMenu.pm',
-	'pm/TestHelper.pm' => '$(INST_LIBDIR)/Gtk2/TestHelper.pm',
-	'api.pod'          => '$(INST_LIBDIR)/Gtk2/api.pod',
-	'devel.pod'        => '$(INST_LIBDIR)/Gtk2/devel.pod',
+	'lib/Gtk2.pm'            => '$(INST_LIBDIR)/Gtk2.pm',
+	'build/Keysyms.pm'       => '$(INST_LIBDIR)/Gtk2/Gdk/Keysyms.pm',
+	'lib/Gtk2/CodeGen.pm'    => '$(INST_LIBDIR)/Gtk2/CodeGen.pm',
+	'lib/Gtk2/Helper.pm'     => '$(INST_LIBDIR)/Gtk2/Helper.pm',
+	'lib/Gtk2/Pango.pm'      => '$(INST_LIBDIR)/Gtk2/Pango.pm',
+	'lib/Gtk2/SimpleList.pm' => '$(INST_LIBDIR)/Gtk2/SimpleList.pm',
+	'lib/Gtk2/SimpleMenu.pm' => '$(INST_LIBDIR)/Gtk2/SimpleMenu.pm',
+	'lib/Gtk2/TestHelper.pm' => '$(INST_LIBDIR)/Gtk2/TestHelper.pm',
+	'lib/Gtk2/api.pod'       => '$(INST_LIBDIR)/Gtk2/api.pod',
+	'lib/Gtk2/devel.pod'     => '$(INST_LIBDIR)/Gtk2/devel.pod',
 );
 our %pod_files = (
-	'Gtk2.pm'          => '$(INST_MAN3DIR)/Gtk2.$(MAN3EXT)',
+	'lib/Gtk2.pm'            => '$(INST_MAN3DIR)/Gtk2.$(MAN3EXT)',
 	# Keysyms is generated by Makefile.PL.
-	'build/Keysyms.pm' => '$(INST_MAN3DIR)/Gtk2::Gdk::Keysyms.$(MAN3EXT)',
-	'CodeGen.pm'       => '$(INST_MAN3DIR)/Gtk2::CodeGen.$(MAN3EXT)',
-	'pm/Helper.pm'     => '$(INST_MAN3DIR)/Gtk2::Helper.$(MAN3EXT)',
-	'pm/Pango.pm'      => '$(INST_MAN3DIR)/Gtk2::Pango.$(MAN3EXT)',
-	'pm/SimpleList.pm' => '$(INST_MAN3DIR)/Gtk2::SimpleList.$(MAN3EXT)',
-	'pm/SimpleMenu.pm' => '$(INST_MAN3DIR)/Gtk2::SimpleMenu.$(MAN3EXT)',
-	'api.pod'          => '$(INST_MAN3DIR)/Gtk2::api.$(MAN3EXT)',
-	'devel.pod'        => '$(INST_MAN3DIR)/Gtk2::devel.$(MAN3EXT)',
+	'build/Keysyms.pm'       => '$(INST_MAN3DIR)/Gtk2::Gdk::Keysyms.$(MAN3EXT)',
+	'lib/Gtk2/CodeGen.pm'    => '$(INST_MAN3DIR)/Gtk2::CodeGen.$(MAN3EXT)',
+	'lib/Gtk2/Helper.pm'     => '$(INST_MAN3DIR)/Gtk2::Helper.$(MAN3EXT)',
+	'lib/Gtk2/Pango.pm'      => '$(INST_MAN3DIR)/Gtk2::Pango.$(MAN3EXT)',
+	'lib/Gtk2/SimpleList.pm' => '$(INST_MAN3DIR)/Gtk2::SimpleList.$(MAN3EXT)',
+	'lib/Gtk2/SimpleMenu.pm' => '$(INST_MAN3DIR)/Gtk2::SimpleMenu.$(MAN3EXT)',
+	'lib/Gtk2/api.pod'       => '$(INST_MAN3DIR)/Gtk2::api.$(MAN3EXT)',
+	'lib/Gtk2/devel.pod'     => '$(INST_MAN3DIR)/Gtk2::devel.$(MAN3EXT)',
 	# enums.pod is generated by rules we add to the postamble, below.
 	# it is generated straight into blib to avoid dependency problems.
 	'$(INST_LIB)/$(FULLEXT)/enums.pod'
@@ -270,8 +271,8 @@ require 'Gtk2.exports';
 
 WriteMakefile(
     NAME          => 'Gtk2',
-    VERSION_FROM  => 'Gtk2.pm', # finds $VERSION
-    ABSTRACT_FROM => 'Gtk2.pm', # retrieve abstract from module
+    VERSION_FROM  => 'lib/Gtk2.pm', # finds $VERSION
+    ABSTRACT_FROM => 'lib/Gtk2.pm', # retrieve abstract from module
     PREREQ_PM     => \%PREREQ_PM,
     XSPROTOARG    => '-noprototypes',
     MAN3PODS      => \%pod_files,
diff --git a/Gtk2.pm b/lib/Gtk2.pm
similarity index 100%
rename from Gtk2.pm
rename to lib/Gtk2.pm
diff --git a/CodeGen.pm b/lib/Gtk2/CodeGen.pm
similarity index 100%
rename from CodeGen.pm
rename to lib/Gtk2/CodeGen.pm
diff --git a/pm/Helper.pm b/lib/Gtk2/Helper.pm
similarity index 100%
rename from pm/Helper.pm
rename to lib/Gtk2/Helper.pm
diff --git a/pm/Pango.pm b/lib/Gtk2/Pango.pm
similarity index 100%
rename from pm/Pango.pm
rename to lib/Gtk2/Pango.pm
diff --git a/pm/SimpleList.pm b/lib/Gtk2/SimpleList.pm
similarity index 100%
rename from pm/SimpleList.pm
rename to lib/Gtk2/SimpleList.pm
diff --git a/pm/SimpleMenu.pm b/lib/Gtk2/SimpleMenu.pm
similarity index 100%
rename from pm/SimpleMenu.pm
rename to lib/Gtk2/SimpleMenu.pm
diff --git a/pm/TestHelper.pm b/lib/Gtk2/TestHelper.pm
similarity index 100%
rename from pm/TestHelper.pm
rename to lib/Gtk2/TestHelper.pm
diff --git a/api.pod b/lib/Gtk2/api.pod
similarity index 100%
rename from api.pod
rename to lib/Gtk2/api.pod
diff --git a/devel.pod b/lib/Gtk2/devel.pod
similarity index 100%
rename from devel.pod
rename to lib/Gtk2/devel.pod
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]