sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 79411 by Jeremy Blosser for review

From: Perforce Review Daemon <p4review AT smee.org>
To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 79411 by Jeremy Blosser for review
Date: Tue, 16 May 2006 22:50:01 +0100 (BST)

Change 79411 by jeremy_blosser@jeremy_blosser-shale on 2006/05/16 22:49:00

integrate

Affected files ...

... //sgl/grimoires/test/devel/git/BUILD#6 integrate
... //sgl/grimoires/test/devel/git/CONFIGURE#4 integrate
... //sgl/grimoires/test/devel/git/DEPENDS#8 integrate
... //sgl/grimoires/test/devel/git/HISTORY#44 integrate

Differences ...

==== //sgl/grimoires/test/devel/git/BUILD#6 (xtext) ====

@@ -1,4 +1,7 @@
+GIT_MAKE_OPTS="$GIT_MAKE_OPTS $OPTS" &&
+
make HOME="${TRACK_ROOT}/usr" $GIT_MAKE_OPTS &&
+
if [[ $GIT_DOCS == "y" ]]; then
make -C Documentation
fi

==== //sgl/grimoires/test/devel/git/CONFIGURE#4 (xtext) ====

@@ -1,6 +1,14 @@
-config_query GIT_DOCS "Would you like to make documentation?" y &&
-config_query_list GIT_SHA_OPT "Which sha option would you like to use?"
openssl mozilla
-persistent_add GIT_MAKE_OPTS
+config_query GIT_DOCS \
+ "Would you like to make documentation?" \
+ y &&
+
+config_query_list GIT_SHA_OPT \
+ "Which sha option would you like to use?" \
+ openssl \
+ mozilla &&
+
+persistent_add GIT_MAKE_OPTS &&
+
if [[ $GIT_SHA_OPT != openssl ]] ; then
GIT_MAKE_OPTS="$GIT_MAKE_OPTS NO_OPENSSL=true"
fi

==== //sgl/grimoires/test/devel/git/DEPENDS#8 (xtext) ====

@@ -1,11 +1,41 @@
if [[ $GIT_SHA_OPT == openssl ]] ; then
depends openssl
-fi &&
-depends curl &&
+fi &&
+
+optional_depends curl \
+ '' \
+ 'NO_CURL=true' \
+ 'For http(s) pull and push' &&
+optional_depends expat \
+ '' \
+ 'NO_EXPAT=true' \
+ 'For http(s) push' &&
+optional_depends python \
+ '' \
+ 'NO_PYTHON=true' \
+ 'For the recursive merge strategy' &&
+
+# these should become suggest_depends when possible
+optional_depends perl \
+ '' \
+ '' \
+ 'For arch/cvs/svn import and other advanced commands' &&
+optional_depends rsync \
+ '' \
+ '' \
+ 'For syncing repos with rsync' &&
+optional_depends rcs \
+ '' \
+ '' \
+ 'For RCS-based simple merge support' &&
+optional_depends dbd-sqlite \
+ '' \
+ '' \
+ 'For git-cvsserver' &&
+
+# these should become build_depends when possible
if [[ $GIT_DOCS == "y" ]]
then
- depends xmlto &&
+ depends xmlto &&
depends asciidoc
-fi &&
-optional_depends rsync '' '' 'For syncing repos with rsync' &&
-optional_depends rcs '' '' 'For more merging with rcs'
+fi

==== //sgl/grimoires/test/devel/git/HISTORY#44 (text) ====

@@ -1,3 +1,9 @@
+2006-05-16 Jeremy Blosser <jblosser-smgl AT firinn.org>
+ * CONFIGURE: Clean up formatting.
+ * DEPENDS: curl is optional, add expat, python, perl, and dbd-sqlite
as
+ optional.
+ * BUILD: Handle the optional build dependencies in the make command.
+
2006-05-15 David Brown <dmlb2000 AT gmail.com>
* DETAILS: updated 1.3.3

[SM-Commit] PERFORCE change 79411 by Jeremy Blosser for review, Perforce Review Daemon, 05/16/2006