Remove function package_build from packages, and use shared package_build based on variables.

17 files changed, 46 insertions, 153 deletions

diff --git a/packages/SDL.sh b/packages/SDL.sh
index bde21cf..22db62b 100755
--- a/packages/SDL.sh
+++ b/packages/SDL.sh
@@ -17,12 +17,3 @@ CONFIGURE_FLAGS="--disable-rpath --enable-sdl-dlopen --disable-loadso \
         --disable-alsa-shared --disable-pulseaudio-shared \
         --disable-x11-shared \
         --enable-video-directfb"
-
-function package_build {
-    run_switch_branch
-    run_src_script ./autogen.sh
-    run_configure
-
-    run_make
-    run_make_install
-}
diff --git a/packages/SDL_gfx.sh b/packages/SDL_gfx.sh
index c54decd..a867189 100755
--- a/packages/SDL_gfx.sh
+++ b/packages/SDL_gfx.sh
@@ -8,12 +8,3 @@ ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
-
-function package_build {
-    run_switch_branch
-    run_src_script ./autogen.sh
-    run_configure
-
-    run_make
-    run_make_install
-}
diff --git a/packages/SDL_image.sh b/packages/SDL_image.sh
index 95d019a..4c1e103 100755
--- a/packages/SDL_image.sh
+++ b/packages/SDL_image.sh
@@ -10,12 +10,3 @@ ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
 CONFIGURE_FLAGS="--disable-jpg-shared --disable-tif-shared --disable-png-shared --disable-webp-shared"
-
-function package_build {
-    run_switch_branch
-    run_src_script ./autogen.sh
-    run_configure
-
-    run_make
-    run_make_install
-}
diff --git a/packages/SDL_mixer.sh b/packages/SDL_mixer.sh
index dadceb8..5300c64 100755
--- a/packages/SDL_mixer.sh
+++ b/packages/SDL_mixer.sh
@@ -11,12 +11,3 @@ BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
 CONFIGURE_FLAGS="--disable-music-mp3 \
     --disable-music-mod-shared --disable-music-ogg-shared --disable-music-mp3-shared --disable-music-flac-shared --disable-music-fluidsynth-shared"
-
-function package_build {
-    run_switch_branch
-    run_src_script ./autogen.sh
-    run_configure
-
-    run_make
-    run_make_install
-}
diff --git a/packages/SDL_net.sh b/packages/SDL_net.sh
index 62544e3..dd92679 100755
--- a/packages/SDL_net.sh
+++ b/packages/SDL_net.sh
@@ -10,12 +10,3 @@ ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
 CONFIGURE_FLAGS="--disable-gui"
-
-function package_build {
-    run_switch_branch
-    run_src_script ./autogen.sh
-    run_configure
-
-    run_make
-    run_make_install
-}
diff --git a/packages/SDL_ttf.sh b/packages/SDL_ttf.sh
index 0caf4e2..0200729 100755
--- a/packages/SDL_ttf.sh
+++ b/packages/SDL_ttf.sh
@@ -9,12 +9,3 @@ ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
-
-function package_build {
-    run_switch_branch
-    run_src_script ./autogen.sh
-    run_configure
-
-    run_make
-    run_make_install
-}
diff --git a/packages/cmake.sh b/packages/cmake.sh
index afbfac0..817c104 100755
--- a/packages/cmake.sh
+++ b/packages/cmake.sh
@@ -1,15 +1,8 @@
 #!/bin/bash
 
 SRCURL=git://cmake.org/cmake.git
+DEFAULT_BRANCH="v3.7.2"
 
 ENV_PATH="bin"
 
 BUILD_TYPE="cmake"
-
-function package_build {
-    run_switch_branch
-    run_cmake
-
-    run_make
-    run_make_install
-}
diff --git a/packages/cppcheck.sh b/packages/cppcheck.sh
index 4060dff..bc4d179 100755
--- a/packages/cppcheck.sh
+++ b/packages/cppcheck.sh
@@ -6,12 +6,3 @@ ENV_PATH="bin:share/CppCheck"
 
 BUILD_TYPE="cmake"
 CONFIGURE_FLAGS="-DHAVE_RULES=ON"
-
-function package_build {
-    run_switch_branch
-
-    run_cmake
-
-    run_make
-    run_make_install
-}
diff --git a/packages/curl.sh b/packages/curl.sh
index 5f8c035..77ca9c5 100755
--- a/packages/curl.sh
+++ b/packages/curl.sh
@@ -10,16 +10,3 @@ ENV_MANPATH="share/man"
 ENABLE_SAME_DIR_BUILD="true"
 
 BUILD_TYPE="automake"
-
-function package_build {
-    run_switch_branch
-
-    # this need because out of source tree compilation is broken
-    run_enable_same_dir_build
-
-    run_autoreconf -i
-    run_configure
-
-    run_make
-    run_make_install
-}
diff --git a/packages/libpng.sh b/packages/libpng.sh
index 7eac711..7e73559 100755
--- a/packages/libpng.sh
+++ b/packages/libpng.sh
@@ -8,13 +8,3 @@ ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 ENV_MANPATH="share/man"
 
 BUILD_TYPE="automake"
-
-function package_build {
-    run_switch_branch
-
-    run_autoreconf -i
-    run_configure
-
-    run_make
-    run_make_install
-}
diff --git a/packages/libxml2.sh b/packages/libxml2.sh
index 3045d6d..e6e6219 100755
--- a/packages/libxml2.sh
+++ b/packages/libxml2.sh
@@ -9,13 +9,3 @@ ENV_MANPATH="share/man"
 
 BUILD_TYPE="automake"
 CONFIGURE_FLAGS="--with-python-install-dir="${bindir}/lib/python""
-
-function package_build {
-    run_switch_branch
-
-    run_autoreconf -i
-    run_configure
-
-    run_make
-    run_make_install
-}
diff --git a/packages/manaplus.sh b/packages/manaplus.sh
index bb30743..702a4d3 100755
--- a/packages/manaplus.sh
+++ b/packages/manaplus.sh
@@ -6,13 +6,3 @@ ENV_PATH="bin"
 ENV_MANPATH="share/man"
 
 BUILD_TYPE="automake"
-
-function package_build {
-    run_switch_branch
-
-    run_autoreconf -i
-    run_configure
-
-    run_make
-    run_make_install
-}
diff --git a/packages/physfs.sh b/packages/physfs.sh
index 213e9cb..2e59b74 100755
--- a/packages/physfs.sh
+++ b/packages/physfs.sh
@@ -9,11 +9,3 @@ ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 
 BUILD_TYPE="cmake"
-
-function package_build {
-    run_switch_branch
-    run_cmake
-
-    run_make
-    run_make_install
-}
diff --git a/packages/qemu.sh b/packages/qemu.sh
index e83d12b..5c0df62 100755
--- a/packages/qemu.sh
+++ b/packages/qemu.sh
@@ -15,15 +15,3 @@ CONFIGURE_FLAGS="\
     --enable-virglrenderer \
     --enable-sdl \
     --with-sdlabi=2.0"
-
-function package_build {
-    run_switch_branch
-    run_configure
-
-    run_make
-    run_make_install
-}
-
-#function package_deps {
-#    run_add_dep virglrenderer
-#}
diff --git a/packages/virglrenderer.sh b/packages/virglrenderer.sh
index 959b2e8..f5ef044 100755
--- a/packages/virglrenderer.sh
+++ b/packages/virglrenderer.sh
@@ -8,11 +8,4 @@ ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 ENV_MANPATH="share/man"
 
 BUILD_TYPE="automake"
-
-function package_build {
-    run_switch_branch
-    run_autoreconf -v --install
-    run_configure
-    run_make
-    run_make_install
-}
+AUTORECONF_FLAGS="-v --install"
diff --git a/packages/zlib.sh b/packages/zlib.sh
index 1e798cd..3181708 100755
--- a/packages/zlib.sh
+++ b/packages/zlib.sh
@@ -9,11 +9,3 @@ ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 ENV_MANPATH="share/man"
 
 BUILD_TYPE="configure"
-
-function package_build {
-    run_switch_branch
-    run_configure
-
-    run_make
-    run_make_install
-}
diff --git a/scripts/include/common.sh b/scripts/include/common.sh
index 21f00f2..d446c1e 100644
--- a/scripts/include/common.sh
+++ b/scripts/include/common.sh
@@ -57,6 +57,7 @@ function common_package_init {
     export packagefile="${package}.sh"
     export SRCTYPE="git"
     export DEFAULT_BRANCH="master"
+    export AUTORECONF_FLAGS="-i"
 
     if [ ! -f "../packages/${packagefile}" ]; then
         echo "Error: Package '${package}' not exists."
@@ -93,18 +94,24 @@ function env_man {
 }
 
 function run_autoreconf {
+    flags="$*"
+    if [[ "${flags}" == "" ]]; then
+        flags="${AUTORECONF_FLAGS}"
+    fi
     cd "${srcdir}"
     check_error $?
     echo "make distclean"
     make distclean
-    echo "autoreconf $*"
-    autoreconf $*
+    echo "autoreconf ${flags}"
+    autoreconf  ${flags}
     check_error $?
+    unset flags
 }
 
 function run_src_script {
     cd "${srcdir}"
     check_error $?
+    echo $*
     $*
     check_error $?
 }
@@ -237,6 +244,7 @@ function repack_paths {
 }
 
 function package_use {
+    echo "package_use"
     repack_paths "$ENV_PATH" "PATH"
     repack_paths "$ENV_LD_LIBRARY_PATH" "LD_LIBRARY_PATH"
     repack_paths "$ENV_PKG_CONFIG_PATH" "PKG_CONFIG_PATH"
@@ -250,7 +258,6 @@ function common_use_package {
     echo "#!/bin/bash" >"${envfile}"
     check_error $?
     echo "" >>"${envfile}"
-    echo "package_use"
     package_use
     check_error $?
     echo "\$*" >>"${envfile}"
@@ -260,10 +267,12 @@ function common_use_package {
 }
 
 function package_get_source {
+    echo "package_get_source"
     run_clone "${SRCURL}"
 }
 
 function package_update_source {
+    echo "package_update_source"
     cd "../src/${package}"
     if [ -d .git ]; then
         echo "git fetch origin"
@@ -282,3 +291,35 @@ function common_clean_destination {
     echo "clean ${bindir}"
     rm -rf "${bindir}"
 }
+
+function package_build {
+    echo "package_build"
+    run_switch_branch
+
+    if [[ "$ENABLE_SAME_DIR_BUILD" != "" ]]; then
+        run_enable_same_dir_build
+    fi
+    if [[ "$SRC_INIT_COMMAND" != "" ]]; then
+        run_src_script "$SRC_INIT_COMMAND"
+    fi
+
+    case "$BUILD_TYPE" in
+        automake)
+            run_autoreconf
+            run_configure
+            ;;
+        configure)
+            run_configure
+            ;;
+        cmake)
+            run_cmake
+            ;;
+        *)
+            echo "Error: unknown BUILD_TYPE. Valid values: automake, configure, cmake"
+            exit 1
+            ;;
+    esac
+
+    run_make
+    run_make_install
+}