Bug 58869

Summary: [Qt] Cleanup includepath adjustment for generated files
Product: WebKit Reporter: Balazs Kelemen <kbalazs>
Component: PlatformAssignee: Nobody <webkit-unassigned>
Status: RESOLVED FIXED    
Severity: Normal CC: abecsi, ossy
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: PC   
OS: All   
Attachments:
Description Flags
Patch none

Description Balazs Kelemen 2011-04-19 01:03:01 PDT
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.
Comment 1 Balazs Kelemen 2011-04-19 01:18:26 PDT
Created attachment 90164 [details]
Patch
Comment 2 Balazs Kelemen 2011-04-19 01:52:16 PDT
Note: I cannot test the standalone_package path, somebody should take a look.
Comment 3 Andras Becsi 2011-04-19 05:09:15 PDT
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.
Comment 4 Csaba Osztrogon√°c 2011-04-20 04:13:08 PDT
Comment on attachment 90164 [details]
Patch

Nice cleanup, r=me.
Comment 5 Csaba Osztrogon√°c 2011-04-20 04:14:05 PDT
(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?
Comment 6 Balazs Kelemen 2011-04-20 06:40:38 PDT
(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.
Comment 7 Balazs Kelemen 2011-04-20 06:46:55 PDT
Comment on attachment 90164 [details]
Patch

Clearing flags on attachment: 90164

Committed r84364: <http://trac.webkit.org/changeset/84364>
Comment 8 Balazs Kelemen 2011-04-20 06:47:02 PDT
All reviewed patches have been landed.  Closing bug.