Skip to content

Commit

Permalink
BuildSystem: darwin
Browse files Browse the repository at this point in the history
- made Xcode external targets consistent for each configuration.
- shunted terminal NAME=VALUE vars through xcodebuild.
- folded macosx/module.xcode shunt functions into single.
- added new report target to show a single var; eg: make report.var NAME=GCC.gcc .

BuildSystem: darwin ppc
- fixed configure on ppc host: correctly identify native architecture.
- fixed configure to be more resilient when svn probes fail.
- fixed configure to show error output for svn probes.

BuildSystme: xcode
- added external target 'external' to represent 'all things in external system'
  which is slight more than what 'libhb' might represent.
- added doc section Building.osx: External Targets .


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2214 b64f7644-9d1e-0410-96f1-a4d463321fa5
  • Loading branch information
KonaBlend committed Mar 4, 2009
1 parent c4d9c49 commit 6d2d519
Show file tree
Hide file tree
Showing 11 changed files with 368 additions and 224 deletions.
12 changes: 8 additions & 4 deletions 00-Building.cygwin.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guide to Building HandBrake svn2204 (2009030201) on Cygwin
Guide to Building HandBrake svn2213 (2009030301) on Cygwin
**********************************************************

Table of Contents
Expand Down Expand Up @@ -240,14 +240,18 @@ period.
Build main product. All necessary dependencies are also built if
required.

`make clean'
Clean all build output excluding contrib modules. Configuration is
retained.

`make install'
Perform final product(s) install. This will install build
products to a standard directory or one specified via `configure
--prefix' option.

`make clean'
Clean all build output excluding contrib modules. Configuration is
retained.
`make uninstall'
Perform final product(s) uninstall. This will uninstall any
products which may have been previously installed.

`make xclean'
Clean all build output including contrib modules. Configuration is
Expand Down
12 changes: 8 additions & 4 deletions 00-Building.linux.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guide to Building HandBrake svn2204 (2009030201) on Linux
Guide to Building HandBrake svn2213 (2009030301) on Linux
*********************************************************

Table of Contents
Expand Down Expand Up @@ -306,14 +306,18 @@ period.
Build main product. All necessary dependencies are also built if
required.

`make clean'
Clean all build output excluding contrib modules. Configuration is
retained.

`make install'
Perform final product(s) install. This will install build
products to a standard directory or one specified via `configure
--prefix' option.

`make clean'
Clean all build output excluding contrib modules. Configuration is
retained.
`make uninstall'
Perform final product(s) uninstall. This will uninstall any
products which may have been previously installed.

`make xclean'
Clean all build output including contrib modules. Configuration is
Expand Down
34 changes: 28 additions & 6 deletions 00-Building.osx.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guide to Building HandBrake svn2204 (2009030201) on Mac OS X
Guide to Building HandBrake svn2213 (2009030301) on Mac OS X
************************************************************

Table of Contents
Expand All @@ -21,7 +21,8 @@ Table of Contents
6 Building via Xcode
6.1 Checkout Sources
6.2 Build
6.3 User-Defined Settings
6.3 External Targets
6.4 User-Defined Settings


1 Introduction
Expand Down Expand Up @@ -241,14 +242,18 @@ period.
Build main product. All necessary dependencies are also built if
required.

`make clean'
Clean all build output excluding contrib modules. Configuration is
retained.

`make install'
Perform final product(s) install. This will install build
products to a standard directory or one specified via `configure
--prefix' option.

`make clean'
Clean all build output excluding contrib modules. Configuration is
retained.
`make uninstall'
Perform final product(s) uninstall. This will uninstall any
products which may have been previously installed.

`make xclean'
Clean all build output including contrib modules. Configuration is
Expand Down Expand Up @@ -441,7 +446,24 @@ follows:
This configuration is used to build for the ppc64 architecture.
Build directory is `build.standard.ppc64' .

6.3 User-Defined Settings
6.3 External Targets
====================

The following external targets appear in the Xcode project and perform
build and clean actions.

`external'
Target maps to `make build' and `make clean' for everything Xcode
products depend upon from the external build system.

`libhb'
Target maps to `make libhb.build' and `make libhb.clean'.

`contrib'
Target maps to `make contrib.build' and `make contrib.xclean'.


6.4 User-Defined Settings
=========================

The following user defined settings are used in Xcode project for the
Expand Down
17 changes: 17 additions & 0 deletions doc/texi/building/chapter.via.xcode.texi
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,23 @@ This configuration is used to build for the ppc architecture. Build directory is
This configuration is used to build for the ppc64 architecture. Build directory is @file{build.standard.ppc64} .
@end table

@c %**-------------------------------------------------------------------------
@anchor{xcode.extenal}
@section External Targets
The following external targets appear in the Xcode project and perform @b{build} and @b{clean} actions.

@table @samp
@item external
Target maps to @command{make build} and @command{make clean} for everything Xcode products depend upon from the external build system.

@item libhb
Target maps to @command{make libhb.build} and @command{make libhb.clean}.

@item contrib
Target maps to @command{make contrib.build} and @command{make contrib.xclean}.

@end table

@c %**-------------------------------------------------------------------------
@anchor{xcode.userdefined}
@section User-Defined Settings
Expand Down
Loading

0 comments on commit 6d2d519

Please sign in to comment.