diff options
| -rwxr-xr-x | easy_e17.sh | 40 |
1 files changed, 37 insertions, 3 deletions
diff --git a/easy_e17.sh b/easy_e17.sh index 31a1720..74f576e 100755 --- a/easy_e17.sh +++ b/easy_e17.sh @@ -41,6 +41,9 @@ cmd_svn_checkout="svn checkout -r " cmd_svn_update_conflicts_solve="svn update --accept theirs-full -r" cmd_svn_update_conflicts_ask="svn update -r" +cmake_build_dir="build" +cmake_options="" + efl_basic="eina eet evas ecore efreet eio eeze e_dbus embryo edje" efl_extra="imlib2 azy emotion ethumb libeweather emap ewebkit elementary elev8 enlil ensure esskyuehl libast \ python-evas python-ecore python-e_dbus python-edje python-emotion python-elementary shellementary vala" @@ -1047,9 +1050,10 @@ function compile () if [ $package_clean -ge 1 ]; then [ -e config.cache ] && rm config.cache if [ "$name" == "ewebkit" ]; then - if [ $package_clean -eq 1 -a -e "$ewk_build_dir" ]; then + if [ $package_clean -eq 1 -a -e "$ewk_build_dir" -a -e "$ewk_build_dir/Makefile" ]; then cd $ewk_build_dir - run_command "$name" "$path" "clean" "clean : " "$mode" "$make -j $threads clean" + run_command "$name" "$ewk_build_dir" "path" "path: " "$mode" "pwd" + run_command "$name" "$ewk_build_dir" "clean" "clean : " "$mode" "$make -j $threads clean" if [ ! -e "$status_path/$name.noerrors" ]; then if [ "$skip_errors" ]; then write_appname "$name" "hidden" # clean might fail, that's ok @@ -1061,6 +1065,23 @@ function compile () elif [ $package_clean -ge 2 ]; then [ -d $ewk_build_dir ] && run_command "$name" "path" "purge" "purge : " "$mode" "rm -fr $ewk_build_dir" fi + elif [ -e "CMakeLists.txt" ]; then + if [ -e "$cmake_build_dir" -a -e "Makefile" ]; then + if [ $package_clean -eq 1 ]; then + cd $cmake_build_dir || exit + run_command "$name" "$cmake_build_dir" "clean" "clean : " "$mode" "$make -j $threads clean" + if [ ! -e "$status_path/$name.noerrors" ]; then + if [ "$skip_errors" ]; then + write_appname "$name" "hidden" # clean might fail, that's ok + else + return + fi + fi + fi + if [ $package_clean -ge 1 ]; then + run_command "$name" "$cmake_build_dir" "clean" "clean : " "$mode" "rm -fr $cmake_build_dir" + fi + fi elif [ -e "Makefile" ]; then if [ $package_clean -eq 1 ]; then run_command "$name" "$path" "clean" "clean : " "$mode" "$make -j $threads clean" @@ -1100,13 +1121,26 @@ function compile () fi done if [ "$name" == "ewebkit" ]; then - if [ $package_make_only != 1 ] || [ $package_clean -gt 1 ]; then + if [ $package_make_only != 1 ] || [ $package_clean -gt 1 ] || [ ! -e "$ewk_build_dir/Makefile" ]; then run_command "$name" "$path" "cmake" "cmake : " "$mode" "$ewk_build_cmd" if [ ! -e "$status_path/$name.noerrors" ] ; then return ; fi fi cd "${ewk_build_dir}" + run_command "$name" "NOT USED" "make" "make: " "$mode" "$make" + if [ ! -e "$status_path/$name.noerrors" ] ; then return ; fi run_command "$name" "NOT USED" "install" "install: " "rootonly" "$make install" if [ ! -e "$status_path/$name.noerrors" ] ; then return ; fi + elif [ -e "CMakeLists.txt" ]; then + if [ ! -e "Makefile" ] || [ $package_make_only != 1 ] || [ $package_clean -gt 1 ]; then + [ -e $cmake_build_dir ] || mkdir $cmake_build_dir + cd $cmake_build_dir || exit 1 + run_command "$name" "$path" "cmake" "cmake : " "$mode" "cmake -DCMAKE_INSTALL_PREFIX=$install_path $cmake_options $args .." + if [ ! -e "$status_path/$name.noerrors" ] ; then return ; fi + fi + run_command "$name" "$path" "make" "make: " "$mode" "$make -j $threads" + if [ ! -e "$status_path/$name.noerrors" ] ; then return ; fi + run_command "$name" "$path" "install" "install: " "rootonly" "$make install" + if [ ! -e "$status_path/$name.noerrors" ] ; then return ; fi elif [ -e "autogen.sh" ]; then if [ ! -e "Makefile" ] || [ $package_make_only != 1 ] || [ $package_clean -gt 1 ]; then run_command "$name" "$path" "autogen" "autogen: " "$mode" "sh ./autogen.sh --prefix=$install_path $accache $args" |