Code review comment for lp:~bryanfritt/compiz/compiz-decorator_script-edit_1192376

Revision history for this message
BryanFRitt (bryanfritt) wrote :

> FAILED: Continuous integration, rev:3754
> http://jenkins.qa.ubuntu.com/job/compiz-ci/285/
> Executed test runs:
> FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/98/console
> FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/98/console
> FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/98/console
>
> Click here to trigger a rebuild:
> http://s-jenkins:8080/job/compiz-ci/285/rebuild

patching file plugins/decor/decor.xml.in
Hunk #4 FAILED at 101.
1 out of 4 hunks FAILED -- rejects in file plugins/decor/decor.xml.in

Does that mean it didn't like this?
<default>exec ${COMPIZ_BIN_PATH}/compiz-decorator</default>
line 104 in decor.xml.in

Which affects
`ccsm` program->'Effects' section->'Window Decoration' plugin->'General' tab->'Command' option->'Reset' button.

I tried something like
<default>exec "${COMPIZ_BIN_PATH}/compiz-decorator"</default>
and it didn't compile, until I removed the quotes; so I left it unquoted, and it would compile for me.

It probably should be quoted, but that didn't compile for me, until I removed the quotes, but it seams like it still failed for PS Jenkins bot (ps-jenkins)

with
<default>exec "${COMPIZ_BIN_PATH}/compiz-decorator"</default>
make gives
.../build/generated/decor_options.cpp:83:68: error: expected ')' before '$'
At global scope:
cc1plus: error: unrecognized command line option "-Wno-unused-private-field" [-Werror]
cc1plus: error: unrecognized command line option "-Wno-unused-private-field" [-Werror]
cc1plus: error: unrecognized command line option "-Wno-unused-private-field" [-Werror]
cc1plus: error: unrecognized command line option "-Wno-unused-private-field" [-Werror]
cc1plus: error: unrecognized command line option "-Wno-unused-private-field" [-Werror]
cc1plus: error: unrecognized command line option "-Wno-unused-private-field" [-Werror]
cc1plus: all warnings being treated as errors
make[2]: *** [plugins/decor/CMakeFiles/decor.dir/__/__/generated/decor_options.cpp.o] Error 1
make[1]: *** [plugins/decor/CMakeFiles/decor.dir/all] Error 2
make: *** [all] Error 2

tried
exec \"${COMPIZ_BIN_PATH}/compiz-decorator\"
makes the default
exec \"${COMPIZ_BIN_PATH}/compiz-decorator\"

tried
exec ""${COMPIZ_BIN_PATH}/compiz-decorator""
makes the default
exec ""${COMPIZ_BIN_PATH}/compiz-decorator""

tried
exec '${COMPIZ_BIN_PATH}/compiz-decorator'
makes the default
exec '${COMPIZ_BIN_PATH}/compiz-decorator'

ME=Blah
echo '${ME}/hi'
{ME}/hi

echo "${ME}/hi"
Blah/hi

with
<default>exec &quot${COMPIZ_BIN_PATH}/compiz-decorator&quot</default>
make gives
not well-formed (invalid token) at line 104, column 21, byte 3100 at /usr/lib/perl5/XML/Parser.pm line 187
make[2]: *** [generated/decor.xml] Error 255
make[1]: *** [plugins/decor/CMakeFiles/decor.dir/all] Error 2
make: *** [all] Error 2

...

How can this be made to make the default
exec "${COMPIZ_BIN_PATH}/compiz-decorator"
and to be able to compile for me, and PS Jenkins bot (ps-jenkins) ?

« Back to merge proposal