[frontierkernel-commits] Frontier/build_XCode/Frontier.xcode project.pbxproj,1.20,1.21

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/build_XCode/Frontier.xcode
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5352/Frontier.xcode

Modified Files:
	project.pbxproj 
Log Message:
Make extraction of version string from versions.h more robust in the post-build shell script.

Index: project.pbxproj
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/build_XCode/Frontier.xcode/project.pbxproj,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** project.pbxproj	17 Sep 2005 16:39:24 -0000	1.20
--- project.pbxproj	4 Feb 2006 23:24:16 -0000	1.21
***************
*** 36,39 ****
--- 36,40 ----
  				BB3B83610730603C0049D0C1,
  				651527B7072BFE0E00411831,
+ 				65CF0C7F099545A4006E3A79,
  			);
  			isa = PBXGroup;
***************
*** 649,653 ****
  			name = Frontier;
  			productName = "Frontier OSX MachO Debug";
! 			productReference = 65152569072BFC6500411831;
  			productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
  <!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
--- 650,654 ----
  			name = Frontier;
  			productName = "Frontier OSX MachO Debug";
! 			productReference = 65CF0C7F099545A4006E3A79;
  			productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
  <!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
***************
*** 658,669 ****
  			productType = "com.apple.product-type.application";
  		};
- 		65152569072BFC6500411831 = {
- 			explicitFileType = wrapper.application;
- 			includeInIndex = 0;
- 			isa = PBXFileReference;
- 			path = Frontier.app;
- 			refType = 3;
- 			sourceTree = BUILT_PRODUCTS_DIR;
- 		};
  		6515256C072BFC6700411831 = {
  			children = (
--- 659,662 ----
***************
*** 8654,8657 ****
--- 8647,8658 ----
  			};
  		};
+ 		65CF0C7F099545A4006E3A79 = {
+ 			explicitFileType = wrapper.application;
+ 			includeInIndex = 0;
+ 			isa = PBXFileReference;
+ 			path = Frontier.app;
+ 			refType = 3;
+ 			sourceTree = BUILT_PRODUCTS_DIR;
+ 		};
  		65D516AA072CED430097D18E = {
  			fileEncoding = 30;
***************
*** 8719,8723 ****
  			runOnlyForDeploymentPostprocessing = 0;
  			shellPath = /bin/sh;
! 			shellScript = "# debug\n#set -x\n#printenv\n\n# Build Frontier.icns file\n# There seems to be some bugs here, so just use\n# pre-created Frontier.icns file.\n# Also add \"icns.r\" path to Input files and\n# \"Frontier.icns\" path to Output files below.\n\n#/Developer/Tools/Rez \"${SRCROOT}/../resources/Frontier/icns.r\" -d TARGET_API_MAC_CARBON=1 -d FRONTIER_FRAMEWORK_INCLUDES=1 -i \"${SRCROOT}/../Common/headers\" -useDF -o \"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Frontier.icns\"\n\n# Strip trademark character to prevent problems wuth shell quoting\n#product_str=`echo ${PRODUCT_NAME} | awk -F '\\342' '{print $1};'`\n\nproduct_str=${PRODUCT_NAME}\n\n# Parse the \"versions.h\" file for useful variables\n\nversion_str=`grep \"frontier_version_string\" \"${SRCROOT}/../Common/headers/versions.h\" | awk -F \\\" '{print $2};'`\ncopyright_year_str=`grep \"copyright_year_string\" \"${SRCROOT}/../Common/headers/versions.h\" | awk -F \\\" '{print $2};'`\n\n# Update the Info.plist\n# Could append \"(dbg)\" to product name for Development build style\n\n#defaults write \"${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Info\" CFBundleVersion ${version_str}\n\n# or use sed\n\nsed -e \"s/\\${PRODUCT_NAME_STR}/${product_str}/g\" -e \"s/\\${PRODUCT_VERSION_STR}/${version_str}/g\" -e \"s/\\${COPYRIGHT_YEAR_STR}/${copyright_year_str}/g\" \"${SRCROOT}/Info.Plist\" > \"${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Info.plist\"";
  		};
  		DEA58AB307435A9500BAB271 = {
--- 8720,8724 ----
  			runOnlyForDeploymentPostprocessing = 0;
  			shellPath = /bin/sh;
! 			shellScript = "# debug\n#set -x\n#printenv\n\n# Build Frontier.icns file\n# There seems to be some bugs here, so just use\n# pre-created Frontier.icns file.\n# Also add \"icns.r\" path to Input files and\n# \"Frontier.icns\" path to Output files below.\n\n#/Developer/Tools/Rez \"${SRCROOT}/../resources/Frontier/icns.r\" -d TARGET_API_MAC_CARBON=1 -d FRONTIER_FRAMEWORK_INCLUDES=1 -i \"${SRCROOT}/../Common/headers\" -useDF -o \"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Frontier.icns\"\n\n# Strip trademark character to prevent problems wuth shell quoting\n#product_str=`echo ${PRODUCT_NAME} | awk -F '\\342' '{print $1};'`\n\nproduct_str=${PRODUCT_NAME}\n\n# Parse the \"versions.h\" file for useful variables\n\nversion_str=`grep \"frontier_version_string\" \"${SRCROOT}/../Common/headers/versions.h\" | awk -F \\\" '{print $2};'`\ncopyright_year_str=`grep \"#define[[:space:]]*copyright_year_string\" \"${SRCROOT}/../Common/headers/versions.h\" | awk -F \\\" '{print $2};'`\n\n# Update the Info.plist\n# Could append \"(dbg)\" to product name for Development build style\n\n#defaults write \"${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Info\" CFBundleVersion ${version_str}\n\n# or use sed\n\nsed -e \"s/\\${PRODUCT_NAME_STR}/${product_str}/g\" -e \"s/\\${PRODUCT_VERSION_STR}/${version_str}/g\" -e \"s/\\${COPYRIGHT_YEAR_STR}/${copyright_year_str}/g\" \"${SRCROOT}/Info.Plist\" > \"${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Info.plist\"";
  		};
  		DEA58AB307435A9500BAB271 = {