Bug 58869 – [Qt] Cleanup includepath adjustment for generated files

• Status: RESOLVED
• Resolution: FIXED
• Component: Platform

[Balazs Kelemen]

After a build issue that has been worked around by r84174 I took a look at this. We need to find a better way to fix it that is compatible with the standalone_package path. Furthermore there is a lot of useless logic in the pro/pri files.

[Balazs Kelemen]

Created attachment 90164 [details]
Patch

[Balazs Kelemen]

Note: I cannot test the standalone_package path, somebody should take a look.

[Andras Becsi]

Comment on attachment 90164 [details]
Patch

LGTM.

To test-build the standalone_package path:

Tools/Scripts/build-webkit --qt --makeargs=-j24 CONFIG+=standalone_package CONFIG+=webkit2

should do the trick.

I just checked this, declarative and the WK2 Api tests do not build currently on trunk in standalone_package mode, but the library build succeeds.

I also checked your patch, and it works for the library, too. The above issues need another fix, and I'm not even sure whether they need to be built in standalone_package configuration.

[Csaba Osztrogonác]

Comment on attachment 90164 [details]
Patch

Nice cleanup, r=me.

[Csaba Osztrogonác]

(In reply to comment #3)
> (From update of attachment 90164 [details])
> LGTM.
> 
> To test-build the standalone_package path:
> 
> Tools/Scripts/build-webkit --qt --makeargs=-j24 CONFIG+=standalone_package CONFIG+=webkit2
> 
> should do the trick.
> 
> I just checked this, declarative and the WK2 Api tests do not build currently on trunk in standalone_package mode, but the library build succeeds.
> 
> I also checked your patch, and it works for the library, too. The above issues need another fix, and I'm not even sure whether they need to be built in standalone_package configuration.

Could you file a new bug report to fix standalone_package build?

[Balazs Kelemen]

(In reply to comment #5)
> (In reply to comment #3)
> > (From update of attachment 90164 [details] [details])
> > LGTM.
> > 
> > To test-build the standalone_package path:
> > 
> > Tools/Scripts/build-webkit --qt --makeargs=-j24 CONFIG+=standalone_package CONFIG+=webkit2
> > 
> > should do the trick.
> > 
> > I just checked this, declarative and the WK2 Api tests do not build currently on trunk in standalone_package mode, but the library build succeeds.
> > 
> > I also checked your patch, and it works for the library, too. The above issues need another fix, and I'm not even sure whether they need to be built in standalone_package configuration.
> 
> Could you file a new bug report to fix standalone_package build?

I will test it and file the bug if it is broken.

[Balazs Kelemen]

Comment on attachment 90164 [details]
Patch

Clearing flags on attachment: 90164

Committed r84364: <http://trac.webkit.org/changeset/84364>

[Balazs Kelemen]

All reviewed patches have been landed.  Closing bug.