@@ -669,7 +669,7 @@ my %defconfig = (
669
669
},
670
670
apperl_configs => {
671
671
' nobuild-v0.1.0' => {
672
- desc => ' base nobuild config ' ,
672
+ desc => ' use nobuild as base instead of this ' ,
673
673
dest => ' perl-nobuild.com' ,
674
674
MANIFEST => [' lib' , ' bin' ],
675
675
zip_extra_files => {},
@@ -893,21 +893,22 @@ sub Status {
893
893
@projectitems = sort (keys %{$projectconfig -> {apperl_configs }});
894
894
_remove_arr_items_from_arr(\@configlist , \@projectitems );
895
895
}
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
+ }
901
901
_remove_arr_items_from_arr(\@configlist , \@rolling );
902
- my @deprecated = grep (/ \- vista$ / , @configlist );
902
+ my @deprecated = grep (/ ( \- vista|v0 \. 1 \. 0) $ / , @configlist );
903
903
_remove_arr_items_from_arr(\@configlist , \@deprecated );
904
904
my @internal = grep (/ ^(dontuse_threads|perl_cosmo_dev|perl_apperl_dev|dbg)$ / , @configlist );
905
905
_remove_arr_items_from_arr(\@configlist , \@internal );
906
+ my @stable = grep ( / v\d +\.\d +\.\d +$ / , @configlist );
907
+ _remove_arr_items_from_arr(\@configlist , \@stable );
906
908
my @categories = (
907
909
[' PROJECT' , \@projectitems ],
908
910
[' STABLE' , \@stable ],
909
911
[' ROLLING' , \@rolling ],
910
- [' NOBUILD' , \@nobuild ],
911
912
[' DEPRECATED' , \@deprecated ],
912
913
[' UNSTABLE/INTERNAL' , \@internal ],
913
914
[' UNKNOWN' , \@configlist ]
@@ -940,6 +941,8 @@ sub Set {
940
941
else {
941
942
$UserProjectConfig = {};
942
943
}
944
+ $UserProjectConfig -> {apperl_output } //= PROJECT_TMP_DIR." /o" ;
945
+ $UserProjectConfig -> {current_apperl } = $cfgname ;
943
946
my $itemconfig = _load_apperl_config(_load_apperl_configs()-> {apperl_configs }, $cfgname );
944
947
print Dumper($itemconfig );
945
948
if (! exists $itemconfig -> {nobuild_perl_bin }) {
@@ -952,7 +955,7 @@ sub Set {
952
955
} else {
953
956
-d $SiteConfig -> {cosmocc } or die $SiteConfig -> {cosmocc } . ' is not a directory' ;
954
957
}
955
-
958
+ # $UserProjectConfig->{configs}{$cfgname}{perl_build_dir} //= $SiteConfig->{perl_repo} // "$UserProjectConfig->{apperl_output}/$cfgname/tmp/perl5";
956
959
if (! $itemconfig -> {perl_url }) {
957
960
-d $SiteConfig -> {perl_repo } or die $SiteConfig -> {perl_repo } .' is not directory' ;
958
961
print " cd " .$SiteConfig -> {perl_repo }." \n " ;
@@ -1009,8 +1012,6 @@ sub Set {
1009
1012
$UserProjectConfig -> {nobuild_perl_bin } = $validperl ;
1010
1013
print " Set UserProjectConfig to nobuild_perl-bin to $validperl \n " ;
1011
1014
}
1012
- $UserProjectConfig -> {apperl_output } //= PROJECT_TMP_DIR." /o" ;
1013
- $UserProjectConfig -> {current_apperl } = $cfgname ;
1014
1015
_write_user_project_config($UserProjectConfig );
1015
1016
print " $0 : Successfully switched to $cfgname \n " ;
1016
1017
}
0 commit comments