Skip to content

Commit 847f0e1

Browse files
3nids3nids
committedMay 14, 2018
adapt sipify scripts and test to place auto generated sip files in dedicated folder
·
ltr-3_40final-3_2_0
1 parent 8b130f1 commit 847f0e1

File tree

6 files changed

+775
-774
lines changed

6 files changed

+775
-774
lines changed
 

‎python/core/core_auto.sip

Lines changed: 439 additions & 439 deletions
Large diffs are not rendered by default.

‎python/gui/gui_auto.sip

Lines changed: 306 additions & 306 deletions
Large diffs are not rendered by default.

‎python/server/server_auto.sip

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
// Include auto-generated SIP files
2-
%Include qgsmapserviceexception.sip
3-
%Include qgscapabilitiescache.sip
4-
%Include qgsconfigcache.sip
5-
%Include qgsserversettings.sip
6-
%Include qgsbufferserverrequest.sip
7-
%Include qgsbufferserverresponse.sip
8-
%Include qgsrequesthandler.sip
9-
%Include qgsserver.sip
10-
%Include qgsserverexception.sip
2+
%Include auto_generated/qgsmapserviceexception.sip
3+
%Include auto_generated/qgscapabilitiescache.sip
4+
%Include auto_generated/qgsconfigcache.sip
5+
%Include auto_generated/qgsserversettings.sip
6+
%Include auto_generated/qgsbufferserverrequest.sip
7+
%Include auto_generated/qgsbufferserverresponse.sip
8+
%Include auto_generated/qgsrequesthandler.sip
9+
%Include auto_generated/qgsserver.sip
10+
%Include auto_generated/qgsserverexception.sip
1111
%If ( HAVE_SERVER_PYTHON_PLUGINS )
12-
%Include qgsserverinterface.sip
12+
%Include auto_generated/qgsserverinterface.sip
1313
%End
14-
%Include qgsserverprojectutils.sip
15-
%Include qgsserverrequest.sip
16-
%Include qgsserverresponse.sip
17-
%Include qgsservice.sip
18-
%Include qgsservicemodule.sip
19-
%Include qgsserviceregistry.sip
20-
%Include qgsfeaturefilterprovidergroup.sip
21-
%Include qgsfeaturefilter.sip
14+
%Include auto_generated/qgsserverprojectutils.sip
15+
%Include auto_generated/qgsserverrequest.sip
16+
%Include auto_generated/qgsserverresponse.sip
17+
%Include auto_generated/qgsservice.sip
18+
%Include auto_generated/qgsservicemodule.sip
19+
%Include auto_generated/qgsserviceregistry.sip
20+
%Include auto_generated/qgsfeaturefilterprovidergroup.sip
21+
%Include auto_generated/qgsfeaturefilter.sip
2222
%If ( HAVE_SERVER_PYTHON_PLUGINS )
23-
%Include qgsserverfilter.sip
23+
%Include auto_generated/qgsserverfilter.sip
2424
%End
2525
%If ( HAVE_SERVER_PYTHON_PLUGINS )
26-
%Include qgsaccesscontrolfilter.sip
26+
%Include auto_generated/qgsaccesscontrolfilter.sip
2727
%End
2828
%If ( HAVE_SERVER_PYTHON_PLUGINS )
29-
%Include qgsaccesscontrol.sip
29+
%Include auto_generated/qgsaccesscontrol.sip
3030
%End

‎scripts/sip_include.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ for module in "${modules[@]}"; do
7070
# so "%Include 3d/xxxx.sip" is a syntax error but everything works with "%Include ./3d/xxxx.sip"
7171
sip="./$sip"
7272
fi
73-
echo "%Include $sip" >> $file
73+
echo "%Include auto_generated/$sip" >> $file
7474
if [[ ! -z $if_cond ]]; then
7575
echo "%End" >> $file
7676
fi

‎scripts/sipify_all.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ modules=(core gui analysis server)
4141
for module in "${modules[@]}"; do
4242
while read -r sipfile; do
4343
echo "$sipfile.in"
44-
header=$(${GP}sed -E 's/(.*)\.sip/src\/\1.h/' <<< $sipfile)
44+
header=$(${GP}sed -E 's@(.*)\.sip@src/\1.h@; s@auto_generated/@@' <<< $sipfile)
4545
if [ ! -f $header ]; then
4646
echo "*** Missing header: $header for sipfile $sipfile"
4747
else
@@ -50,7 +50,7 @@ for module in "${modules[@]}"; do
5050
./scripts/sipify.pl $header > python/$sipfile.in &
5151
fi
5252
count=$((count+1))
53-
done < <( ${GP}sed -n -r "s/^%Include (.*\.sip)/${module}\/\1/p" python/${module}/${module}_auto.sip )
53+
done < <( ${GP}sed -n -r "s@^%Include auto_generated/(.*\.sip)@${module}/auto_generated/\1@p" python/${module}/${module}_auto.sip )
5454
done
5555
wait # wait for sipify processes to finish
5656

‎tests/code_layout/test_sipfiles_uptodate.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ fi
1212

1313
pushd ${DIR} > /dev/null
1414

15+
modules=(core gui analysis server)
16+
1517
code=0
1618
while read -r sipfile; do
17-
header=$(${GP}sed -E 's/(.*)\.sip/src\/\1.h/' <<< $sipfile)
19+
header=$(${GP}sed -E 's@(.*)\.sip@src/\1.h@; s@auto_generated/@@' <<< $sipfile)
1820
if [ ! -f $header ]; then
1921
echo "*** Missing header: $header for sipfile $sipfile"
2022
else
@@ -25,10 +27,9 @@ while read -r sipfile; do
2527
fi
2628
fi
2729
done < <(
28-
${GP}sed -n -r 's/^%Include (.*\.sip)/core\/\1/p' python/core/core_auto.sip
29-
${GP}sed -n -r 's/^%Include (.*\.sip)/gui\/\1/p' python/gui/gui_auto.sip
30-
${GP}sed -n -r 's/^%Include (.*\.sip)/analysis\/\1/p' python/analysis/analysis_auto.sip
31-
${GP}sed -n -r 's/^%Include (.*\.sip)/server\/\1/p' python/server/server_auto.sip
30+
for module in "${modules[@]}"; do
31+
${GP}sed -n -r "s@^%Include auto_generated/(.*\.sip)@${module}/auto_generated/\1@p" python/${module}/${module}_auto.sip
32+
done
3233
)
3334

3435

0 commit comments

Comments
 (0)
Please sign in to comment.