jeyzu pushed a commit to branch master.
commit e6d6437ec5c13a328d40157addfa4ba2a730f997
Author: Jérémy Zurcher <[email protected]>
Date: Mon Apr 1 15:05:20 2013 +0200
jeyzu: cleanup
---
jeyzu/build.sh | 173 --------------------------------------
jeyzu/build_bare.sh | 19 -----
jeyzu/build_more.sh | 20 -----
jeyzu/tools/bench_efl.sh | 179 ----------------------------------------
jeyzu/tools/bench_stringshare.c | 117 --------------------------
jeyzu/update | 94 ---------------------
6 files changed, 602 deletions(-)
diff --git a/jeyzu/build.sh b/jeyzu/build.sh
deleted file mode 100755
index 151aa60..0000000
--- a/jeyzu/build.sh
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/bin/bash
-
-# based on devs/seoz/build.sh
-
-# /etc/ld.so.conf.d/efl.conf:
-# /opt/efl/lib
-# /etc/profile.d/efl.sh:
-# export EFLDIR=/opt/efl
-# export PATH=$PATH:$EFLDIR/bin
-# export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$EFLDIR/lib/pkgconfig
-# #export XDG_DATA_DIRS=$XDG_DATA_DIRS:$EFLDIR/share
-
-set -e
-#set -x
-shopt -s expand_aliases
-
-unset LANG
-export CFLAGS="-O2 -march=native -ffast-math -g3 -W -Wall -Wextra" # -Wshadow"
-export CC="ccache gcc"
-alias make='make -j6'
-
-PREFIX=/opt/efl
-export PATH=$PREFIX/bin:$PATH
-export PKG_CONFIG_PATH=$PREFIX"/lib/pkgconfig:$PKG_CONFIG_PATH"
-
-BUILD_TREE="build"
-BUILD_IN_TREE=1
-CLEANLEVEL=1
-for arg in $@; do
- if [ "x$arg" = "x+c" ]; then CLEANLEVEL=$((CLEANLEVEL+1)); fi
- if [ "x$arg" = "x-c" ]; then CLEANLEVEL=$(($CLEANLEVEL-1)); fi
-done
-
-PWD=`pwd`
-TAGS_PATH=$HOME"/share/ctags/efl.tags"
-LOG_WARN_FILE=$PWD"/warnings.txt"
-LOG_WARN_TMP_FILE=$PWD"/warnings_tmp.txt"
-LOCAL_PATCHES_PATH=$PWD"/local_patches"
-
-EFL_FLAGS="--with-tests=regular --disable-doc --disable-static --enable-fb
--enable-wayland --disable-tslib" # --enable-egl
-E_FLAGS="--enable-pam --disable-device-hal --enable-device-udev
--enable-mount-udisks --enable-mount-eeze --enable-elementary --enable-emotion
--enable-enotify"
-
-function create_log()
-{
- rm $LOG_WARN_FILE -f
- touch $LOG_WARN_FILE
-}
-
-function get_sudo_pwd()
-{
- echo -e "\n==== SUDO PASSWD"
- sudo_test=/tmp/_sudo.test
- echo -n "enter sudo-password: " && stty -echo && read SUDO_PASSWD && stty
echo || exit 1
- echo "$SUDO_PASSWD" | sudo -S touch $sudo_test
- if [ ! -e $sudo_test ]; then
- echo "cmdline provided sudo password failed!"
- exit 1
- else
- sudo rm -f $sudo_test
- fi
-}
-
-function apply_local_patches()
-{
- echo -e "\n==== LOCAL PATCHES"
- for patch in $(ls -1 $LOCAL_PATCHES_PATH/*.patch 2>/dev/null); do
- echo " - apply ${patch##*/}" && patch -p 1 -N -r - < $patch || true
- done
-}
-
-function clean_build_tree()
-{
- [ ! -f Makefile ] && return
- if [ $CLEANLEVEL -gt 1 ]; then
- echo "* distclean ..." && make clean distclean >/dev/null || true
- elif [ $CLEANLEVEL -eq 1 ]; then
- echo "* clean ..." && make clean >/dev/null || true
- else
- echo "* leave tree AS IS ..."
- fi
-}
-
-function run_autogen()
-{
- [ $CLEANLEVEL -lt 1 ] && return
- cmd="./autogen.sh"
- [ $BUILD_IN_TREE -ne 1 ] && cmd="../autogen.sh"
- echo "* $cmd ..." && NOCONFIGURE=1 $cmd >/dev/null 2>&1 || true
-}
-
-function configure_build_tree()
-{
- autogen_flags=$1
- [ $CLEANLEVEL -lt 1 ] && return
- cmd="./configure"
- [ $BUILD_IN_TREE -ne 1 ] && cmd="../configure"
- echo "* $cmd $autogen_flags ..." && $cmd $autogen_flags || exit 1
-}
-
-function make_build_tree()
-{
- echo "* make ..." && make 3>&1 1>&2 2>&3 | tee $LOG_WARN_TMP_FILE || exit 1
- cat $LOG_WARN_TMP_FILE >> $LOG_WARN_FILE
- rm $LOG_WARN_TMP_FILE
-}
-
-function install_component()
-{
- echo "* install ..." && echo "$SUDO_PASSWD" | sudo -S make install
>/dev/null 2>&1 || exit 1
- echo "$SUDO_PASSWD" | sudo -S ldconfig
-}
-
-function build()
-{
- build_dir=$1
- autogen_flags=$2
- for I in $build_dir; do
- pushd $I || exit 1
- echo -e "\n==== $I"
- echo "" >> $LOG_WARN_FILE
- echo "["$I"]" >> $LOG_WARN_FILE
- [ $BUILD_IN_TREE -ne 1 ] && [ -f Makefile ] && echo "* distclean
source tree ..." && make clean distclean >/dev/null || true
- run_autogen
- if [ $BUILD_IN_TREE -ne 1 ]; then
- [ $CLEANLEVEL -gt 2 ] && rm -fr $BUILD_TREE
- [ -d $BUILD_TREE ] || mkdir $BUILD_TREE
- pushd $BUILD_TREE
- fi
- clean_build_tree
- configure_build_tree "$autogen_flags"
- make_build_tree
- install_component
- [ $BUILD_IN_TREE -ne 1 ] && popd
- popd
- done
-}
-
-function uninstall()
-{
- build_dir=$1
- for I in $build_dir; do
- pushd $I
- echo "$SUDO_PASSWD" | sudo -S make uninstall
- popd
- done
-}
-
-function update_desktop_stuff()
-{
- echo -e "\n==== UPDATE DESKTOP STUFF"
- echo "$SUDO_PASSWD" | sudo -S -E update-mime-database $PREFIX/share/mime
- echo "$SUDO_PASSWD" | sudo -S -E update-desktop-database
-}
-
-function e17_restart()
-{
- [ -z "$DISPLAY" ] && return
- echo -e "\n==== ENLIGHTENMENT RESTART"
- enlightenment_remote -restart
-}
-
-function efl_ctags()
-{
- # efl ctags
- echo -e "\n==== TAGS"
- ex=""
- for dir in BINDINGS DEBUG E16 E-MODULES-EXTRA FORMATTING GAMES IN-EFL
MARKETING MISC PROTO SCRIPTS TEST THEMES E16 web; do
- ex="$ex --exclude=$dir"
- done
- [ -e $TAGS_PATH ] && rm $TAGS_PATH
- ctags -h ".h.x.cpp.c" --exclude="*.js" --exclude="*.pxi" --exclude="*.la"
$ex -R > $TAGS_PATH
-}
-
diff --git a/jeyzu/build_bare.sh b/jeyzu/build_bare.sh
deleted file mode 100755
index 49ac46b..0000000
--- a/jeyzu/build_bare.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/bash
-
-source $PWD/devs/jeyzu/build.sh
-
-get_sudo_pwd
-create_log
-
-build "core/efl.git" "--prefix=$PREFIX
--with-dbus-services=/usr/share/dbus-1/services $EFL_FLAGS"
-build "core/evas_generic_loaders.git core/emotion_generic_players.git e_dbus"
"--prefix=$PREFIX"
-build "PROTO/emap PROTO/elocation core/elementary.git" "--prefix=$PREFIX" #
--enable-tests (elocation only)
-build "apps/terminology.git tools/clouseau.git" "--prefix=$PREFIX"
-build "core/enlightenment.git" "--prefix=$PREFIX --sysconfdir=/etc
--libexecdir=$PREFIX/lib/enlightenment $E_FLAGS"
-
-update_desktop_stuff
-e17_restart
-efl_ctags
-
-echo -e "\n==== DONE\n"
-
diff --git a/jeyzu/build_more.sh b/jeyzu/build_more.sh
deleted file mode 100755
index 6b7cbc5..0000000
--- a/jeyzu/build_more.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/bash
-
-source $PWD/devs/jeyzu/build.sh
-
-get_sudo_pwd
-create_log
-
-build "core/efl.git" "--prefix=$PREFIX
--with-dbus-services=/usr/share/dbus-1/services $EFL_FLAGS"
-build "core/evas_generic_loaders.git core/emotion_generic_players.git e_dbus
expedite PROTO/epdf" "--prefix=$PREFIX"
-build "PROTO/emap PROTO/elocation core/elementary.git" "--prefix=$PREFIX" #
--enable-tests (elocation only)
-build "ephysics_tests efx PROTO/eyelight edje_viewer PROTO/azy ensure enjoy
PROTO/eyesight exquisite espionnage PROTO/esskyuehl" "--prefix=$PREFIX"
-build "apps/terminology.git tools/clouseau.git" "--prefix=$PREFIX"
-build "core/enlightenment.git" "--prefix=$PREFIX --sysconfdir=/etc
--libexecdir=$PREFIX/lib/enlightenment $E_FLAGS"
-
-update_desktop_stuff
-e17_restart
-efl_ctags
-
-echo -e "\n==== DONE\n"
-
diff --git a/jeyzu/tools/bench_efl.sh b/jeyzu/tools/bench_efl.sh
deleted file mode 100755
index 82f86e2..0000000
--- a/jeyzu/tools/bench_efl.sh
+++ /dev/null
@@ -1,179 +0,0 @@
-#! /bin/sh
-
-DIR=$(pwd)
-HDIR=${DIR}/head
-PREFIX=/tmp/efl
-EFL_DIR=/home/jeyzu/local/efl/efl
-BRANCH=master
-E_CONF="--prefix=${PREFIX} --disable-doc --disable-shared --enable-static"
-E_CFLAGS="-O2"
-TEST=bench_stringshare
-
-PATCHES=$@
-
-function clean()
-{
- [ -d ${HDIR} ] && rm -rf ${HDIR}
- for patch in ${PATCHES}; do
- PDIR=${DIR}/${patch%%-*}
- [ -d ${PDIR} ] && rm -rf ${PDIR}
- done
-}
-
-function build_efl()
-{
- # GIT STUFF HERE
- echo -e "\n - CLEAN" && cd ${EFL_DIR} && git checkout ${BRANCH} && git
reset --hard HEAD || exit 1
- [ -f Makefile ] && make clean distclean >/dev/null
- echo -e "\n - BUILD head" && ./autogen.sh ${E_CONF}
--with-profile=${PROFILE} && make && make install >/dev/null || exit 1
- mkdir -p ${HDIR}/${PROFILE} || exit 1
- cp -R ${PREFIX}/* ${HDIR}/${PROFILE} || exit 1
- for patch in ${PATCHES}; do
- PDIR=${DIR}/${patch%%-*}
- [ -d ${PREFIX} ] && rm -rf ${PREFIX}
- echo -e "\n - APPLY ${patch} and BUILD" && git apply ${DIR}/${patch}
&& make && make install >/dev/null || exit 1
- mkdir -p ${PDIR}/${PROFILE} || exit 1
- cp -R ${PREFIX}/* ${PDIR}/${PROFILE} || exit 1
- done
-}
-
-function build_efl_release()
-{
-
- export CFLAGS="${E_CFLAGS}"
- export LDFLAGS=${CFLAGS}
- export PROFILE=release
- build_efl
-}
-
-function build_efl_debug()
-{
- export CFLAGS="${E_CFLAGS} -g -pg"
- export LDFLAGS=${CFLAGS}
- export PROFILE=debug
- build_efl
-}
-
-function build_test()
-{
- SRC=${DIR}/${TEST}.c
- echo -e "\n - BUILD tests"
- cd ${HDIR} || exit 1
- gcc -c ${CFLAGS} -I./${PROFILE}/include/eina-1
-I./${PROFILE}/include/eina-1/eina ${SRC} || exit 1
- gcc ${TEST}.o -L./${PROFILE}/lib ${LDFLAGS} -static -leina -dynamic
-pthread -lm -ldl -lrt -o ${TEST}-${PROFILE} || exit 1
- rm ${TEST}.o
-
- for patch in ${PATCHES}; do
- PDIR=${DIR}/${patch%%-*}
- cd ${PDIR} || exit 1
- gcc -c ${CFLAGS} -I${PROFILE}/include/eina-1
-I${PROFILE}/include/eina-1/eina ${SRC} || exit 1
- gcc ${TEST}.o -L./${PROFILE}/lib ${LDFLAGS} -static -leina -dynamic
-pthread -lm -ldl -lrt -o ${TEST}-${PROFILE} || exit 1
- rm ${TEST}.o
- done
-}
-
-function build_test_release()
-{
- export CFLAGS="$E_CFLAGS"
- export LDFLAGS=$CFLAGS
- export PROFILE=release
- build_test
-}
-
-function build_test_debug()
-{
- export CFLAGS="${E_CFLAGS} -g -pg"
- export LDFLAGS=${CFLAGS}
- export PROFILE=debug
- build_test
-}
-
-function run()
-{
- echo -e "\n - RUN tests"
- cd ${HDIR} || exit 1
- for I in 0 1 2 3 4; do
- echo " - RUN ${HDIR} $I" && ./$TEST-${PROFILE} > run-${PROFILE}-$I ||
exit 1
- if [ "x$PROFILE" == "xdebug" ]; then
- gprof ./$TEST-$PROFILE > $TEST-${PROFILE}-$I.prof || exit 1
- fi
- done
-
- for patch in ${PATCHES}; do
- PDIR=${DIR}/${patch%%-*}
- cd ${PDIR} || exit 1
- for I in 0 1 2 3 4; do
- echo " - RUN ${PDIR} $I" && ./$TEST-${PROFILE} > run-${PROFILE}-$I
|| exit 1
- if [ "x$PROFILE" == "xdebug" ]; then
- gprof ./$TEST-$PROFILE > $TEST-${PROFILE}-$I.prof || exit 1
- fi
- done
- done
-
-}
-
-function run_release()
-{
- export PROFILE=release
- run
-}
-
-function run_debug()
-{
- export PROFILE=debug
- run
-}
-
-function plot()
-{
- cd $DIR || exit 1
- C=1
- for what in add del full; do
- ((C=C+1))
- for I in 0 1 2 3 4; do
- OUTF=plot-${PROFILE}-${I}-add.gnuplot
- PLOT="plot \"${HDIR}/run-${PROFILE}-$I\" using 1:${C} title 'head'
with line"
- for patch in ${PATCHES}; do
- PDIR=${DIR}/${patch%%-*}
- PLOT="${PLOT}, \"${PDIR}/run-${PROFILE}-$I\" using 1:${C}
title '${PDIR}' with line"
- done
- cat > ${OUTF} << EOF
-set autoscale # scale axes automatically
-unset log # remove any log-scaling
-unset label # remove any previous labels
-set xtic auto # set xtics automatically
-set ytic auto # set ytics automatically
-set terminal png size 1024,768
-set output "run-${PROFILE}-${what}-$I.png"
-set title "${what} run-${PROFILE}-$I"
-set xlabel "tests"
-set ylabel "time"
-${PLOT}
-EOF
- gnuplot ${OUTF}
- done
- done
-}
-
-function plot_release()
-{
- export PROFILE=release
- plot
-}
-
-function plot_debug()
-{
- export PROFILE=debug
- plot
-}
-
-clean
-build_efl_release
-# build_efl_debug
-build_test_release
-# build_test_debug
-run_release
-# run_debug
-plot_release
-# plot_debug
-
diff --git a/jeyzu/tools/bench_stringshare.c b/jeyzu/tools/bench_stringshare.c
deleted file mode 100644
index 5f2c159..0000000
--- a/jeyzu/tools/bench_stringshare.c
+++ /dev/null
@@ -1,117 +0,0 @@
-
-#include <stdio.h>
-#include <time.h>
-#include <Eina.h>
-#include <stdint.h>
-
-static const char **shares;
-
-static int64_t time_diff(struct timespec *t0, struct timespec *t1)
-{
- return ((t1->tv_sec * 1000000000) + t1->tv_nsec) - ((t0->tv_sec *
1000000000) + t0->tv_nsec);
-}
-
-static void add(int n)
-{
- unsigned int i;
- const char *none;
- const char **walker;
- char build[64] = "string_";
-
- walker = shares;
- for (i = 0; i < n; ++i, ++walker)
- {
- eina_convert_xtoa(i, build + 7);
- *walker = eina_stringshare_add(build);
- }
-
- /* ref */
- /* for (i = 0; i < n; ++i) */
- /* { */
- /* eina_convert_xtoa(i, build + 7); */
- /* none = eina_stringshare_add(build); */
- /* } */
-}
-
-static void del(int n)
-{
- unsigned int i;
- unsigned int l;
- const char **walker;
-
- /* unref */
- walker = shares;
- /* for (i = 0; i < n; ++i, ++walker) */
- /* { */
- /* eina_stringshare_del(*walker); */
- /* } */
-
- l = n/4;
- /* | | |->| | */
- walker = &shares[n/2];
- for (i = 0; i < l; ++i, ++walker)
- {
- eina_stringshare_del(*walker);
- }
-
- /* | | | |<-| */
- walker = &shares[n-1];
- for (i = 0; i < l; ++i, --walker)
- {
- eina_stringshare_del(*walker);
- }
-
- /* | |->| | | */
- walker = &shares[n/4];
- for (i = 0; i < l; ++i, ++walker)
- {
- eina_stringshare_del(*walker);
- }
-
- /* |<-| | | | */
- walker = &shares[n/4-1];
- for (i = 0; i < l; ++i, --walker)
- {
- eina_stringshare_del(*walker);
- }
-}
-
-static void run(int n)
-{
- uint64_t dt0, dt1, dt2;
- struct timespec t0, t1, t2;
-
- eina_init();
- shares = calloc(n+1,sizeof(char*));
- shares[n]=0;
-
- clock_gettime(CLOCK_MONOTONIC, &t0);
-
- add(n);
- clock_gettime(CLOCK_MONOTONIC, &t1);
- del(n);
- /* eina_stringshare_dump(); */
-
- clock_gettime(CLOCK_MONOTONIC, &t2);
-
- eina_shutdown();
- free(shares);
-
- dt0 = time_diff(&t0,&t1);
- dt1 = time_diff(&t1,&t2);
- dt2 = time_diff(&t0,&t2);
- fprintf(stdout,"%d\t%4d\t%4d\t%4d
[ms]\n",n,(int)(dt0/1000000),(int)(dt1/1000000),(int)(dt2/1000000));
-}
-
-int main(int argc, char *argv[])
-{
-
- int i;
-
- for (i = 10000; i<=100000; i += 10000)
- run(i);
-
- return 0;
-}
-
-
diff --git a/jeyzu/update b/jeyzu/update
deleted file mode 100755
index 5669036..0000000
--- a/jeyzu/update
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /bin/bash
-
-RESET="\033[0m"
-RED="\033[0;31m"
-BROWN="\033[0;33m"
-
-LOG=$PWD/z_update.txt
-FILES_LOG=$PWD/z_update.log
-CLONED_LOG=$PWD/z_cloned.log
-UPDATED_LOG=$PWD/z_updated.log
-REPO_LIST=$PWD/z_repos.txt
-
-USR_NAME="Jérémy Zurcher"
-USR_EMAIL="[email protected]"
-
-GIT_SITE=git.enlightenment.org
-REPO_LIST_URL=http://$GIT_SITE/repos.txt
-CLONE_SCHEMA_GIT=git://$GIT_SITE
-CLONE_SCHEMA_SSH=ssh://git@$GIT_SITE
-
-CLONE_SCHEMA=$CLONE_SCHEMA_SSH
-for arg in $@; do
- if [ "x$arg" = "x-g" ]; then CLONE_SCHEMA=$CLONE_SCHEMA_GIT; fi
- if [ "x$arg" = "x-s" ]; then CLONE_SCHEMA=$CLONE_SCHEMA_SSH; fi
-done
-
-for file in $LOG $FILES_LOG $CLONED_LOG $UPDATED_LOG $REPO_LIST; do
- [ -e $file ] && rm $file
-done
-
-echo -e "$BROWN## get $RED$REPO_LIST_URL$RESET" && curl -s -L $REPO_LIST_URL
-o $REPO_LIST
-
-function clone_git()
-{
- cat $REPO_LIST | grep -E '^(apps|core|tools)' | while read path; do
- repo=${path##*/}
- base=${path%/*.git}
- [ -d $base ] || mkdir -p $base
- if [ ! -e $path ]; then
- pushd $base >/dev/null || exit 1
- echo -e "$BROWN## clone $RED$CLONE_SCHEMA/$path$RESET" && git clone
$CLONE_SCHEMA/$path $repo || exit 1
- cd $repo
- git config --add user.name "$USR_NAME"
- git config --add user.email "$USR_EMAIL"
- popd >/dev/null
- echo $path >> $CLONED_LOG
- fi
- done
-}
-
-function update()
-{
- for path in * PROTO/* apps/* core/* tools/*; do
- [ -d "$path/.git" ] || continue
- echo -e "$BROWN## $RED$path$RESET"
- pushd $path >/dev/null || exit 1
- STASH=$(git stash | grep Saved | wc -l)
- echo "## $path" >> $LOG
- HEAD_PREV=$(git log --pretty=format:'%H')
- N=$(git svn info 2>/dev/null | grep enlightenment | wc -l)
- if [ $N -gt 0 ]; then
- echo $(pwd) && git checkout master && git svn rebase | tee -a $LOG
- else
- echo $(pwd) && git checkout master && git pull --rebase origin | tee
-a $LOG
- fi
- HEAD_AFTER=$(git log --pretty=format:'%H')
- echo "## $path" >> $FILES_LOG
- if [ "$HEAD_PREV" != "$HEAD_AFTER" ]; then
- echo "$path" >> $UPDATED_LOG
- echo -e " $BROWN updated$RESET"
- git show --pretty="format:" --name-only ${HEAD_PREV}.. | sort | uniq
| grep -v -e '^$' | cut -d " " -f 1 >> $FILES_LOG
- UPDATED="$UPDATED $path"
- fi
- [ $STASH -gt 0 ] && git stash pop
- popd >/dev/null
- done
-}
-
-clone_git
-update
-
-echo -e "\n"
-if [ -e $CLONED_LOG ]; then
- echo "cloned:"
- cat $CLONED_LOG | while read repo; do
- echo " * $repo"
- done
-fi
-if [ -e $UPDATED_LOG ]; then
- echo "updated:"
- cat $UPDATED_LOG | while read repo; do
- echo " * $repo"
- done
-fi
--
------------------------------------------------------------------------------
Own the Future-Intel® Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest.
Compete for recognition, cash, and the chance to get your game
on Steam. $5K grand prize plus 10 genre and skill prizes.
Submit your demo by 6/6/13. http://p.sf.net/sfu/intel_levelupd2d
