Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (c3c130d0e775702d54ea317ebec60a5493f190a9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (c3c130d0e775702d54ea317ebec60a5493f190a9)
  • Date: Thu, 4 Dec 2008 08:29:40 -0600

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

libs/libixp/DETAILS | 6 ++---
libs/libixp/DOWNLOAD | 52
++++++++++++++++++++++++++++++++++++++++++---------
libs/libixp/HISTORY | 6 +++++
3 files changed, 52 insertions(+), 12 deletions(-)

New commits:
commit c3c130d0e775702d54ea317ebec60a5493f190a9
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libixp: better download handling

commit 20aae6a28abf209b192ae20dd4db6f2e451b03ab
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libixp: SOURCE was not declared

commit 068c629f06b1fb3dc70e2f530ef49207c667a295
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libixp: fixed hg url

diff --git a/libs/libixp/DETAILS b/libs/libixp/DETAILS
index 3ca716f..0916edb 100755
--- a/libs/libixp/DETAILS
+++ b/libs/libixp/DETAILS
@@ -1,17 +1,17 @@
SPELL=libixp
if [ x"$LIBIXP_HG" == x"y" ]; then
VERSION=hg
-SOURCE_URL[0]=http://www.suckless.org/hg.rc/libixp
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_URL[0]=hg_http://code.suckless.org/hg/libixp:$SPELL-$VERSION
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
else
VERSION=0.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.suckless.org/download/${SOURCE}

SOURCE_HASH=sha512:6b87831858d9df9cf12bea7c1344b16742b38e8afd06d71f369249253c368b624264b95cdcdd87a160fab3ec9f671a08a997786c5dbe879d9e0f430f48a692d9
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://libs.suckless.org
ENTERED=20061230
LICENSE[0]=GPL
diff --git a/libs/libixp/DOWNLOAD b/libs/libixp/DOWNLOAD
index ecd5162..c163c82 100755
--- a/libs/libixp/DOWNLOAD
+++ b/libs/libixp/DOWNLOAD
@@ -1,10 +1,44 @@
-if [ "x$LIBIXP_HG" != "xy" ]; then
- default_download
+#once the hg download handler hits stable sorcery this DOWNLOAD script would
+#only need to be removed, SOURCE_URL is compatible with the planned hg
handler
+
+function my_url_hg_http_crack() {
+
+ URL=$(url_strip_prefix "$1" hg_http)
+ HG_ROOT=$(echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#")
+ HG_ROOT=http://$HG_ROOT
+ local HG_DIRECTORY_TAG=$(echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#")
+ HG_DIRECTORY=$(echo $HG_DIRECTORY_TAG | cut -d : -f2)
+ local HG_TAGNAME=$(echo $HG_DIRECTORY_TAG | cut -d : -f3)
+ HG_TAG=${HG_TAGNAME:=default}
+
+}
+if [[ $LIBIXP_HG != y ]]; then
+ default_download &&
return $?
-fi &&
-message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}" &&
-hg clone http://suckless.org/hg.rc/libixp &&
-tar -zcf ${SOURCE} ${SPELL} &&
-cp ${SOURCE} ${SOURCE_CACHE}/${SOURCE} &&
-rm ${SOURCE} &&
-message "${MESSAGE_COLOR}HG Checkout complete...${DEFAULT_COLOR}"
+fi &&
+
+message "${MESSAGE_COLOR}Starting Mercurial checkout of" \
+ "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}" &&
+my_url_hg_http_crack $SOURCE_URL &&
+if [[ -f $SOURCE_CACHE/$SOURCE ]]; then
+ message "${MESSAGE_COLOR}Previous source found
unpacking...${DEFAULT_COLOR}" &&
+ tar -jxf $SOURCE_CACHE/$SOURCE &&
+ message "${MESSAGE_COLOR}Running hg pull...${DEFAULT_COLOR}" &&
+ ( cd $HG_DIRECTORY &&
+ echo hg pull $HG_ROOT &&
+ hg pull $HG_ROOT &&
+ echo hg update $HG_TAG &&
+ hg update $HG_TAG )
+else
+ message "${MESSAGE_COLOR}Running hg clone...${DEFAULT_COLOR}"
+ echo hg clone $HG_ROOT $HG_DIRECTORY
+ hg clone $HG_ROOT $HG_DIRECTORY &&
+ ( cd $HG_DIRECTORY &&
+ echo hg update $HG_TAG &&
+ hg update $HG_TAG )
+fi &&
+message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}" &&
+tar -jcf $SOURCE $HG_DIRECTORY &&
+cp $SOURCE $SOURCE_CACHE/$SOURCE &&
+rm $SOURCE &&
+message "${MESSAGE_COLOR}Mercurial checkout complete...${DEFAULT_COLOR}"
diff --git a/libs/libixp/HISTORY b/libs/libixp/HISTORY
index 0d702f5..5454477 100644
--- a/libs/libixp/HISTORY
+++ b/libs/libixp/HISTORY
@@ -1,3 +1,9 @@
+2008-12-04 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DOWNLOAD: use the better one from mutt
+ * DETAILS: fixed hg url
+ added removed SOURCE declaration
+ fixed for the new DOWNLOAD
+
2007-12-05 Arjan Bouter <abouter AT sourcemage.org>
* CONFIGURE: devel version is no longer needed for wmii




  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (c3c130d0e775702d54ea317ebec60a5493f190a9), Jaka Kranjc, 12/04/2008

Archive powered by MHonArc 2.6.24.

Top of Page