Skip to content

Commit ad70c66

Browse files
committed
further config cleanup
1 parent c62d744 commit ad70c66

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

lib/Perl/Dist/APPerl.pm

+12-11
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ my %defconfig = (
669669
},
670670
apperl_configs => {
671671
'nobuild-v0.1.0' => {
672-
desc => 'base nobuild config',
672+
desc => 'use nobuild as base instead of this',
673673
dest => 'perl-nobuild.com',
674674
MANIFEST => ['lib', 'bin'],
675675
zip_extra_files => {},
@@ -893,21 +893,22 @@ sub Status {
893893
@projectitems = sort (keys %{$projectconfig->{apperl_configs}});
894894
_remove_arr_items_from_arr(\@configlist, \@projectitems);
895895
}
896-
my @nobuild = grep(/nobuild/, @configlist);
897-
_remove_arr_items_from_arr(\@configlist, \@nobuild);
898-
my @stable = grep( /v\d+\.\d+\.\d+$/, @configlist);
899-
_remove_arr_items_from_arr(\@configlist, \@stable);
900-
my @rolling = grep(/^(full|small)$/, @configlist);
896+
my @rolling = grep(/^(full|small|nobuild)$/, @configlist);
897+
{
898+
my %preferences = ( full => 0, small => 1, nobuild => 2);
899+
@rolling = sort {$preferences{$a} <=> $preferences{$b}} @rolling;
900+
}
901901
_remove_arr_items_from_arr(\@configlist, \@rolling);
902-
my @deprecated = grep(/\-vista$/, @configlist);
902+
my @deprecated = grep(/(\-vista|v0\.1\.0)$/, @configlist);
903903
_remove_arr_items_from_arr(\@configlist, \@deprecated);
904904
my @internal = grep(/^(dontuse_threads|perl_cosmo_dev|perl_apperl_dev|dbg)$/, @configlist);
905905
_remove_arr_items_from_arr(\@configlist, \@internal);
906+
my @stable = grep( /v\d+\.\d+\.\d+$/, @configlist);
907+
_remove_arr_items_from_arr(\@configlist, \@stable);
906908
my @categories = (
907909
['PROJECT', \@projectitems],
908910
['STABLE', \@stable],
909911
['ROLLING', \@rolling],
910-
['NOBUILD', \@nobuild],
911912
['DEPRECATED', \@deprecated],
912913
['UNSTABLE/INTERNAL', \@internal],
913914
['UNKNOWN', \@configlist]
@@ -940,6 +941,8 @@ sub Set {
940941
else {
941942
$UserProjectConfig = {};
942943
}
944+
$UserProjectConfig->{apperl_output} //= PROJECT_TMP_DIR."/o";
945+
$UserProjectConfig->{current_apperl} = $cfgname;
943946
my $itemconfig = _load_apperl_config(_load_apperl_configs()->{apperl_configs}, $cfgname);
944947
print Dumper($itemconfig);
945948
if(! exists $itemconfig->{nobuild_perl_bin}) {
@@ -952,7 +955,7 @@ sub Set {
952955
} else {
953956
-d $SiteConfig->{cosmocc} or die $SiteConfig->{cosmocc} . ' is not a directory';
954957
}
955-
958+
#$UserProjectConfig->{configs}{$cfgname}{perl_build_dir} //= $SiteConfig->{perl_repo} // "$UserProjectConfig->{apperl_output}/$cfgname/tmp/perl5";
956959
if (! $itemconfig->{perl_url}) {
957960
-d $SiteConfig->{perl_repo} or die $SiteConfig->{perl_repo} .' is not directory';
958961
print "cd ".$SiteConfig->{perl_repo}."\n";
@@ -1009,8 +1012,6 @@ sub Set {
10091012
$UserProjectConfig->{nobuild_perl_bin} = $validperl;
10101013
print "Set UserProjectConfig to nobuild_perl-bin to $validperl\n";
10111014
}
1012-
$UserProjectConfig->{apperl_output} //= PROJECT_TMP_DIR."/o";
1013-
$UserProjectConfig->{current_apperl} = $cfgname;
10141015
_write_user_project_config($UserProjectConfig);
10151016
print "$0: Successfully switched to $cfgname\n";
10161017
}

0 commit comments

Comments
 (0)