diff options
| -rw-r--r-- | trunk/doc/CHANGELOG | 3 | ||||
| -rw-r--r-- | trunk/mkbuild/generic.mkSlackBuild | 25 | ||||
| -rw-r--r-- | trunk/mkbuild/model.mkbuild | 2 | ||||
| -rw-r--r-- | trunk/src/createpkg | 6 | ||||
| -rwxr-xr-x | trunk/src/mkbuild | 4 |
5 files changed, 25 insertions, 15 deletions
diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG index 780aa3e..63c6da0 100644 --- a/trunk/doc/CHANGELOG +++ b/trunk/doc/CHANGELOG @@ -5,6 +5,9 @@ simplepkg changelog ======== - generic.mkSlackBuild: - change PKG_SRC="$PWD...{ print $8 }'`" to ...{ print $NF }'`" + - change section name get_svn_source to svn_source + - createpkg: + - add LANG=en_US in SlackBuild command line 0.6pre26 ======== 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 diff --git a/trunk/src/createpkg b/trunk/src/createpkg index 5d28d17..557e3f6 100644 --- a/trunk/src/createpkg +++ b/trunk/src/createpkg @@ -33,7 +33,7 @@ function usage { # Help message echo -e "${red}NAME${normal} - createpkg - create Slackware packages + createpkg - create Slackware packages from SlackBuilds in Sarava repository ${red}SYNOPSIS createpkg${normal} [${green}OPTIONS${normal}] [${green}program${normal}] @@ -81,8 +81,8 @@ ${red}COPYRIGHT${normal} Copyright © 2006 Free Software Foundation, Inc. This is free software. You may redistribute copies of it under the terms of the GNU General Public License - <${yellow}http://www.gnu.org/licenses/gpl.html${normal}>. There is NO WARRANTY, to the - extent permitted by law." | more + <${yellow}http://www.gnu.org/licenses/gpl.html${normal}>. There is NO WARRANTY, + to the extent permitted by law." | more } function build_all_slackbuild { diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild index 053d5fe..07c56e8 100755 --- a/trunk/src/mkbuild +++ b/trunk/src/mkbuild @@ -38,7 +38,7 @@ ${red}SYNOPSIS ${red}DESCRIPTION${normal} [${green}mkbuild_file${normal}] input file with build rules and variables - Input OPTIONS: + Input ${green}OPTIONS${normal}: ${red}-a${normal}, ${red}--author${normal} ${green}<author_name>${normal} author name ${red}-ai${normal}, ${red}--author_initials${normal} ${green}<initials>${normal} @@ -375,7 +375,7 @@ function activate_sections { for i in $LIST_OFF; do set_status $i "off" $SLACKBUILD_TEMP done - [ $SVN_MOD -eq $on ] && set_status get_svn_source "on" $SLACKBUILD_TEMP + [ $SVN_MOD -eq $on ] && set_status svn_source "on" $SLACKBUILD_TEMP fi } |