From 962a86cf11f2904b942a35564a876f5c4aad3527 Mon Sep 17 00:00:00 2001 From: rudson Date: Mon, 7 Apr 2008 05:35:12 +0000 Subject: git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@490 04377dda-e619-0410-9926-eae83683ac58 --- trunk/src/createpkg | 63 ++++++++++++++++++++++++++++++------- trunk/src/mkbuild | 91 +++++++++++++++++++++++++++-------------------------- 2 files changed, 98 insertions(+), 56 deletions(-) (limited to 'trunk/src') diff --git a/trunk/src/createpkg b/trunk/src/createpkg index e5fd73a..5d28d17 100644 --- a/trunk/src/createpkg +++ b/trunk/src/createpkg @@ -27,21 +27,62 @@ # Createpkg functions #--------------------------------------------------- -CREATEPKG_VERSION="1.1.10" +CREATEPKG_VERSION="1.1.11" function usage { # Help message - eecho $commun "Createpkg version $CREATEPKG_VERSION\n" - eecho $commun "Usage: createpkg [--install/-i] package_name" - eecho $commun " createpkg --all/-a" - eecho $commun " createpkg --no-deps/-np package_name" - eecho $commun " createpkg --search/-s package_name" - eecho $commun " createpkg --info/-f package_name" - eecho $commun " createpkg --list/-l" - eecho $commun " createpkg --sync" - eecho $commun " createpkg --help/-h" - exit + echo -e "${red}NAME${normal} + createpkg - create Slackware packages + +${red}SYNOPSIS + createpkg${normal} [${green}OPTIONS${normal}] [${green}program${normal}] + +${red}DESCRIPTION${normal} + [${green}program${normal}] name to build/search + + Input ${green}OPTIONS${normal}: + ${red}-i${normal}, ${red}--install${normal} ${green}${normal} + create the package ${green}${normal} and install + ${red}-a${normal}, ${red}--all${normal} + create all packages and install + ${red}-np${normal}, ${red}--no-deps${normal} + does not solve dependences + ${red}-s${normal}, ${red}--search${normal} + search for a ${green}${normal} + ${red}-f${normal}, ${red}--info${normal} ${green}${normal} + show description and dependences of the program + ${red}-l${normal}, ${red}--list${normal} + list all the SlackBuilds + ${red}--sync${normal} + synchronize SlackBuilds repository + ${red}-h${normal}, ${red}--help${normal} + show this help + +${red}EXAMPLES${normal} + ${red}createpkg -i scilab${normal} + build and install scilab package + ${red}createpkg -s at*${normal} + search for all at* SlackBuilds scripts (at-spi, atk, ...) + ${red}createpkg --info pyrex${normal} + show pyrex description and dependences + +${red}AUTHOR${normal} + Written by ${blue}Rudson R. Alves${normal} + +${red}AVAILABILITY${normal} + by svn: ${yellow}svn checkout svn://slack.sarava.org/simplepkg${normal} + this mkbuild is found in branches/0.6/ + +${red}REPORTING BUGS${normal} + Report bugs to <${blue}rudsonalves[at]rra.etc.br${normal}> + +${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 } function build_all_slackbuild { diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild index 809fbcd..2cc5e91 100755 --- a/trunk/src/mkbuild +++ b/trunk/src/mkbuild @@ -19,7 +19,7 @@ # Based in model generic.SlackBuild of Luiz # # Version: -PROG_VERSION=1.2.2 +PROG_VERSION=1.2.4 PROG_NAME=`basename $0` #-------------------------------------------------------------------- @@ -29,92 +29,90 @@ function mkbuild_use() { # mkbuild help function - echo " -NAME - mkbuild - create SlackBuild script from .mkbuild input file + echo -e "${red}NAME${normal} + mkbuild - create SlackBuild script from ${green}.mkbuild${normal} input file -SYNOPSIS - mkbuild [OPIONS] [mkbuild_file] +${red}SYNOPSIS + mkbuild${normal} [${green}OPTIONS${normal}] [${green}mkbuild_file${normal}] -DESCRIPTION - input file with build rules and variables +${red}DESCRIPTION${normal} + [${green}mkbuild_file${normal}] input file with build rules and variables - Input options: - -a, --author + Input OPTIONS: + ${red}-a${normal}, ${red}--author${normal} ${green}${normal} author name - -ai, --author_initials + ${red}-ai${normal}, ${red}--author_initials${normal} ${green}${normal} author signature - -bn, --build-number + ${red}-bn${normal}, ${red}--build-number${normal} change build number - -cs, --const_string + ${red}-cs${normal}, ${red}--const_string${normal} ${green}${normal} construction string to source name - -j, --jobs + ${red}-j${normal}, ${red}--jobs${normal} ${green}${normal} Number of jobs to run simultaneously - -md, --model + ${red}-md${normal}, ${red}--model${normal} ${green}${normal} SlackBuild model file - -npss, --nps-strip + ${red}-npss${normal}, ${red}--nps-strip${normal} Number of prefix slashes to strip - -pf, --patch-files + ${red}-pf${normal}, ${red}--patch-files${normal} List of patch files - -pn, --pkg_name + ${red}-pn${normal}, ${red}--pkg_name${normal} ${green}${normal} package name - --prefix + ${red}--prefix${normal} ${normal} Prefix install directory - -pv, --pkg_version + ${red}-pv${normal}, ${red}--pkg_version${normal} ${green}${normal} package version - -sn, --src_name + ${red}-sn${normal}, ${red}--src_name${normal} ${green}${normal} source name - -u, --url + ${red}-u${normal}, ${red}--url${normal} ${green}${normal} url address to source Program options: - -d, --debug + ${red}-d${normal}, ${red}--debug${normal} enable debug mode - -cs, --commit-slackbuild + ${red}-cs${normal}, ${red}--commit-slackbuild${normal} commit SlackBuilds in local svn SlackBuild tree - -cm, --commit-mkbuild + ${red}-cm${normal}, ${red}--commit-mkbuild${normal} commit .mkbuild in local svn mkbuild tree - -c, --commit-all + ${red}-c${normal}, ${red}--commit-all${normal} commit SlackBuild and .mkbuild files in local svn tree - -h, --help + ${red}-h${normal}, ${red}--help${normal} this help mesage - -n, --new + ${red}-n${normal}, ${red}--new${normal} ${green}${normal} start a new mkbuild configure file - --sync + ${red}--sync${normal} synchronize mkbuilds repository - -v, --version + ${red}-v${normal}, ${red}--version${normal} program version - -V, --verbose + ${red}-V${normal}, ${red}--verbose${normal} print debug information -EXAMPLES - mkbuild -c pyrex.mkbuild +${red}EXAMPLES${normal} + ${red}mkbuild -c pyrex.mkbuild${normal} build pyrex.SlackBuild and commit .mkbuild and .SlackBuild in Slack.Sarava local tree. - mkbuild -a \"Jose Araujo\" -ai \"ja\" -n pyrex + ${red}mkbuild -a \"Jose Araujo\" -ai \"ja\" -n pyrex${normal} make a basic pyrex.mkbuild with author name \"Jose Araujo\" and author signature \"ja\". - mkbuild --prefix /usr/local pyrex.mkbuild + ${red}mkbuild --prefix /usr/local pyrex.mkbuild${normal} build pyrex.SlackBuild with prefix /usr/local and pyrex.mkbuild variables and options definitions. -AUTHOR - Written by Rduson R. Alves +${red}AUTHOR${normal} + Written by ${blue}Rudson R. Alves${normal} -AVAILABILITY - by svn: svn checkout svn://slack.sarava.org/simplepkg +${red}AVAILABILITY${normal} + by svn: ${yellow}svn checkout svn://slack.sarava.org/simplepkg${normal} this mkbuild is found in branches/0.6/ -REPORTING BUGS - Report bugs to +${red}REPORTING BUGS${normal} + Report bugs to <${blue}rudsonaalves[at]rra.etc.br${normal}> -COPYRIGHT +${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 - . There is NO WARRANTY, to the - extent permitted by law. -" | less + <${yellow}http://www.gnu.org/licenses/gpl.html${normal}>. There is NO WARRANTY, + to the extent permitted by law." | more } function set_parameters { @@ -384,6 +382,7 @@ function build_slackbuild { # Remove sections names sed -i '/^<.*$/ d' $SLACKBUILD_TEMP # Remove clear lines + # isto pode ser feito com "cat -s SLACKBUILD_TEMP ..." sed -i ':i ; $! N; s/\n/Ø/ ; t i ; s/Ø\{3,\}/ØØ/g ; s/Ø/\n/g' $SLACKBUILD_TEMP # Remove from frist line do #!/... line sed '1,/^#\!/ {/^#\!/ b; d }' $SLACKBUILD_TEMP > $SLACKBUILD @@ -841,9 +840,11 @@ if [ ! -z $MKBUILD_NAME ]; then # PATCH FILES PATCH_FILES=`validate_parameter "$PATCH_FILES" "PATCH FILES" ""` + [ $VERBOSE -eq $on ] && echo "[[PATCH_FILES]]=\"$PATCH_FILES\"" # Strip the smallest prefix containing num leading slashes from each file name found in the patch file. NPS_STRIP=`validate_parameter "$NPS_STRIP" "NUMBER OF PREFIX SLASHES TO STRIP" "1"` + [ $VERBOSE -eq $on ] && echo "[[NUMBER OF PREFIX SLASHES TO STRIP]]=\"$NPS_STRIP\"" # SlackBuild path # SlackBuild path in mkbuild parameters file -- cgit v1.2.3