[Libreoffice-commits] .: 2 commits - build_env.in configure.in .gitignore solenv/bin

[Norbert Thiebaud]

 .gitignore                  |    5 -----
 build_env.in                |   11 -----------
 configure.in                |    3 +--
 solenv/bin/lo_find_src_root |   23 -----------------------
 solenv/bin/lo_proxy_start   |   31 -------------------------------
 5 files changed, 1 insertion(+), 72 deletions(-)

New commits:
commit fb301909112b310ac1a626a4a65f2942fccb2f7a
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Feb 18 18:40:42 2012 -0600

    do not hide patch-related file (.orig .rej)
    
    If you want to hide them, add the rule in you local git set-up.
    see git config --global core.excludesfiles fo more info

diff --git a/.gitignore b/.gitignore
index 47fca4e..441e4bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,7 +49,6 @@
 /aclocal.m4
 /autom4te.cache
 /autogen.lastrun
-/build_env
 /ChangeLog
 /config.guess
 /config.log
@@ -127,10 +126,6 @@ test/user-template/user/psprint/pspfontcache
 # LibreOffice lock files
 .~lock.*#
 
-# Everyone loves patching
-*.orig
-*.rej
-
 # Somepeople love debugging
 gdbtrace.log
 valgrind.log
commit 4d0a05e93902f9bb14418cc36e046131580b46d0
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Feb 18 18:37:13 2012 -0600

    build_env is obsolete now

diff --git a/build_env.in b/build_env.in
deleted file mode 100755
index bf1ace6..0000000
--- a/build_env.in
+++ /dev/null
@@ -1,11 +0,0 @@
-
-if hash lo_proxy_start 2>&- ; then
-    base_alias="lo_proxy_start"
-else
-    base_alias="@SRC_ROOT@/solenv/bin/lo_proxy_start"
-fi
-
-alias build="$base_alias build"
-alias deliver="$base_alias deliver"
-
-unset base_alias
diff --git a/configure.in b/configure.in
index 413dec0..5d408ff 100644
--- a/configure.in
+++ b/configure.in
@@ -3160,7 +3160,6 @@ if test "$cross_compiling" = "yes"; then
     mkdir CONF-FOR-BUILD
     tar cf - \
         bin/repo-list.in \
-        build_env.in \
         android/Bootstrap/local.properties.in \
         android/qa/sc/local.properties.in \
         android/qa/desktop/local.properties.in \
@@ -10963,7 +10962,7 @@ else
     echo > config_host.mk.last
 fi
 
-AC_CONFIG_FILES([config_host.mk ooo.lst bin/repo-list build_env android/Bootstrap/local.properties android/qa/sc/local.properties android/qa/desktop/local.properties])
+AC_CONFIG_FILES([config_host.mk ooo.lst bin/repo-list android/Bootstrap/local.properties android/qa/sc/local.properties android/qa/desktop/local.properties])
 AC_OUTPUT
 
 # touch the config timestamp file set_soenv.stamp
diff --git a/solenv/bin/lo_find_src_root b/solenv/bin/lo_find_src_root
deleted file mode 100755
index a91c847..0000000
--- a/solenv/bin/lo_find_src_root
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-#
-# (c) 2011  Norbert Thiebaud. License : GPLv3
-#
-# try to locate the SRC_ROOT based on the working directory
-# we search for first Repository.mk
-# in the current directoyr or its parent, all teh way to /
-# Ths is a heuristic. it works 'most of the times
-# but it could give false positive if you try hard enough
-#
-
-current=$(pwd)
-
-while [  "${current}" != "/" ] ; do
-    if [ -f ${current}/.src_root ] ; then
-        echo "${current}"
-        exit 0;
-    fi
-    current=$(dirname "${current}")
-done
-
-echo "Error cannot determine SRC_ROOT" 1>&2
-exit 1;
diff --git a/solenv/bin/lo_proxy_start b/solenv/bin/lo_proxy_start
deleted file mode 100755
index 8aabf28..0000000
--- a/solenv/bin/lo_proxy_start
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-
-bin_dir=$(dirname $0)
-action=$(basename $0)
-
-if [ "$action" = "lo_proxy_start" ] ; then
-    action=$1
-    shift
-fi
-
-if [ -z "$SRC_ROOT" ] ; then
-   SRC_ROOT=$($bin_dir/lo_find_src_root) || exit 1
-fi
-if [ -z "$SOLARINC" ] ; then
-    if [ -e "$SRC_ROOT/config_host.mk" ] ; then
-        . "$SRC_ROOT/config_host.mk"
-    fi
-    if [ -e "$SRC_ROOT/Env.Host.sh" ] ; then
-        . "$SRC_ROOT/Env.Host.sh"
-    fi
-fi
-
-if [ -e $SRC_ROOT/solenv/bin/$action.pl ] ; then
-   $SRC_ROOT/solenv/bin/$action.pl "$@"
-elif [ -e $SRC_ROOT/solenv/bin/$action.sh ] ; then
-   $SRC_ROOT/solenv/bin/$action.sh "$@"
-else
-   echo "$action.[pl|sh] not found" 2>&1
-   exit 1
-fi
-