/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
- 27774C2A0F5CB1D600897477 /* PBXContainerItemProxy */ = {
+ 277C2E530F5DFF400067D708 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
- remoteGlobalIDString = 278071070F5C9C2C00699207;
- remoteInfo = libhb;
+ remoteGlobalIDString = 27F143770F5DF34F00A684FF;
+ remoteInfo = external;
};
- 27774C2C0F5CB1DD00897477 /* PBXContainerItemProxy */ = {
+ 277C2E550F5DFF450067D708 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
- remoteGlobalIDString = 278071070F5C9C2C00699207;
- remoteInfo = libhb;
+ remoteGlobalIDString = 27F143770F5DF34F00A684FF;
+ remoteInfo = external;
};
/* End PBXContainerItemProxy section */
/* End PBXHeadersBuildPhase section */
/* Begin PBXLegacyTarget section */
- 278070E10F5C7F9E00699207 /* contrib */ = {
+ 27F143770F5DF34F00A684FF /* external */ = {
isa = PBXLegacyTarget;
- buildArgumentsString = "$EXTERNAL_PROJECT/make/xcodemake.sh $(PRODUCT_NAME) $(ACTION)";
- buildConfigurationList = 278070E20F5C7F9E00699207 /* Build configuration list for PBXLegacyTarget "contrib" */;
+ buildArgumentsString = "\"$EXTERNAL_PROJECT/make/xcodemake";
+ buildConfigurationList = 27F1438E0F5DF3EA00A684FF /* Build configuration list for PBXLegacyTarget "external" */;
+ buildPhases = (
+ );
+ buildToolPath = /bin/sh;
+ dependencies = (
+ );
+ name = external;
+ passBuildSettingsInEnvironment = 1;
+ productName = external;
+ };
+ 27F1437E0F5DF36000A684FF /* contrib */ = {
+ isa = PBXLegacyTarget;
+ buildArgumentsString = "\"$EXTERNAL_PROJECT/make/xcodemake";
+ buildConfigurationList = 27F1438F0F5DF3EA00A684FF /* Build configuration list for PBXLegacyTarget "contrib" */;
buildPhases = (
);
buildToolPath = /bin/sh;
- buildWorkingDirectory = "";
- comments = "This target represents tie-in to the make-based build system for HandBrake.\nFrom Xcode's perspective we term it the 'external' build system.\n\n- building this target maps to --> make contrib.install\n- cleaning this target maps to --> make contrib.clean";
dependencies = (
);
name = contrib;
passBuildSettingsInEnvironment = 1;
- productName = external.invoke;
+ productName = contrib;
};
- 278071070F5C9C2C00699207 /* libhb */ = {
+ 27F143850F5DF37600A684FF /* libhb */ = {
isa = PBXLegacyTarget;
- buildArgumentsString = "$EXTERNAL_PROJECT/make/xcodemake.sh $(PRODUCT_NAME) $(ACTION)";
- buildConfigurationList = 278071080F5C9C2C00699207 /* Build configuration list for PBXLegacyTarget "libhb" */;
+ buildArgumentsString = "\"$EXTERNAL_PROJECT/make/xcodemake";
+ buildConfigurationList = 27F143900F5DF3EA00A684FF /* Build configuration list for PBXLegacyTarget "libhb" */;
buildPhases = (
);
buildToolPath = /bin/sh;
- buildWorkingDirectory = "";
- comments = "This target represents tie-in to the make-based build system for HandBrake.\nFrom Xcode's perspective we term it the 'external' build system.\n\n- building this target maps to --> make libhb.build\n- cleaning this target maps to --> make libhb.clean";
dependencies = (
);
name = libhb;
passBuildSettingsInEnvironment = 1;
- productName = external.invoke;
+ productName = libhb;
};
/* End PBXLegacyTarget section */
buildRules = (
);
dependencies = (
- 27774C2B0F5CB1D600897477 /* PBXTargetDependency */,
+ 277C2E560F5DFF450067D708 /* PBXTargetDependency */,
);
name = HandBrakeCLI;
productName = HandBrakeCLI;
buildRules = (
);
dependencies = (
- 27774C2D0F5CB1DD00897477 /* PBXTargetDependency */,
+ 277C2E540F5DFF400067D708 /* PBXTargetDependency */,
);
name = HandBrake;
productName = HandBrake;
targets = (
4DD93F8D082036E8008E1322 /* HandBrake */,
0DFF0C090B6BCEC200549488 /* HandBrakeCLI */,
- 278071070F5C9C2C00699207 /* libhb */,
- 278070E10F5C7F9E00699207 /* contrib */,
+ 27F143770F5DF34F00A684FF /* external */,
+ 27F143850F5DF37600A684FF /* libhb */,
+ 27F1437E0F5DF36000A684FF /* contrib */,
);
};
/* End PBXProject section */
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
- 27774C2B0F5CB1D600897477 /* PBXTargetDependency */ = {
+ 277C2E540F5DFF400067D708 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
- target = 278071070F5C9C2C00699207 /* libhb */;
- targetProxy = 27774C2A0F5CB1D600897477 /* PBXContainerItemProxy */;
+ target = 27F143770F5DF34F00A684FF /* external */;
+ targetProxy = 277C2E530F5DFF400067D708 /* PBXContainerItemProxy */;
};
- 27774C2D0F5CB1DD00897477 /* PBXTargetDependency */ = {
+ 277C2E560F5DFF450067D708 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
- target = 278071070F5C9C2C00699207 /* libhb */;
- targetProxy = 27774C2C0F5CB1DD00897477 /* PBXContainerItemProxy */;
+ target = 27F143770F5DF34F00A684FF /* external */;
+ targetProxy = 277C2E550F5DFF450067D708 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
};
name = standard;
};
- 278070E30F5C7F9E00699207 /* standard */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = contrib;
- };
- name = standard;
- };
- 278070E40F5C7F9E00699207 /* debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = external.invoke;
- };
- name = debug;
- };
- 278070E50F5C7F9E00699207 /* standard.i386 */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = external.invoke;
- };
- name = standard.i386;
- };
- 278070E60F5C7F9E00699207 /* standard.x86_64 */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = external.invoke;
- };
- name = standard.x86_64;
- };
- 278070E70F5C7F9E00699207 /* standard.ppc */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = external.invoke;
- };
- name = standard.ppc;
- };
- 278070E80F5C7F9E00699207 /* standard.ppc64 */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = external.invoke;
- };
- name = standard.ppc64;
- };
- 278071090F5C9C2C00699207 /* standard */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = libhb;
- };
- name = standard;
- };
- 2780710A0F5C9C2C00699207 /* debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = external.invoke;
- };
- name = debug;
- };
- 2780710B0F5C9C2C00699207 /* standard.i386 */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = external.invoke;
- };
- name = standard.i386;
- };
- 2780710C0F5C9C2C00699207 /* standard.x86_64 */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = external.invoke;
- };
- name = standard.x86_64;
- };
- 2780710D0F5C9C2C00699207 /* standard.ppc */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = external.invoke;
- };
- name = standard.ppc;
- };
- 2780710E0F5C9C2C00699207 /* standard.ppc64 */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = external.invoke;
- };
- name = standard.ppc64;
- };
27ED6ADB0F58D7F100C905EE /* standard.i386 */ = {
isa = XCBuildConfiguration;
buildSettings = {
CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
EXTERNAL_BUILD = "$(EXTERNAL_PROJECT)/build.$(CONFIGURATION)";
- EXTERNAL_JOBS = 1;
+ EXTERNAL_JOBS = 8;
EXTERNAL_METHOD = xcode;
EXTERNAL_PROJECT = ..;
GCC_DYNAMIC_NO_PIC = YES;
CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
EXTERNAL_BUILD = "$(EXTERNAL_PROJECT)/build.$(CONFIGURATION)";
- EXTERNAL_JOBS = 1;
+ EXTERNAL_JOBS = 8;
EXTERNAL_METHOD = xcode;
EXTERNAL_PROJECT = ..;
GCC_DYNAMIC_NO_PIC = YES;
CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
EXTERNAL_BUILD = "$(EXTERNAL_PROJECT)/build.$(CONFIGURATION)";
- EXTERNAL_JOBS = 1;
+ EXTERNAL_JOBS = 8;
EXTERNAL_METHOD = xcode;
EXTERNAL_PROJECT = ..;
GCC_DYNAMIC_NO_PIC = YES;
CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
EXTERNAL_BUILD = "$(EXTERNAL_PROJECT)/build.$(CONFIGURATION)";
- EXTERNAL_JOBS = 1;
+ EXTERNAL_JOBS = 8;
EXTERNAL_METHOD = xcode;
EXTERNAL_PROJECT = ..;
GCC_DYNAMIC_NO_PIC = YES;
};
name = standard.ppc64;
};
+ 27F143780F5DF34F00A684FF /* standard */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = external;
+ };
+ name = standard;
+ };
+ 27F143790F5DF34F00A684FF /* debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = external;
+ };
+ name = debug;
+ };
+ 27F1437A0F5DF34F00A684FF /* standard.i386 */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = external;
+ };
+ name = standard.i386;
+ };
+ 27F1437B0F5DF34F00A684FF /* standard.x86_64 */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = external;
+ };
+ name = standard.x86_64;
+ };
+ 27F1437C0F5DF34F00A684FF /* standard.ppc */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = external;
+ };
+ name = standard.ppc;
+ };
+ 27F1437D0F5DF34F00A684FF /* standard.ppc64 */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = external;
+ };
+ name = standard.ppc64;
+ };
+ 27F1437F0F5DF36000A684FF /* standard */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = contrib;
+ };
+ name = standard;
+ };
+ 27F143800F5DF36000A684FF /* debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = contrib;
+ };
+ name = debug;
+ };
+ 27F143810F5DF36000A684FF /* standard.i386 */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = contrib;
+ };
+ name = standard.i386;
+ };
+ 27F143820F5DF36000A684FF /* standard.x86_64 */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = contrib;
+ };
+ name = standard.x86_64;
+ };
+ 27F143830F5DF36000A684FF /* standard.ppc */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = contrib;
+ };
+ name = standard.ppc;
+ };
+ 27F143840F5DF36000A684FF /* standard.ppc64 */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = contrib;
+ };
+ name = standard.ppc64;
+ };
+ 27F143860F5DF37600A684FF /* standard */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = libhb;
+ };
+ name = standard;
+ };
+ 27F143870F5DF37600A684FF /* debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = libhb;
+ };
+ name = debug;
+ };
+ 27F143880F5DF37600A684FF /* standard.i386 */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = libhb;
+ };
+ name = standard.i386;
+ };
+ 27F143890F5DF37600A684FF /* standard.x86_64 */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = libhb;
+ };
+ name = standard.x86_64;
+ };
+ 27F1438A0F5DF37600A684FF /* standard.ppc */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = libhb;
+ };
+ name = standard.ppc;
+ };
+ 27F1438B0F5DF37600A684FF /* standard.ppc64 */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = libhb;
+ };
+ name = standard.ppc64;
+ };
4D4E7BC1087804870051572B /* debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
EXTERNAL_BUILD = "$(EXTERNAL_PROJECT)/build.$(CONFIGURATION)";
- EXTERNAL_JOBS = 1;
+ EXTERNAL_JOBS = 8;
EXTERNAL_METHOD = xcode;
EXTERNAL_PROJECT = ..;
GCC_DYNAMIC_NO_PIC = YES;
CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
EXTERNAL_BUILD = "$(EXTERNAL_PROJECT)/build.$(CONFIGURATION)";
- EXTERNAL_JOBS = 1;
+ EXTERNAL_JOBS = 8;
EXTERNAL_METHOD = xcode;
EXTERNAL_PROJECT = ..;
GCC_DYNAMIC_NO_PIC = YES;
defaultConfigurationIsVisible = 0;
defaultConfigurationName = standard;
};
- 278070E20F5C7F9E00699207 /* Build configuration list for PBXLegacyTarget "contrib" */ = {
+ 27F1438E0F5DF3EA00A684FF /* Build configuration list for PBXLegacyTarget "external" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 27F143780F5DF34F00A684FF /* standard */,
+ 27F143790F5DF34F00A684FF /* debug */,
+ 27F1437A0F5DF34F00A684FF /* standard.i386 */,
+ 27F1437B0F5DF34F00A684FF /* standard.x86_64 */,
+ 27F1437C0F5DF34F00A684FF /* standard.ppc */,
+ 27F1437D0F5DF34F00A684FF /* standard.ppc64 */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = standard;
+ };
+ 27F1438F0F5DF3EA00A684FF /* Build configuration list for PBXLegacyTarget "contrib" */ = {
isa = XCConfigurationList;
buildConfigurations = (
- 278070E30F5C7F9E00699207 /* standard */,
- 278070E40F5C7F9E00699207 /* debug */,
- 278070E50F5C7F9E00699207 /* standard.i386 */,
- 278070E60F5C7F9E00699207 /* standard.x86_64 */,
- 278070E70F5C7F9E00699207 /* standard.ppc */,
- 278070E80F5C7F9E00699207 /* standard.ppc64 */,
+ 27F1437F0F5DF36000A684FF /* standard */,
+ 27F143800F5DF36000A684FF /* debug */,
+ 27F143810F5DF36000A684FF /* standard.i386 */,
+ 27F143820F5DF36000A684FF /* standard.x86_64 */,
+ 27F143830F5DF36000A684FF /* standard.ppc */,
+ 27F143840F5DF36000A684FF /* standard.ppc64 */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = standard;
};
- 278071080F5C9C2C00699207 /* Build configuration list for PBXLegacyTarget "libhb" */ = {
+ 27F143900F5DF3EA00A684FF /* Build configuration list for PBXLegacyTarget "libhb" */ = {
isa = XCConfigurationList;
buildConfigurations = (
- 278071090F5C9C2C00699207 /* standard */,
- 2780710A0F5C9C2C00699207 /* debug */,
- 2780710B0F5C9C2C00699207 /* standard.i386 */,
- 2780710C0F5C9C2C00699207 /* standard.x86_64 */,
- 2780710D0F5C9C2C00699207 /* standard.ppc */,
- 2780710E0F5C9C2C00699207 /* standard.ppc64 */,
+ 27F143860F5DF37600A684FF /* standard */,
+ 27F143870F5DF37600A684FF /* debug */,
+ 27F143880F5DF37600A684FF /* standard.i386 */,
+ 27F143890F5DF37600A684FF /* standard.x86_64 */,
+ 27F1438A0F5DF37600A684FF /* standard.ppc */,
+ 27F1438B0F5DF37600A684FF /* standard.ppc64 */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = standard;
self.release = ''
self.extra = ''
elif re.match( 'darwin', p_system ):
- self.machine = p_machine
+ self.machine = p_processor
self.vendor = 'apple'
self.system = p_system
self.systemc = p_systemc
self.mode = self.default
def __str__( self ):
- return ' '.join( self ).replace( self.mode, '*'+self.mode )
+ s = ''
+ for a in self:
+ if a == self.mode:
+ s += ' *' + a
+ else:
+ s += ' ' + a
+ return s[1:]
def addToGroup( self, group, option, name ):
group.add_option( '', option, help='select %s mode: %s' % (name,self), default=self.mode, metavar='MODE' )
# parse output: svnversion PROJECT_DIR
cmd = 'svnversion ' + initial_project_dir
- print 'running: %s' % (cmd)
+ print 'attempting to probe subversion: %s' % (cmd)
try:
- p = subprocess.Popen( cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE )
+ p = subprocess.Popen( cmd, shell=True, stdout=subprocess.PIPE )
p.wait();
- if p.returncode == 0:
- self.wcversion = p.stdout.readline().rstrip()
+ if p.returncode:
+ sys.exit( 1 )
+ self.wcversion = p.stdout.readline().rstrip()
except:
pass
# parse output: svn info PROJECT_DIR
cmd = 'svn info ' + initial_project_dir
- print 'running: %s' % (cmd)
+ print 'attempting to probe subversion: %s' % (cmd)
try:
- p = subprocess.Popen( cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE )
+ p = subprocess.Popen( cmd, shell=True, stdout=subprocess.PIPE )
p.wait();
- if p.returncode == 0:
- for line in p.stdout:
- (name,value) = re.match( '([^:]+):\\s+(.+)', line.rstrip() ).groups()
- if name == 'URL':
- self.url = value
- elif name == 'Repository Root':
- self.root = value
- elif name == 'Repository UUID':
- self.uuid = value
- elif name == 'Revision':
- self.rev = int( value )
- elif name == 'Last Changed Date':
- # strip chars in parens
- if value.find( ' (' ):
- self.date = value[0:value.find(' (')]
- else:
- self.date = value
+ if p.returncode:
+ sys.exit( 1 )
+ for line in p.stdout:
+ (name,value) = re.match( '([^:]+):\\s+(.+)', line.rstrip() ).groups()
+ if name == 'URL':
+ self.url = value
+ elif name == 'Repository Root':
+ self.root = value
+ elif name == 'Repository UUID':
+ self.uuid = value
+ elif name == 'Revision':
+ self.rev = int( value )
+ elif name == 'Last Changed Date':
+ # strip chars in parens
+ if value.find( ' (' ):
+ self.date = value[0:value.find(' (')]
+ else:
+ self.date = value
except:
pass
config.add( 'HB.version.minor', project.vminor )
config.add( 'HB.version.point', project.vpoint )
config.add( 'HB.version', project.version )
-config.add( 'HB.version.hex', '%04x%02x%02x%02x%06x' % (project.vmajor,project.vminor,project.vpoint,0,repo.rev) )
+config.add( 'HB.version.hex', '%04x%02x%02x%08x' % (project.vmajor,project.vminor,project.vpoint,repo.rev) )
config.add( 'HB.build', project.build )
projects / handbrake / commitdiff