openmamba/autospec
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spec-create: add a build requirent for cmake and scons when required

Browse Source 
Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
This commit is contained in:
Davide Madrisan 2012-03-25 23:46:01 +02:00
parent e4ce9bf357
commit a662178d61
5 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -45,6 +45,12 @@ Changes in version 1.9.3
Preliminary support for scon. Preliminary support for scon.
(Feature asked by Silvan Calarco.) (Feature asked by Silvan Calarco.)
* spec-create - Davide Madrisan:
Add a build requirent for cmake and scons when required.
* templetes/{library,standard,standard-daemon} - Davide Madrisan:
Add a 'buildrequires_buildtool' conditional block.
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 1.9.2 Changes in version 1.9.2

10
plugins/spec-create.in
View File

@ -256,6 +256,7 @@ shared-libraries:,debug-package:,\
local standard_docs local standard_docs
local standard_docs_devel local standard_docs_devel
local build_technology local build_technology
local buildrequires_buildtool
local i18n="0" local i18n="0"
local icons_mimetypes="0" local icons_mimetypes="0"
@ -329,6 +330,7 @@ shared-libraries:,debug-package:,\
spec_cmd_configure="$spec_cmd_configure_cmake" spec_cmd_configure="$spec_cmd_configure_cmake"
spec_cmd_make="$spec_cmd_make_cmake" spec_cmd_make="$spec_cmd_make_cmake"
spec_cmd_makeinstall="$spec_cmd_makeinstall_cmake" spec_cmd_makeinstall="$spec_cmd_makeinstall_cmake"
buildrequires_buildtool="cmake"
;; ;;
autotools) autotools)
spec_cmd_configure="$spec_cmd_configure_autotools" spec_cmd_configure="$spec_cmd_configure_autotools"
@ -344,6 +346,7 @@ shared-libraries:,debug-package:,\
spec_cmd_configure="$spec_cmd_configure_scons" spec_cmd_configure="$spec_cmd_configure_scons"
spec_cmd_make="$spec_cmd_make_scons" spec_cmd_make="$spec_cmd_make_scons"
spec_cmd_makeinstall="$spec_cmd_makeinstall_scons" spec_cmd_makeinstall="$spec_cmd_makeinstall_scons"
buildrequires_buildtool="scons"
;; ;;
unknown) unknown)
notify.warning $"unknown build techonology" notify.warning $"unknown build techonology"
@ -355,6 +358,8 @@ shared-libraries:,debug-package:,\
notify.debug "$FUNCNAME: spec_cmd_configure = \"$spec_cmd_configure\"" notify.debug "$FUNCNAME: spec_cmd_configure = \"$spec_cmd_configure\""
notify.debug "$FUNCNAME: spec_cmd_make = \"$spec_cmd_make\"" notify.debug "$FUNCNAME: spec_cmd_make = \"$spec_cmd_make\""
notify.debug "$FUNCNAME: spec_cmd_makeinstall = \"$spec_cmd_makeinstall\"" notify.debug "$FUNCNAME: spec_cmd_makeinstall = \"$spec_cmd_makeinstall\""
notify.debug "\
$FUNCNAME: buildrequires_buildtool = \"$buildrequires_buildtool\""
[ -r "$templatefile" ] || notify.error $"file not found"": $templatefile" [ -r "$templatefile" ] || notify.error $"file not found"": $templatefile"
@ -370,7 +375,9 @@ shared-libraries:,debug-package:,\
$spec_type ("$"line""#$template_linenum): "$"too many nested @if blocks" $spec_type ("$"line""#$template_linenum): "$"too many nested @if blocks"
if_level=$(($if_level + 1)) if_level=$(($if_level + 1))
currvar="$(echo "$line" | sed "s,@if:\([^ \t]*\).*,\1,")" currvar="$(echo "$line" | sed "s,@if:\([^ \t]*\).*,\1,")"
[ "${!currvar}" = 1 ] || if_value[$if_level]='0' [[ "${!currvar}" = 1 || \
( -n "${!currvar}" && "${!currvar}" != 0 ) ]] || \
if_value[$if_level]='0'
notify.debug "\ notify.debug "\
$FUNCNAME: @if:$currvar lev:$if_level val:${if_value[$if_level]})" $FUNCNAME: @if:$currvar lev:$if_level val:${if_value[$if_level]})"
continue continue
@ -417,6 +424,7 @@ s,^\(%setup.*\),${spec_setup_macro},
s,^\([ \t]*Source[ \t]*:[ \t]*\).*,\1${spec_source}, s,^\([ \t]*Source[ \t]*:[ \t]*\).*,\1${spec_source},
s,@make@,$spec_cmd_make, s,@make@,$spec_cmd_make,
s,@makeinstall@,$spec_cmd_makeinstall, s,@makeinstall@,$spec_cmd_makeinstall,
s,@build_tool@,$buildrequires_buildtool,
s,@standard_docs@,${standard_docs:+%doc $standard_docs}, s,@standard_docs@,${standard_docs:+%doc $standard_docs},
s,@standard_docs_devel@,${standard_docs_devel:+%doc $standard_docs_devel}, s,@standard_docs_devel@,${standard_docs_devel:+%doc $standard_docs_devel},
s,@spec_changelog_date@,$spec_changelog_date, s,@spec_changelog_date@,$spec_changelog_date,

3
templates/library
View File

@ -17,6 +17,9 @@ License: ...
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
## note: run 'autospec -u -a6 @pck_name@' to get the list of build requirements. ## note: run 'autospec -u -a6 @pck_name@' to get the list of build requirements.
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
@if:buildrequires_buildtool
BuildRequires: @build_tool@
@fi:buildrequires_buildtool
@if:pck_library @if:pck_library
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
@fi:pck_library @fi:pck_library

3
templates/standard
View File

@ -13,6 +13,9 @@ License: ...
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
## note: run 'autospec -u -a6 @pck_name@' to get the list of build requirements. ## note: run 'autospec -u -a6 @pck_name@' to get the list of build requirements.
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
@if:buildrequires_buildtool
BuildRequires: @build_tool@
@fi:buildrequires_buildtool
@if:infopages @if:infopages
Requires(post): %{__install_info} Requires(post): %{__install_info}
@fi:infopages @fi:infopages

3
templates/standard-daemon
View File

@ -13,6 +13,9 @@ License: ...
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
## note: run 'autospec -u -a6 @pck_name@' to get the list of build requirements. ## note: run 'autospec -u -a6 @pck_name@' to get the list of build requirements.
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
@if:buildrequires_buildtool
BuildRequires: @build_tool@
@fi:buildrequires_buildtool
@if:infopages @if:infopages
Requires(post): %{__install_info} Requires(post): %{__install_info}
@fi:infopages @fi:infopages