Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master quill by Andraž Levstik (52f0e99c7830e1c552e0c7a6140fc2a7f3b3802b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andraž Levstik <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master quill by Andraž Levstik (52f0e99c7830e1c552e0c7a6140fc2a7f3b3802b)
  • Date: Fri, 27 Apr 2007 10:02:43 -0500

GIT changes to master quill by Andraž Levstik <ruskie AT mages.ath.cx>:

install.sh | 2 -
usr/bin/quill | 10 ++++----
var/lib/quill/ChangeLog | 10 ++++++++
var/lib/quill/modules/libcore | 2 -
var/lib/quill/modules/libdetails | 43
++++++++++++++++++++++++-------------
var/lib/quill/modules/libpre_build | 15 ++++++++----
var/lib/quill/version | 2 -
7 files changed, 56 insertions(+), 28 deletions(-)

New commits:
commit 52f0e99c7830e1c552e0c7a6140fc2a7f3b3802b
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

forgot version

commit 21e7c86b369e5104a49af3eebc41b7716f60839f
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

adding zip file source dir support, try to detect version of zips and
rpms as well, don't fail if no source file, don't check for source dir
if no source file

diff --git a/install.sh b/install.sh
index 18fa000..4500ed6 100755
--- a/install.sh
+++ b/install.sh
@@ -14,7 +14,7 @@ if [[ "$1" == "install" ]]; then
mkdir -vp $INSTALL_ROOT/usr/bin
mkdir -vp $INSTALL_ROOT/usr/share/doc/quill
mkdir -vp $INSTALL_ROOT/var/lib/quill/modules
- cp -r usr var $INSTALL_ROOT/
+ cp -vr usr var $INSTALL_ROOT/
fi

if [[ "$1" == "uninstall" ]]; then
diff --git a/usr/bin/quill b/usr/bin/quill
index 7bf79bc..d550ccd 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -374,18 +374,18 @@ else

if [[ "${BUILDISON}" == "BUILD, " ]]
then
- [[ -e $QUILL_TMP_DIR/${SPELL_SRC_FILE:-uag1au234gaugua} ]] ||
- { error_msg "Bad or missing source: $SPELL_SRC_FILE"; exit 2; }
-
+ if [[ -e $QUILL_TMP_DIR/${SPELL_SRC_FILE:-uag1au234gaugua} ]]
+ then
+ add_build
#message "Quill can try to autodetect the build system the package is
using."
#message "However for this the source tarball needs to be extracted (can
take a while)."
#if query "Do you want quill to try to autodetect the build system?" n
#then
# BS=$(detect_build_system)
# implement_build_system $BS
- #else
+ else
add_build
- #fi
+ fi
fi

if [[ "${INSTALLISON}" == "INSTALL, " ]]
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index 2fba39f..10a8a1b 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,13 @@
+2007-04-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * quill: don't flunk if missing source file
+ * libcore: non-verbose creation of dir
+ * libdetails: support for grabing version from zips, rpms
+ grab source dir from zip file
+ check if we have the source tarball else skip it
+ * libpre_build: if PRE_BUILD exists copy it over
+ * install.sh: be verbose when installing
+ * version: 0.2.5-rc1
+
2007-04-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libcore: fix name normalisation, original is stored in
QUILL_ORIG_TARGET
* quill: use the non-normalised target for cpan
diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index 3523a5d..c153c98 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -128,7 +128,7 @@ QUA
exit 0
else
. $QUILL_QUILLRC
- mkdir -vp $QUILL_SPELL_DIR
+ mkdir -p $QUILL_SPELL_DIR
fi
}

diff --git a/var/lib/quill/modules/libdetails
b/var/lib/quill/modules/libdetails
index 20781bc..46e0897 100644
--- a/var/lib/quill/modules/libdetails
+++ b/var/lib/quill/modules/libdetails
@@ -135,7 +135,7 @@ fi
function parse_spell_source_file_info(){
SPELL_SRC_FILE=$(expr "$SPELL_SRC_URL" : '.*/\(.*\)')
SPELL_SANITIZED_FILE_NAME=$(expr "$SPELL_SRC_FILE" : '\(.*\)[-|_][0-9]')
- SPELL_VERSION=$(expr "$SPELL_SRC_FILE" :
"${SPELL_SANITIZED_FILE_NAME}[-|_]\(.*\)\.t")
+ SPELL_VERSION=$(expr "$SPELL_SRC_FILE" :
"${SPELL_SANITIZED_FILE_NAME}[-|_]\(.*\)\.[t|z|r]")
}

#---
@@ -209,20 +209,33 @@ fi
#---
function hunt_src_dir(){
local compressor
- message "Checking for the source directory..."
- compressor=$(guess_compressor ${QUILL_TMP_DIR}/${SPELL_SRC_FILE})
-
- case "$compressor" in
- bzip2|gzip|compress*|tar) true ;;
- *) SPELL_SRC_DIR=${SPELL_NAME}-${SPELL_VERSION}
- message "Unsupported format..."
- return 2 ;;
- esac
- SPELL_SRC_DIR=$(tar tf "${QUILL_TMP_DIR}/${SPELL_SRC_FILE}" |
- sed -n "1 s=/.*$==p") ||
- { error_msg "Error: getting path from tarball" && return 1; }
-
- message "Done.\n"
+ if [[ ! -e ${QUILL_TMP_DIR}/${SPELL_SRC_FILE} ]] ; then
+ SPELL_SRC_DIR=${SPELL_NAME}-${SPELL_VERSION}
+ error_msg "Error: no tarball, setting default SPELL-VERSION construct"
+ return 1
+ else
+ message "Checking for the source directory..."
+ compressor=$(guess_compressor ${QUILL_TMP_DIR}/${SPELL_SRC_FILE})
+ case "$compressor" in
+ bzip2|gzip|compress*|tar) SPELL_SRC_DIR=$(tar tf
"${QUILL_TMP_DIR}/${SPELL_SRC_FILE}" | sed -n "1 s=/.*$==p") ||
+ { error_msg "Error: getting path from
tarball" && return 1; } ;;
+ Zip) SPELL_SRC_DIR=$(zipinfo -1
"${QUILL_TMP_DIR}/${SPELL_SRC_FILE}" | sed -n "1 s=/.*$==p") ||
+ { error_msg "Error: getting path from
zipfile" && return 1; }
+ if [[ $SPELL_SRC_DIR == "" ]] ; then
+
SPELL_SRC_DIR=${SPELL_NAME}-${SPELL_VERSION}
+ PREBUILDISON="PRE_BUILD, "
+ rm -f
${QUILL_TMP_DIR}/${SPELL_NAME}-PRE_BUILD
+ touch
${QUILL_TMP_DIR}/${SPELL_NAME}-PRE_BUILD
+ echo "mk_source_dir \$SOURCE_DIRECTORY
&&" >> ${QUILL_TMP_DIR}/${SPELL_NAME}-PRE_BUILD
+ echo "cd \$SOURCE_DIRECTORY &&" >>
${QUILL_TMP_DIR}/${SPELL_NAME}-PRE_BUILD
+ echo "unpack_file ''" >>
${QUILL_TMP_DIR}/${SPELL_NAME}-PRE_BUILD
+ fi ;;
+ *) SPELL_SRC_DIR=${SPELL_NAME}-${SPELL_VERSION}
+ message "Unsupported format..."
+ return 2 ;;
+ esac
+ message "Done.\n"
+ fi
}

#---
diff --git a/var/lib/quill/modules/libpre_build
b/var/lib/quill/modules/libpre_build
index 52b69fa..3ac97be 100644
--- a/var/lib/quill/modules/libpre_build
+++ b/var/lib/quill/modules/libpre_build
@@ -16,12 +16,17 @@ function query_spell_pre_build()
## @Globals EDITOR
function add_pre_build()
{
- touch PRE_BUILD
- if query "Do you want the default_pre_build function dumped into the
PRE_BUILD file" "n"
- then
- dump_default_function pre_build | sed "s:&&:\&\&\n:g" > PRE_BUILD
+ if [[ -e ${QUILL_TMP_DIR}/${SPELL_NAME}-PRE_BUILD ]] ; then
+ cp ${QUILL_TMP_DIR}/${SPELL_NAME}-PRE_BUILD \
+ ${QUILL_SPELL_DIR}/${SPELL_NAME}/PRE_BUILD
else
- echo "default_pre_build &&" > PRE_BUILD
+ touch PRE_BUILD
+ if query "Do you want the default_pre_build function dumped into the
PRE_BUILD file" "n"
+ then
+ dump_default_function pre_build | sed "s:&&:\&\&\n:g" > PRE_BUILD
+ else
+ echo "default_pre_build &&" > PRE_BUILD
+ fi
fi
$EDITOR PRE_BUILD
}
diff --git a/var/lib/quill/version b/var/lib/quill/version
index 3a4036f..13b471d 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.2.5
+0.2.5-rc1



  • [SM-Commit] GIT changes to master quill by Andraž Levstik (52f0e99c7830e1c552e0c7a6140fc2a7f3b3802b), Andraž Levstik, 04/27/2007

Archive powered by MHonArc 2.6.24.

Top of Page