Merge branch 'master' of github.com:MythTV/packaging

kormoc · kormoc · commit bc1d242fa5df · 2011-02-09T13:22:58.000-08:00
diff --git a/OSX/build/osx-packager.pl b/OSX/build/osx-packager.pl
@@ -844,6 +844,10 @@ END
                    $gitpackaging, $GITDIR . '/packaging' ]) or die;
     }
 
+    # Remove Nigel's frontend building speedup hack
+    chdir "$GITDIR/mythtv" or die;
+    &DoSpeedupHacks('programs/programs.pro', '');
+
     my @gitcheckoutflags;
 
     if ( $gitrevert )
@@ -955,7 +959,7 @@ END
     {
         # Remove/add Nigel's frontend building speedup hack
         &DoSpeedupHacks('programs/programs.pro',
-                        'mythfrontend mythavtest mythwelcome');
+                        'mythfrontend mythavtest mythpreviewgen mythwelcome');
     }
 
     &Verbose("Making $comp");
@@ -1395,7 +1399,7 @@ ($$)
         {  last  }
         print OUT;
     }
-    if ( ! $backend && ! $jobtools )
+    if ( ! $backend && ! $jobtools && $subdirs )
     {
         # Nigel's hack to speedup building
         print OUT "# Nigel\'s speedup hack:\n";

Original file line number	Diff line number	Diff line change
`@@ -844,6 +844,10 @@ END`
`844`	`844`	`$gitpackaging, $GITDIR . '/packaging' ]) or die;`
`845`	`845`	`}`
`846`	`846`
	`847`	`+ # Remove Nigel's frontend building speedup hack`
	`848`	`+ chdir "$GITDIR/mythtv" or die;`
	`849`	`+ &DoSpeedupHacks('programs/programs.pro', '');`
	`850`	`+`
`847`	`851`	`my @gitcheckoutflags;`
`848`	`852`
`849`	`853`	`if ( $gitrevert )`
`@@ -955,7 +959,7 @@ END`
`955`	`959`	`{`
`956`	`960`	`# Remove/add Nigel's frontend building speedup hack`
`957`	`961`	`&DoSpeedupHacks('programs/programs.pro',`
`958`		`- 'mythfrontend mythavtest mythwelcome');`
	`962`	`+ 'mythfrontend mythavtest mythpreviewgen mythwelcome');`
`959`	`963`	`}`
`960`	`964`
`961`	`965`	`&Verbose("Making $comp");`
`@@ -1395,7 +1399,7 @@ ($$)`
`1395`	`1399`	`{ last }`
`1396`	`1400`	`print OUT;`
`1397`	`1401`	`}`
`1398`		`- if ( ! $backend && ! $jobtools )`
	`1402`	`+ if ( ! $backend && ! $jobtools && $subdirs )`
`1399`	`1403`	`{`
`1400`	`1404`	`# Nigel's hack to speedup building`
`1401`	`1405`	`print OUT "# Nigel\'s speedup hack:\n";`