Skip to content

Commit

Permalink
Merge branch 'master' into dont-reload
Browse files Browse the repository at this point in the history
  • Loading branch information
brummett committed Jan 24, 2011
2 parents be6b01a + 7161da0 commit 21ffce2
Show file tree
Hide file tree
Showing 266 changed files with 3,634 additions and 3,612 deletions.
29 changes: 24 additions & 5 deletions Build.PL
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,35 @@ use warnings FATAL => 'all';
use strict;
use Module::Build;

my $build = Module::Build->new(
my $subclass = Module::Build->subclass(
class_name => 'UR::ModuleBuildSelf',
code => q{
sub ACTION_docs {
# ensure docs get man pages and html
my $self = shift;
$self->depends_on('code');
$self->depends_on('manpages', 'html');
}
sub man1page_name {
# without this we have "man ur-init.pod" instead of "man ur-init"
my ($self, $file) = @_;
$file =~ s/.pod$//;
return $self->SUPER::man1page_name($file);
}
}
);

my $build = $subclass->new(
module_name => 'UR',
license => 'perl',
requires => {
# known bugs with Perl 5.6
perl => 'v5.8.7',

# pure Perl
'Class::Autouse' => '2.0',
'Clone::PP' => '1.02',
'Carp' => '',
'Sys::Hostname' => '1.11',
'File::Basename' => '2.73',
Expand Down Expand Up @@ -54,6 +75,7 @@ my $build = Module::Build->new(
cpan_client => 'cpanm',
script_files => [ 'bin/ur' ],
test_files => [qw|t/*.t t/*/*.t t/*/*/*.t t/*/*/*/*.t|],
bindoc_dirs => ['pod'],
tap_harness_args => {
'jobs' => 8,
'rules' => {
Expand All @@ -63,7 +85,7 @@ my $build = Module::Build->new(
#{ seq => '../lib/CPANPLUS/*' },
#{ seq => '../lib/ExtUtils/t/*' },
#'*'
{ seq => 't/URT/t/42*' },
{ seq => '../t/URT/t/42*' },
'*'
]
},
Expand All @@ -76,7 +98,4 @@ foreach my $metadb_type ( qw(sqlite3 sqlite3n sqlite3-dump sqlite3n-dump sqlite3

$build->create_build_script;

# These were in Makefile.PL, but have no equivalent here yet:
# all_from 'lib/UR.pm'
# build_requires 'Test::More' => '0.62';

7 changes: 7 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
Revision history for UR

0.28 2011-01-23
fix to the installer which caused a failure during docs generation
improvements to man page generation

0.27 2011-01-22
updated build process autogenerates man pages

0.26 2011-01-16
yet another refactoring to ensure VERSION appears on all modules
fixes for tests which fail only in the install harness
Expand Down
53 changes: 42 additions & 11 deletions MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ debian/rules
debian/watch
INSTALL
lib/above.pm
lib/Class/Autouse_1_99_02.pm
lib/Class/Autouse_1_99_02.README
lib/Command.pm
lib/Command/DynamicSubCommands.pm
lib/Command/Test.pm
Expand Down Expand Up @@ -109,6 +107,7 @@ lib/UR/Env/UR_STACK_DUMP_ON_DIE.pm
lib/UR/Env/UR_STACK_DUMP_ON_WARN.pm
lib/UR/Env/UR_TEST_FILLDB.pm
lib/UR/Env/UR_TEST_QUIET.pm
lib/UR/Env/UR_USE_ANY.pm
lib/UR/Env/UR_USE_DUMMY_AUTOGENERATED_IDS.pm
lib/UR/Env/UR_USED_LIBS.pm
lib/UR/Env/UR_USED_MODS.pm
Expand All @@ -122,11 +121,13 @@ lib/UR/Manual/SchemaDesign.pod
lib/UR/Manual/Tutorial.pod
lib/UR/Manual/UR_Presentation.pdf
lib/UR/ModuleBase.pm
lib/UR/ModuleBuild.pm
lib/UR/ModuleConfig.pm
lib/UR/ModuleLoader.pm
lib/UR/Namespace.pm
lib/UR/Namespace/Command.pm
lib/UR/Namespace/Command.pm.opts
lib/UR/Namespace/Command/Base.pm
lib/UR/Namespace/Command/Define.pm
lib/UR/Namespace/Command/Define/Class.pm
lib/UR/Namespace/Command/Define/Datasource.pm
Expand All @@ -142,6 +143,7 @@ lib/UR/Namespace/Command/Define/Namespace.pm
lib/UR/Namespace/Command/Describe.pm
lib/UR/Namespace/Command/Init.pm
lib/UR/Namespace/Command/List.pm

lib/UR/Namespace/Command/List/Classes.pm
lib/UR/Namespace/Command/List/Modules.pm
lib/UR/Namespace/Command/List/Objects.pm
Expand Down Expand Up @@ -181,6 +183,8 @@ lib/UR/Object.pm
lib/UR/Object/Accessorized.pm
lib/UR/Object/Command/FetchAndDo.pm
lib/UR/Object/Command/List.pm
lib/UR/Object/Command/List.pod
lib/UR/Object/Command/List/Style.pm
lib/UR/Object/Ghost.pm
lib/UR/Object/Index.pm
lib/UR/Object/Iterator.pm
Expand All @@ -202,14 +206,7 @@ lib/UR/Object/Type/Initializer.pod
lib/UR/Object/Type/InternalAPI.pm
lib/UR/Object/Type/ModuleWriter.pm
lib/UR/Object/Type/View/Default/Text.pm
lib/UR/Object/Type/View/Default/Umlet.pm
lib/UR/Object/Type/View/Default/Xml.pm
lib/UR/Object/Umlet.pm
lib/UR/Object/Umlet/Class.pm
lib/UR/Object/Umlet/Diagram.pm
lib/UR/Object/Umlet/Other.pm
lib/UR/Object/Umlet/PictureElement.pm
lib/UR/Object/Umlet/Relation.pm
lib/UR/Object/Value.pm
lib/UR/Object/View.pm
lib/UR/Object/View/Aspect.pm
Expand All @@ -223,7 +220,6 @@ lib/UR/Object/View/Default/Xsl.pm
lib/UR/Object/View/Lister/Text.pm
lib/UR/Object/View/Toolkit.pm
lib/UR/Object/View/Toolkit/Text.pm
lib/UR/Object/View/Toolkit/Umlet.pm
lib/UR/ObjectDeprecated.pm
lib/UR/ObjectV001removed.pm
lib/UR/ObjectV04removed.pm
Expand All @@ -237,7 +233,6 @@ lib/UR/Service/RPC/Message.pm
lib/UR/Service/RPC/Server.pm
lib/UR/Service/RPC/TcpConnectionListener.pm
lib/UR/Service/urinterface.js
lib/UR/Service/XMLCommandExecutor.pm
lib/UR/Singleton.pm
lib/UR/Test.pm
lib/UR/Time.pm
Expand Down Expand Up @@ -459,3 +454,39 @@ t/Vending/vend
t/Vending/vend_interactive.pl
t/Vending/Vocabulary.pm
META.yml
pod/ur-define-class.pod
pod/ur-define-datasource-file.pod
pod/ur-define-datasource-mysql.pod
pod/ur-define-datasource-oracle.pod
pod/ur-define-datasource-pg.pod
pod/ur-define-datasource-sqlite.pod
pod/ur-define-datasource.pod
pod/ur-define-db.pod
pod/ur-define-namespace.pod
pod/ur-define.pod
pod/ur-describe.pod
pod/ur-init.pod
pod/ur-list-classes.pod
pod/ur-list-modules.pod
pod/ur-list-objects.pod
pod/ur-list.pod
pod/ur-sys-class-browser.pod
pod/ur-sys.pod
pod/ur-test-callcount-list.pod
pod/ur-test-callcount.pod
pod/ur-test-compile.pod
pod/ur-test-eval.pod
pod/ur-test-run.pod
pod/ur-test-track-object-release.pod
pod/ur-test-use.pod
pod/ur-test-window.pod
pod/ur-test.pod
pod/ur-update-class-diagram.pod
pod/ur-update-classes-from-db.pod
pod/ur-update-pod.pod
pod/ur-update-rename-class.pod
pod/ur-update-rewrite-class-header.pod
pod/ur-update-schema-diagram.pod
pod/ur-update-tab-completion-spec.pod
pod/ur-update.pod
pod/ur.pod
Loading

0 comments on commit 21ffce2

Please sign in to comment.