tazwok rev 156
tazwok compile does not generate other packages anymore
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Tue Jan 26 18:06:28 2010 +0100 (2010-01-26) |
parents | 224b16a6c586 |
children | 1ec5d132dce7 |
files | tazwok |
line diff
1.1 --- a/tazwok Sun Jan 17 18:43:21 2010 +0000 1.2 +++ b/tazwok Tue Jan 26 18:06:28 2010 +0100 1.3 @@ -354,14 +354,6 @@ 1.4 echo "" 1.5 echo "compilation done : `date +%Y%m%d\ \%H:%M:%S`" >> $LOG 1.6 1.7 - # Regenerate every package that wants a PACKAGE compiled 1.8 - # make tazwok genpkg happy 1.9 - mkdir $WOK/$PACKAGE/taz 1.10 - for i in $( grep -l "^WANTED=\"$PACKAGE\"" $WOK/*/receipt) ; do 1.11 - tazwok genpkg $(basename $(dirname $i)) 1.12 - done 1.13 - # Still needs tazwok genpkg for this package 1.14 - rm -rf $WOK/$PACKAGE/taz 1.15 else 1.16 echo "================================================================================" 1.17 echo "Compilation failed. Please read the compiler output." 1.18 @@ -373,6 +365,18 @@ 1.19 fi 1.20 } 1.21 1.22 +# Regenerate every package that wants a PACKAGE compiled 1.23 +refresh_packages_from_compile() 1.24 +{ 1.25 + # make tazwok genpkg happy 1.26 + mkdir $WOK/$PACKAGE/taz 1.27 + for i in $( grep -l "^WANTED=\"$PACKAGE\"" $WOK/*/receipt) ; do 1.28 + tazwok genpkg $(basename $(dirname $i)) 1.29 + done 1.30 + # Still needs tazwok genpkg for this package 1.31 + rm -rf $WOK/$PACKAGE/taz 1.32 +} 1.33 + 1.34 # Copy all generic files (locale, pixmaps, .desktop). We use standard paths, 1.35 # so some packages need to copy these files with the receipt and genpkg_rules. 1.36 # This function is executed by gen_package when 'tazwok genpkg'. 1.37 @@ -1125,6 +1129,7 @@ 1.38 # 1.39 check_root 1.40 compile_package 1.41 + refresh_packages_from_compile 1.42 gen_package 1.43 ;; 1.44 cook-list) 1.45 @@ -1135,8 +1140,7 @@ 1.46 check_for_list 1.47 for pkg in $LIST 1.48 do 1.49 - tazwok compile $pkg 1.50 - tazwok genpkg $pkg 1.51 + tazwok cook $pkg 1.52 done 1.53 ;; 1.54 clean)