@@ -722,14 +722,14 @@ my %defconfig = (
722
722
dest => ' perl-small.com' ,
723
723
install_modules => [],
724
724
},
725
- # development configs
726
- ' dbg' => { base => ' full' , perl_extra_flags => [' -Doptimize=-g3 -gdwarf-4' , ' -de' ]},
727
- dontuse_threads => {
728
- desc => " not recommended, threaded build is buggy" ,
729
- base => ' full' ,
730
- perl_extra_flags => [' -Doptimize=-Os' , ' -Dusethreads' , ' -de' ],
731
- perl_id => ' cosmo-apperl'
725
+ ' nobuild' => {
726
+ desc => ' base nobuild config' ,
727
+ dest => ' perl-nobuild.com' ,
728
+ MANIFEST => [' lib' , ' bin' ],
729
+ zip_extra_files => {},
730
+ nobuild_perl_bin => [' src/perl.com' , $^X],
732
731
},
732
+ # development configs
733
733
perl_cosmo_dev => {
734
734
desc => " For developing cosmo platform perl without apperl additions" ,
735
735
base => ' full' ,
@@ -853,11 +853,22 @@ sub InstallBuildDeps {
853
853
854
854
sub _remove_arr_items_from_arr {
855
855
my ($src , $toremove ) = @_ ;
856
- foreach my $item (@{$toremove }) {
857
- my $index = 0;
858
- $index ++ until $src -> [$index ] eq $item ;
859
- splice (@$src , $index , 1);
856
+ my @remove = @{$toremove };
857
+ foreach my $srcindex (reverse 0..$# {$src }) {
858
+ for my $removeindex (reverse 0..$#remove ) {
859
+ if ($src -> [$srcindex ] eq $remove [$removeindex ]) {
860
+ splice (@$src , $srcindex , 1);
861
+ return if (scalar (@remove ) == 1);
862
+ splice (@remove , $removeindex , 1);
863
+ last ;
864
+ }
865
+ }
860
866
}
867
+ # foreach my $item (@{$toremove}) {
868
+ # my $index = 0;
869
+ # $index++ until $src->[$index] eq $item;
870
+ # splice(@$src, $index, 1);
871
+ # }
861
872
}
862
873
863
874
sub Status {
@@ -880,22 +891,31 @@ sub Status {
880
891
my $projectconfig = _load_json(PROJECT_FILE);
881
892
if ($projectconfig && exists $projectconfig -> {apperl_configs }) {
882
893
@projectitems = sort (keys %{$projectconfig -> {apperl_configs }});
894
+ _remove_arr_items_from_arr(\@configlist , \@projectitems );
883
895
}
884
- my @stable = grep ( / v\d +\.\d +\.\d +(\- vista)?$ / , @configlist );
885
- my @rolling = (' full' , ' full-vista' , ' small' , ' small-vista' );
886
- my @internal = (' dontuse_threads' , ' perl_cosmo_dev' , ' perl_apperl_dev' , ' dbg' );
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 );
901
+ _remove_arr_items_from_arr(\@configlist , \@rolling );
902
+ my @deprecated = grep (/ \- vista$ / , @configlist );
903
+ _remove_arr_items_from_arr(\@configlist , \@deprecated );
904
+ my @internal = grep (/ ^(dontuse_threads|perl_cosmo_dev|perl_apperl_dev|dbg)$ / , @configlist );
905
+ _remove_arr_items_from_arr(\@configlist , \@internal );
887
906
my @categories = (
888
907
[' PROJECT' , \@projectitems ],
889
908
[' STABLE' , \@stable ],
890
909
[' ROLLING' , \@rolling ],
910
+ [' NOBUILD' , \@nobuild ],
911
+ [' DEPRECATED' , \@deprecated ],
891
912
[' UNSTABLE/INTERNAL' , \@internal ],
892
913
[' UNKNOWN' , \@configlist ]
893
914
);
894
915
foreach my $cat (@categories ) {
895
916
foreach my $item (@{$cat -> [1]}) {
896
917
print (sprintf " %s %-30.30s | %-17.17s |%s \n " , $CurAPPerlName && ($item eq $CurAPPerlName ) ? ' *' : ' ' , $item , $cat -> [0], ($Configs -> {apperl_configs }{$item }{desc } // ' ' ));
897
918
}
898
- _remove_arr_items_from_arr(\@configlist , \@{$cat -> [1]});
899
919
}
900
920
}
901
921
0 commit comments