Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (84cae099aa4c4f4f8b6d928c4a49c55218b35638)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (84cae099aa4c4f4f8b6d928c4a49c55218b35638)
  • Date: Sat, 6 Jul 2013 03:47:23 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

collab/subversion/BUILD | 8 ++------
collab/subversion/CONFIGURE | 5 ++++-
collab/subversion/DEPENDS | 2 +-
collab/subversion/HISTORY | 6 ++++++
collab/subversion/TRIGGERS | 2 +-
5 files changed, 14 insertions(+), 9 deletions(-)

New commits:
commit 84cae099aa4c4f4f8b6d928c4a49c55218b35638
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

subversion - various tweaks

diff --git a/collab/subversion/BUILD b/collab/subversion/BUILD
index b45e1f5..6d533c5 100755
--- a/collab/subversion/BUILD
+++ b/collab/subversion/BUILD
@@ -20,16 +20,12 @@ fi &&

if ! [[ -x configure ]]; then ./autogen.sh; fi &&

-if [[ "$(get_spell_provider $SPELL APR)" == "apr" ]] || \
- [[ "$(get_spell_provider $SPELL APU)" == "apr-util" ]]; then
CFLAGS="${CFLAGS} $(/usr/bin/apr-1-config --cppflags)" &&
OPTS="${OPTS} --disable-debug --disable-static --disable-mod-activation
--enable-shared --disable-experimental-libtool"
-else
- OPTS="${OPTS} --disable-debug --disable-static --disable-mod-activation
--enable-shared --disable-neon-version-check"
-fi &&

SWIG_LDFLAGS="${LDFLAGS}" &&
-OPTS="--enable-runtime-module-search $OPTS" default_build &&
+OPTS+=" $SVN_GIT" &&
+default_build &&

if [[ "$SVN_PERL" == y ]]; then
mkdir -p
subversion/bindings/swig/perl/native/blib/arch/auto/SVN/{_Client,_Delta,_Fs,_Ra,_Repos,_Wc}
&&
diff --git a/collab/subversion/CONFIGURE b/collab/subversion/CONFIGURE
index af6fcf8..15ee8f8 100755
--- a/collab/subversion/CONFIGURE
+++ b/collab/subversion/CONFIGURE
@@ -7,4 +7,7 @@ config_query SVN_PERL 'Install Subversion bindings for Perl?'
$(spell_ok_yesno p
config_query SVN_PYTHON 'Install Subversion bindings for Python?'
$(spell_ok_yesno python) &&
config_query SVN_RUBY 'Install Subversion bindings for Ruby?'
$(spell_ok_yesno ruby) &&
config_query SVN_JAVA 'Install Subversion bindings for JAVA?'
$(spell_ok_yesno JAVA) &&
-config_query SVN_SSL 'Enable SSL support?' n
+config_query_option SVN_GIT 'support git svn?' n \
+ '--disable-runtime-module-search' \
+ '--enable-runtime-module-search'
+
diff --git a/collab/subversion/DEPENDS b/collab/subversion/DEPENDS
index 79fff87..020fec4 100755
--- a/collab/subversion/DEPENDS
+++ b/collab/subversion/DEPENDS
@@ -21,7 +21,7 @@ then

if [[ "$SVN_PERL" == y ]]; then depends perl; fi &&
if [[ "$SVN_PYTHON" == y ]]; then depends python; fi &&
- if [[ "$SVN_RUBY" == y ]]; then depends ruby-1.8; fi &&
+ if [[ "$SVN_RUBY" == y ]]; then depends RUBY; fi &&
if [[ "$SVN_JAVA" == y ]]; then depends JAVA; fi
fi &&

diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index 1f788c7..c51d36e 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,3 +1,9 @@
+2013-07-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFIGURE, BUILD: remove obsolete options
+ add support for 'git svn commands'
+ * TRIGGERS: neon => serf
+ * DEPENDS: ruby-1.8 => RUBY, it now supports ruby-2.0
+
2013-07-03 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add serf, remove neon
* BUILD: remove make_single
diff --git a/collab/subversion/TRIGGERS b/collab/subversion/TRIGGERS
index f0b8223..4306c5a 100755
--- a/collab/subversion/TRIGGERS
+++ b/collab/subversion/TRIGGERS
@@ -1,3 +1,3 @@
on_cast apr-util check_self
-on_cast neon check_self
+on_cast serf check_self
on_cast db check_self



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (84cae099aa4c4f4f8b6d928c4a49c55218b35638), Treeve Jelbert, 07/06/2013

Archive powered by MHonArc 2.6.24.

Top of Page