From 8ccbdc49c0bf46a8bb58475580180a0dd3995497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Thu, 13 Oct 2011 14:22:27 +0200 Subject: easy_e17.sh add --package_args option --- easy_e17.sh | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/easy_e17.sh b/easy_e17.sh index 6be4d45..6c54156 100755 --- a/easy_e17.sh +++ b/easy_e17.sh @@ -52,6 +52,7 @@ src_mode="packages" ignore_dirs_re="/(devs|packaging|plugins|src|web|DOCS|E16|FORMATTING|MARKETING|THEMES|TEST)" ignore_dirs="devs packaging web DOCS E16 FORMATTING MARKETING THEMES TEST" +package_args="" # evas:make_only,emotion:clean autogen_args="" # evas:--enable-gl-x11 linux_distri="" # if your distribution is wrongly detected, define it here nice_level=0 # nice level (19 == low, -20 == high) @@ -213,6 +214,8 @@ function help () echo " smp systems (default: 2 threads)" echo " --autogen_args=:+,. = pass some options to autogen:" echo " :+,:+..." + echo " --package_args=:+,. = pass package specific options:" + echo " :+,:+..." echo " --cflags=,,... = pass cflags to the gcc" echo " --ldflags=,,... = pass ldflags to the gcc" echo -e "\033[1m--------------------------------------------------------------------------------\033[0m" @@ -413,6 +416,12 @@ function parse_args () fi autogen_args="$value" ;; + --package_args) + if [ -z "$value" ]; then + wrong "Missing value for argument '$option'!" + fi + package_args="$value" + ;; --cflags) if [ -z "$value" ]; then wrong "Missing value for argument '$option'!" @@ -934,9 +943,29 @@ function compile () rm -f $status_path/$name.noerrors rm -f "$logs_path/$name.log" run_command "$name" "$path" "path" "path : " "$mode" "pwd" - if [ $clean -ge 1 ]; then + # get package arguments + args="" + package_clean=$clean + package_make_only=$make_only + for app_arg in `echo $package_args | tr -s '\,' ' '`; do + app=`echo $app_arg | cut -d':' -f1` + if [ "$app" == "$name" ]; then + args="$args `echo $app_arg | cut -d':' -f2- | tr -s '+' ' '`" + for arg in $args; do + case $arg in + clean) + package_clean=$(($package_clean + 1)) + ;; + make_only) + package_make_only=1 + ;; + esac + done + fi + done + if [ $package_clean -ge 1 ]; then if [ -e "Makefile" ]; then - if [ $clean -eq 1 ]; then + if [ $package_clean -eq 1 ]; then run_command "$name" "$path" "clean" "clean : " "$mode" "$make -j $threads clean" if [ ! -e "$status_path/$name.noerrors" ]; then if [ "$skip_errors" ]; then @@ -946,7 +975,7 @@ function compile () fi fi fi - if [ $clean -eq 2 ]; then + if [ $package_clean -eq 2 ]; then run_command "$name" "$path" "distclean" "distcln: " "$mode" "$make -j $threads clean distclean" if [ ! -e "$status_path/$name.noerrors" ]; then if [ "$skip_errors" ]; then @@ -956,7 +985,7 @@ function compile () fi fi fi - if [ $clean -ge 3 ]; then + if [ $package_clean -ge 3 ]; then run_command "$name" "$path" "uninstall" "uninst : " "rootonly" "$make -j $threads uninstall clean distclean" if [ ! -e "$status_path/$name.noerrors" ] ; then return ; fi # It's no longer installed if we just uninstalled it. @@ -974,7 +1003,7 @@ function compile () fi done if [ -e "autogen.sh" ]; then - if [ $make_only != 1 ]; then + if [ $package_make_only != 1 -o $package_clean -gt 1 ]; then run_command "$name" "$path" "autogen" "autogen: " "$mode" "sh ./autogen.sh --prefix=$install_path $accache $args" if [ ! -e "$status_path/$name.noerrors" ] ; then return ; fi fi -- cgit v1.1-2-g2b99