diff options
| author | Andraž 'ruskie' Levstik | 2011-06-11 14:48:47 +0200 |
|---|---|---|
| committer | Andraž 'ruskie' Levstik | 2011-06-11 14:48:47 +0200 |
| commit | 9ee4dabf11004f6584a90e05b5bb71493330d25e (patch) | |
| tree | c3f1dd097d4530540c2bc75aa528881f248134ba /audio-drivers/oss | |
| parent | 55aa52f8ce5bd5f2fbeb88949111561bdc012507 (diff) | |
| parent | 66add8473510d299096d931ff5fe470ff5fa0025 (diff) | |
Merge branch 'master' of /home/ruskie/sourcemage/grimoire/
Conflicts:
audio-drivers/oss/HISTORY
Diffstat (limited to 'audio-drivers/oss')
| -rwxr-xr-x | audio-drivers/oss/DOWNLOAD | 37 | ||||
| -rw-r--r-- | audio-drivers/oss/HISTORY | 3 |
2 files changed, 5 insertions, 35 deletions
diff --git a/audio-drivers/oss/DOWNLOAD b/audio-drivers/oss/DOWNLOAD index fb763f9327..3f3d3c6f26 100755 --- a/audio-drivers/oss/DOWNLOAD +++ b/audio-drivers/oss/DOWNLOAD @@ -1,38 +1,5 @@ -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 [[ $OSS_BRANCH == scm ]]; 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}" + hg_download 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}" -else - acquire_src '' + default_download fi diff --git a/audio-drivers/oss/HISTORY b/audio-drivers/oss/HISTORY index cba34f2c55..e6a16741f5 100644 --- a/audio-drivers/oss/HISTORY +++ b/audio-drivers/oss/HISTORY @@ -1,6 +1,9 @@ 2011-06-11 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net> * DETAILS: switched scm to sf +2011-06-01 Ismael Luceno <ismael@sourcemage.org> + * DOWNLOAD: use hg_download + 2010-04-07 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net> * DETAILS: updated stable to 4.2 build 2002 scm is 4.3 now |