[SM-Commit] GIT changes to master grimoire by Andraž Levstik (6aad976f54e39164d6edd2a2f118572f37551e97)

Andraž Levstik scm at sourcemage.org
Sat Jan 3 10:13:46 EST 2009


GIT changes to master grimoire by Andraž Levstik <ruskie at codemages.net>:

 python-pypi/pymsnt/DEPENDS   |    8 ++---
 python-pypi/pymsnt/DETAILS   |   16 ++++++++++
 python-pypi/pymsnt/DOWNLOAD  |   66 +++++++++++++++++++++++++++++++++++++++++++
 python-pypi/pymsnt/HISTORY   |    6 +++
 python-pypi/pymsnt/PREPARE   |    8 +++++
 python-pypi/pymsnt/PRE_BUILD |    6 +++
 6 files changed, 105 insertions(+), 5 deletions(-)

New commits:
commit 5a7a7cf754c7df2f412e2662f69ed768ca58983b
Author: Andraž Levstik <ruskie at codemages.net>
Commit: Andraž Levstik <ruskie at codemages.net>

    pymsnt: added scm version

diff --git a/python-pypi/pymsnt/DEPENDS b/python-pypi/pymsnt/DEPENDS
index 18ee651..e51957f 100755
--- a/python-pypi/pymsnt/DEPENDS
+++ b/python-pypi/pymsnt/DEPENDS
@@ -1,7 +1,7 @@
+if [[ $PYMSNT_SCM == y ]]; then
+depends mercurial
+fi &&
 depends twisted &&
 depends pyopenssl &&
 depends pycrypto &&
-depends python &&
-optional_depends pyepoll "" "" "For epool reactor support" &&
-optional_depends pil "" "" "For better avatar support"
-
+depends python
diff --git a/python-pypi/pymsnt/DETAILS b/python-pypi/pymsnt/DETAILS
index 4b9660a..dc27d7a 100755
--- a/python-pypi/pymsnt/DETAILS
+++ b/python-pypi/pymsnt/DETAILS
@@ -1,9 +1,25 @@
            SPELL=pymsnt
+if [[ $PYMSNT_SCM == y ]]; then
+  if [[ "$PYMSNT_SCM_AUTOUPDATE" == "y" ]]
+  then
+         VERSION=$(date +%Y%m%d)
+  else
+         VERSION=scm
+  fi
+          SOURCE=$SPELL-scm.tar.bz2
+         SOURCE2=$SPELL-twistfix-scm.tar.bz2
+   SOURCE_URL[0]=hg_http://hg.sharesource.org/pymsnt:$SPELL-scm
+  SOURCE2_URL[0]=hg_http://hg.sharesource.org/pymsnt-twistfix:$SPELL-twistfix-scm
+   SOURCE_IGNORE=volatile
+  SOURCE2_IGNORE=volatile
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
+else
          VERSION=0.11.3
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://delx.net.au/projects/${SPELL}/tarballs/${SOURCE}
      SOURCE_HASH=sha512:57ed58c51ddaceb877e22c0703f59299fd1e75add6de9b6d937025a12f9ea669c24c8de70a5995500101a0537dd3549676df475d87df63ec29d6c773a2a31563
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+fi
         WEB_SITE="http://delx.net.au/projects/pymsnt"
       LICENSE[0]=GPL
          ENTERED=20090102
diff --git a/python-pypi/pymsnt/DOWNLOAD b/python-pypi/pymsnt/DOWNLOAD
new file mode 100755
index 0000000..ce3191a
--- /dev/null
+++ b/python-pypi/pymsnt/DOWNLOAD
@@ -0,0 +1,66 @@
+set +x
+function url_hg_crack() {
+
+  URL=$(url_strip_prefix "$1" hg_http)
+  HG_ROOT=$(echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#")
+  local HG_MODULE_TAG=$(echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#")
+  HG_MODULE=$(echo $HG_MODULE_TAG | cut -d : -f2)
+  local HG_TAGNAME=$(echo $HG_MODULE_TAG | cut -d : -f3)
+  HG_TAG=${HG_TAGNAME:-tip}
+
+}
+
+if [[ $PYMSNT_SCM == y ]]; then
+url_hg_crack ${SOURCE_URL}
+message "${MESSAGE_COLOR}Starting Mercurial checkout of" \
+        "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}"  &&
+if [[ -f $SOURCE_CACHE/${SOURCE} ]]
+then
+  message "${MESSAGE_COLOR}Previous source found unpacking...${DEFAULT_COLOR}"  &&
+  tar -jxf $SOURCE_CACHE/${SOURCE}  &&
+  cd ${HG_MODULE}  &&
+  message "${MESSAGE_COLOR}Running Mercurial update...${DEFAULT_COLOR}"  &&
+  hg pull -u -r ${HG_TAG}
+  cd ..
+  message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
+else
+  message "${MESSAGE_COLOR}Running initial Mercurial clone...${DEFAULT_COLOR}"  &&
+  hg clone -r${HG_TAG} "http://${HG_ROOT}" ${HG_MODULE}
+  message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
+fi   &&
+message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}" &&
+tar -jcf                                                        \
+    ${SOURCE}                                                   \
+    ${HG_MODULE}                                                &&
+cp  ${SOURCE} ${SOURCE_CACHE}/${SOURCE}                         &&
+rm  ${SOURCE}                                                   &&
+message "${MESSAGE_COLOR}Mercurial checkout complete...${DEFAULT_COLOR}" &&
+# cleaning for the next one
+unset URL HG_ROOT HG_MODULE HG_TAG  &&
+url_hg_crack ${SOURCE2_URL} &&
+message "${MESSAGE_COLOR}Starting Mercurial checkout of" \
+        "${FILE_COLOR}${SOURCE2}${MESSAGE_COLOR}...${DEFAULT_COLOR}"  &&
+if [[ -f $SOURCE_CACHE/${SOURCE2} ]]
+then
+  message "${MESSAGE_COLOR}Previous source found unpacking...${DEFAULT_COLOR}"  &&
+  tar -jxf $SOURCE_CACHE/${SOURCE2}  &&
+  cd ${HG_MODULE}  &&
+  message "${MESSAGE_COLOR}Running Mercurial update...${DEFAULT_COLOR}"  &&
+  hg pull -u -r ${HG_TAG}
+  cd ..
+  message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
+else
+  message "${MESSAGE_COLOR}Running initial Mercurial clone...${DEFAULT_COLOR}"  &&
+  hg clone -r${HG_TAG} "http://${HG_ROOT}" ${HG_MODULE}
+  message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
+fi   &&
+message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}" &&
+tar -jcf                                                        \
+    ${SOURCE2}                                                  \
+    ${HG_MODULE}                                                &&
+cp  ${SOURCE2} ${SOURCE_CACHE}/${SOURCE2}                       &&
+rm  ${SOURCE2}                                                  &&
+message "${MESSAGE_COLOR}Mercurial checkout complete...${DEFAULT_COLOR}"
+else
+  acquire_src ''
+fi
diff --git a/python-pypi/pymsnt/HISTORY b/python-pypi/pymsnt/HISTORY
index eec683a..50d3fa9 100644
--- a/python-pypi/pymsnt/HISTORY
+++ b/python-pypi/pymsnt/HISTORY
@@ -1,5 +1,9 @@
 2009-01-03 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
-	* DEPENDS: two new optionals
+	* PRE_BUILD: added for SCM version
+	* DETAILS: SCM version
+	* DOWNLOAD: needed for hg_http
+	* PREPARE: added for scm version
+	* DEPENDS: added mercurial for SCM version
 
 2009-01-02 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* BUILD, DEPENDS, DETAILS, INSTALL: spell created
diff --git a/python-pypi/pymsnt/PREPARE b/python-pypi/pymsnt/PREPARE
new file mode 100755
index 0000000..26ec10a
--- /dev/null
+++ b/python-pypi/pymsnt/PREPARE
@@ -0,0 +1,8 @@
+config_query PYMSNT_SCM "Do you want to use SCM version?" n
+if [[ "$PYMSNT_SCM" == "y" ]]
+then
+config_query PYMSNT_SCM_AUTOUPDATE \
+          "Automaticaly update the spell on sorcery queue/system-update?" \
+          "n"
+fi
+
diff --git a/python-pypi/pymsnt/PRE_BUILD b/python-pypi/pymsnt/PRE_BUILD
new file mode 100755
index 0000000..e2440a5
--- /dev/null
+++ b/python-pypi/pymsnt/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+if [[ $PYMSNT_SCM == y ]]; then
+unpack_file 2 &&
+mv pymsnt-twistfix-scm/twistfix src/
+fi



More information about the SM-Commit mailing list