Skip to content

Commit

Permalink
Fix mythwelcome in FE-only builds, add ccache for speedup.
Browse files Browse the repository at this point in the history
A non-backend build was not building mythwelcome, so when this script
tried to package MythWelcome.app, it barfed. I usually --enable-backend,
so didn't notice the fault. This has been broken for ages.
A slightly different fix to Stuart's [e4c981f].
  • Loading branch information
NigelPearson committed Jan 24, 2011
1 parent b38f237 commit 406b08c
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion OSX/build/osx-packager.pl
Expand Up @@ -61,6 +61,7 @@
our %depend_order = (
'mythtv'
=> [
'ccache',
'dvdcss',
'freetype',
'lame',
Expand Down Expand Up @@ -265,6 +266,11 @@
'url' => 'http://www.tortall.net/projects/yasm/releases/yasm-1.1.0.tar.gz',
},

'ccache' =>
{
'url' => 'http://samba.org/ftp/ccache/ccache-3.1.4.tar.bz2',
},

);


Expand Down Expand Up @@ -1000,7 +1006,8 @@ END
if ( $comp eq 'mythtv' )
{
# Remove/add Nigel's frontend building speedup hack
&DoSpeedupHacks('programs/programs.pro', 'mythfrontend mythavtest');
&DoSpeedupHacks('programs/programs.pro',
'mythfrontend mythavtest mythwelcome');
}

&Verbose("Making $comp");
Expand Down

2 comments on commit 406b08c

@stuarta
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is going to make merging Using-Git branch fun!

Stuart

@NigelPearson
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Heh. Maybe.

I have tried to keep them in synch with cherry-pick. It should just be a matter of throwing away master, or moving it to an SVN-only repo.

Please sign in to comment.