aboutsummaryrefslogtreecommitdiff
path: root/trunk/mkbuild
diff options
context:
space:
mode:
authorrudson <rudson@04377dda-e619-0410-9926-eae83683ac58>2008-05-04 01:29:31 +0000
committerrudson <rudson@04377dda-e619-0410-9926-eae83683ac58>2008-05-04 01:29:31 +0000
commitc5a289b1521043d4e5da7e3b2f0d057715216c06 (patch)
treecdcc66b7497139cc21fce3a90403b3e37e159e1d /trunk/mkbuild
parent6db84bf6cb921f01b483218fd2bc33cfb55471df (diff)
downloadsimplepkg-c5a289b1521043d4e5da7e3b2f0d057715216c06.tar.gz
simplepkg-c5a289b1521043d4e5da7e3b2f0d057715216c06.tar.bz2
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@505 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk/mkbuild')
-rw-r--r--trunk/mkbuild/generic.mkSlackBuild25
-rw-r--r--trunk/mkbuild/model.mkbuild2
2 files changed, 17 insertions, 10 deletions
diff --git a/trunk/mkbuild/generic.mkSlackBuild b/trunk/mkbuild/generic.mkSlackBuild
index 5c8a8db..19fd8dd 100644
--- a/trunk/mkbuild/generic.mkSlackBuild
+++ b/trunk/mkbuild/generic.mkSlackBuild
@@ -115,6 +115,22 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! [[DECOMPRESSOR]] [[DECOMPRESSOR TEST FLAG]] "$S
fi
</download_source>
+<svn_source> off
+# Get svn source code
+[ "`find "$SRC_DIR/" -name .svn`" != "" ] && SVN_ACTION="update" || SVN_ACTION="checkout"
+cd "$SRC_DIR"
+svn $SVN_ACTION [[DOWNLOAD FOLDER URL]] $PKG_SRC || exit $ERROR_VCS
+SND_DIR="`ls -l | awk '/^d/ { print $NF }'`"
+cd $SND_DIR
+PKG_VERSION="`svn info | awk '/Last Changed Rev:/ { print $4 }'`_svn"
+
+# Copy svn source
+cd "$PKG_WORK"
+cp -a $SRC_DIR/* .
+PKG_SRC="$PWD/$SND_DIR"
+cd "$PKG_SRC"
+</svn_source>
+
<md5sum_download_and_check_0> off
MD5SUM_SRC="$(md5sum "$SRC_DIR/$SRC" | cut -d " " -f 1)"
MD5SUM_URL="[[MD5SUM CODE]]"
@@ -188,15 +204,6 @@ PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
cd "$PKG_SRC"
</untar_source>
-<get_svn_source> off
-# Get svn source code
-cd "$PKG_WORK"
-svn checkout [[DOWNLOAD FOLDER URL]] $PKG_SRC || exit $ERROR_VCS
-PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
-cd "$PKG_SRC"
-[ -e autogen.sh ] && . ./autogen.sh
-</get_svn_source>
-
<patch_source> off
# Patch source
patches="[[PATCH FILES]]
diff --git a/trunk/mkbuild/model.mkbuild b/trunk/mkbuild/model.mkbuild
index 848ef50..d030ea4 100644
--- a/trunk/mkbuild/model.mkbuild
+++ b/trunk/mkbuild/model.mkbuild
@@ -128,11 +128,11 @@
on: start_structure
off: create_build_user_and_group
on: download_source
+off: svn_source
off: md5sum_download_and_check_0
off: md5sum_download_and_check_1
off: gpg_signature_check
on: untar_source
-off: get_svn_source
off: patch_source
on: configure
on: make_package