Merge branch 'master' into gcc

10 files changed, 95 insertions, 14 deletions

diff --git a/.ci/addrepo.sh b/.ci/addrepo.sh
new file mode 100755
index 0000000..febac0d
--- /dev/null
+++ b/.ci/addrepo.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ "$RUNFROMSHELL" != "" ];
+then
+    echo "Running from shell. Skipping apt-get install"
+    return
+fi
+
+echo "deb http://deb.debian.org/debian $1 main" >> /etc/apt/sources.list
diff --git a/.ci/clonesrc.sh b/.ci/clonesrc.sh
new file mode 100755
index 0000000..b6513a5
--- /dev/null
+++ b/.ci/clonesrc.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+./.ci/retry.sh ${MANAPLUS_CLONE}
+mkdir cloned/logs
+./cloned/tools/ci/scripts/copylib.sh ${LIBNAME} ${LIBVERSION}
diff --git a/.ci/install.sh b/.ci/install.sh
index d09c953..ca26375 100755
--- a/.ci/install.sh
+++ b/.ci/install.sh
@@ -8,5 +8,10 @@ fi
 
 echo "apt-get update"
 ./.ci/retry.sh apt-get update || exit 1
-echo "apt-get -y -qq install git-core bash"
-./.ci/retry.sh apt-get -y -qq install $* || exit 1
+echo "apt-get -y install aptitude"
+./.ci/retry.sh apt-get -y install aptitude || exit 1
+
+echo "aptitude update"
+./.ci/retry.sh aptitude update || exit 1
+echo "aptitude -y install $*"
+./.ci/retry.sh aptitude -y install $* || exit 1
diff --git a/packages/sdl-jstest.sh b/packages/sdl-jstest.sh
new file mode 100644
index 0000000..dac8139
--- /dev/null
+++ b/packages/sdl-jstest.sh
@@ -0,0 +1,6 @@
+SRCURL=https://github.com/Grumbel/sdl-jstest.git
+
+ENV_PATH="bin"
+ENV_MANPATH="share/man"
+
+BUILD_TYPE="cmake"
diff --git a/scripts/build.sh b/scripts/build.sh
index 61109a7..61f94b4 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -6,6 +6,7 @@ source ../scripts/include/common.sh
 common_package_init
 
 common_build_init
+common_clean_builddir
 
 common_run_package
 package_build
diff --git a/scripts/buildonly.sh b/scripts/buildonly.sh
index 5a45ab8..12431da 100755
--- a/scripts/buildonly.sh
+++ b/scripts/buildonly.sh
@@ -6,6 +6,7 @@ source ../scripts/include/common.sh
 common_package_init
 
 common_build_init
+common_clean_builddir
 
 common_run_package
 package_build
diff --git a/scripts/clean.sh b/scripts/clean.sh
index 347e3e8..1f56c44 100755
--- a/scripts/clean.sh
+++ b/scripts/clean.sh
@@ -6,6 +6,7 @@ source ../scripts/include/common.sh
 common_package_init
 
 common_build_init
+common_clean_builddir
 
 common_run_package
 common_clean_destination
diff --git a/scripts/include/common.sh b/scripts/include/common.sh
index bdc71e0..974d66c 100644
--- a/scripts/include/common.sh
+++ b/scripts/include/common.sh
@@ -39,11 +39,6 @@ function common_build_init {
 
     export builddir=$(realpath "${dir}/../tmp/${package}")
     export bindir=$(realpath "${dir}/../bin/${installname}")
-
-    rm -rf "${builddir}"
-    check_error $?
-    mkdir -p "${builddir}"
-    check_error $?
 }
 
 function common_package_init {
@@ -113,7 +108,8 @@ function run_autoreconf {
     if [[ "${flags}" == "" ]]; then
         flags="${AUTORECONF_FLAGS}"
     fi
-    cd "${srcdir}"
+    echo "cd ${srcdir}/${SUBDIR}"
+    cd "${srcdir}/${SUBDIR}"
     check_error $?
     echo "make distclean"
     make distclean
@@ -124,7 +120,8 @@ function run_autoreconf {
 }
 
 function run_src_script {
-    cd "${srcdir}"
+    echo "cd ${srcdir}/${SUBDIR}"
+    cd "${srcdir}/${SUBDIR}"
     check_error $?
     echo $@
     $@
@@ -135,6 +132,8 @@ function run_enable_same_dir_build {
     echo "copy sources from $srcdir to ${builddir}"
     cp -r "$srcdir" "${builddir}/.."
     export srcdir="$builddir"
+    echo mkdir -p "${builddir}/${SUBDIR}"
+    mkdir -p "${builddir}/${SUBDIR}" || true
     echo "change src dir to $srcdir"
 }
 
@@ -143,10 +142,11 @@ function run_configure {
     if [[ "${flags}" == "" ]]; then
         flags="${CONFIGURE_FLAGS}"
     fi
-    cd "${builddir}"
+    echo "cd ${builddir}/${SUBDIR}"
+    cd "${builddir}/${SUBDIR}"
     check_error $?
-    echo "configure --prefix=\"${bindir}\" ${flags}"
-    eval "$srcdir"/configure --prefix="${bindir}" ${flags}
+    echo "$srcdir"/"$SUBDIR"/configure --prefix="${bindir}" "${flags}"
+    eval "$srcdir"/"$SUBDIR"/configure --prefix="${bindir}" ${flags}
     check_error $?
     unset flags
 }
@@ -156,7 +156,8 @@ function run_cmake {
     if [[ "${flags}" == "" ]]; then
         flags="${CONFIGURE_FLAGS}"
     fi
-    cd "${builddir}"
+    echo "cd ${builddir}/${SUBDIR}"
+    cd "${builddir}/${SUBDIR}"
     check_error $?
     echo "cmake -DCMAKE_INSTALL_PREFIX:PATH=\"${bindir}\" \"$srcdir\" ${flags}"
     eval cmake -DCMAKE_INSTALL_PREFIX:PATH="${bindir}" "$srcdir" ${flags}
@@ -301,7 +302,6 @@ function package_use {
     repack_paths "$ENV_LIBGL_DRIVERS_PATH" "$OVERRIDE_ENV_LIBGL_DRIVERS_PATH" "LIBGL_DRIVERS_PATH"
     repack_flags "$ENV_LDFLAGS_PATH" "$OVERRIDE_ENV_LDFLAGS_PATH" "LDFLAGS" "-L"
     repack_flags "$ENV_CPPFLAGS_PATH" "$OVERRIDE_ENV_CPPFLAGS_PATH" "CPPFLAGS" "-I"
-    repack_flags "$ENV_LIBGL_DRIVERS_PATH" "$OVERRIDE_ENV_LIBGL_DRIVERS_PATH" "LIBGL_DRIVERS_PATH"
 }
 
 function common_use_package {
@@ -369,6 +369,19 @@ function common_update_source_all {
     unset files
 }
 
+function common_reset_source_all {
+    cd ../src/
+    check_error $?
+    files="*"
+    for package in $files
+    do
+        cd ../scripts/
+        ./resetsrc.sh $package
+        check_error $?
+    done
+    unset files
+}
+
 function package_get_source {
     echo "package_get_source"
     run_clone "${SRCURL}"
@@ -394,11 +407,37 @@ function package_update_source {
     fi
 }
 
+function package_reset_source {
+    echo "package_reset_source"
+    cd "../src/${package}"
+    if [ -d .git ]; then
+        echo "git reset --hard HEAD"
+        git reset --hard HEAD
+        check_error $?
+        return
+    fi
+    if [ -d .hg ]; then
+        echo "hg update -C"
+        hg update -C
+        check_error $?
+        return
+    fi
+}
+
 function common_clean_destination {
     echo "clean ${bindir}"
     rm -rf "${bindir}"
 }
 
+function common_clean_builddir {
+    echo rm -rf "${builddir}"
+    rm -rf "${builddir}"
+    check_error $?
+    echo mkdir -p "${builddir}"
+    mkdir -p "${builddir}"
+    check_error $?
+}
+
 function package_build {
     echo "package_build"
     run_switch_branch
diff --git a/scripts/resetsrc.sh b/scripts/resetsrc.sh
new file mode 100755
index 0000000..05843c1
--- /dev/null
+++ b/scripts/resetsrc.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+export package=$1
+source ../scripts/include/common.sh
+
+common_package_init
+
+common_run_package
+package_reset_source
diff --git a/scripts/resetsrcall.sh b/scripts/resetsrcall.sh
new file mode 100755
index 0000000..7185785
--- /dev/null
+++ b/scripts/resetsrcall.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+source ../scripts/include/common.sh
+
+common_reset_source_all