Accepting request 188165 from home:dimstar:branches:GNOME:Factory

- Modify gi-find-deps.sh: the js package filter function seems to
  have some issues in transfering variables (we might hit some
  limits: the script works fine when directly invoked). Currently
  we just specify the extracted list from gnome-weather as FILTER.

OBS-URL: https://build.opensuse.org/request/show/188165
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=125
This commit is contained in:
Dominique Leuenberger 2013-08-15 16:20:14 +00:00 committed by Git OBS Bridge
parent 524b04e76c
commit 05f34442d2
2 changed files with 17 additions and 11 deletions

View File

@ -89,13 +89,11 @@ function javascript_requires {
}
function javascript_pkg_filter {
# This function needs to be extended to actually READ the known items from the javascript code as well.
# Currently, this is a place holder function based on the content from gnome-weather (which, in fact, is the
# only package so far declaring the pkg dependencies in this form
# Packages listed here are exluced from the dependency addition if they are only specified in pkg.require(..)
for file in $jspkgfilt; do
FILTER=($(pcregrep -M "const RECOGNIZED_MODULE_NAMES =([^;])*" $file | grep -o "'.*'" | sed "s:'::g"))
done
# For now this is a dummy function based on gnome-weather information
#for file in $jspkgfilt; do
# FILTER=($(pcregrep -M "const RECOGNIZED_MODULE_NAMES =([^;])*" $file | grep -o "'.*'" | sed "s:'::g"))
#done
FILTER=('Lang' 'Mainloop' 'Signals' 'System' 'Params')
}
function javascript_pkg_requires {
@ -104,7 +102,7 @@ function javascript_pkg_requires {
# once we reach this function, we already know which file(s) contain the pkg.require(..) list.
oldIFS=$IFS
IFS=:
for file in $jspkg; do
for file in "$jspkg"; do
IFS=$'\n'
PKGS=$(pcregrep -M "pkg.require\\(([^;])*" $file | grep -o "'.*': '.*'")
for pkg in $PKGS; do
@ -180,9 +178,9 @@ while read file; do
esac
done
# The pkg filter is a place holder. This should read the filter from the javascript files.
if [ -n "$jspkgfilt" ]; then
javascript_pkg_filter
fi
#if [ -n "$jspkgfilt" ]; then
javascript_pkg_filter
#fi
# in case the javascript parser above detected files which specify pkg.require, we enter the more in-depth scanning scheme for those files.
if [ -n "$jspkg" ]; then
javascript_pkg_requires

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Aug 15 06:56:37 UTC 2013 - dimstar@opensuse.org
- Modify gi-find-deps.sh: the js package filter function seems to
have some issues in transfering variables (we might hit some
limits: the script works fine when directly invoked). Currently
we just specify the extracted list from gnome-weather as FILTER.
-------------------------------------------------------------------
Fri Aug 9 20:49:53 UTC 2013 - dimstar@opensuse.org