From: znek Date: Wed, 13 Feb 2008 01:04:10 +0000 (+0000) Subject: fix bundles in wrapper deployment setup, properly enabling libxmlSaxDriver.sax in... X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9aa63c5dbb6ccc86f23f8769778069b4d02e9fcf;p=sope fix bundles in wrapper deployment setup, properly enabling libxmlSaxDriver.sax in wrapper setups git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1604 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- diff --git a/SOPE.xcodeproj/project.pbxproj b/SOPE.xcodeproj/project.pbxproj index 75cb81dd..4c85f5a3 100644 --- a/SOPE.xcodeproj/project.pbxproj +++ b/SOPE.xcodeproj/project.pbxproj @@ -578,6 +578,7 @@ ADDF476A06DA572500C4E7F8 /* Project object */ = { isa = PBXProject; buildConfigurationList = ADA076390857281C00993825 /* Build configuration list for PBXProject "SOPE" */; + compatibilityVersion = "Xcode 2.4"; hasScannedForEncodings = 0; mainGroup = ADDF476606DA572500C4E7F8; productRefGroup = AD0C92DE08AC9E0C00952E9F /* Products */; @@ -620,6 +621,7 @@ ProjectRef = AD5836810C4F86B500745D88 /* WebObjects.xcodeproj */; }, ); + projectRoot = ""; targets = ( ADDF479906DA58D700C4E7F8 /* all */, ADDF478006DA57DA00C4E7F8 /* Wrapper Contents */, @@ -669,7 +671,7 @@ ); runOnlyForDeploymentPostprocessing = 1; shellPath = /bin/sh; - shellScript = "# setenv PRODUCT_NAME SOPE\n# setenv FULL_PRODUCT_NAME SOPE.framework\n# setenv FRAMEWORKS_FOLDER_PATH SOPE.framework/Versions/A/Frameworks\n\n## defs\n\nUMBRELLA_EXE=${UMBRELLA_DEPLOYMENT_DIR}/${FULL_PRODUCT_NAME}/${PRODUCT_NAME}\nUMBRELLA_FRAMEWORKS_DIR=${UMBRELLA_DEPLOYMENT_DIR}/${FRAMEWORKS_FOLDER_PATH}\n\n\n## sub\n\nfix_installnames_in_framework() {\n FW_EXE=\"$1\"\n# echo \"=========== $1 ============\"\n# otool -L ${FW_EXE}\n\n FW_ID=`otool -L \"${FW_EXE}\" | tail -n +2 | head -1| grep \"${EMBEDDED_FRAMEWORKS_DIR}\" | awk -F\\( '{print $1}'`\n\n if [ \"$FW_ID\" != \"\" ]; then\n x=`echo $FW_ID | sed -e \"s;${EMBEDDED_FRAMEWORKS_DIR};@executable_path/\\.\\./Frameworks/${FRAMEWORKS_FOLDER_PATH};\"`\n install_name_tool -id ${x} ${FW_EXE}\n echo \"Changed ID: ${FW_EXE}\"\n fi\n\n INSTALL_NAMES=`otool -L \"${FW_EXE}\" | tail -n +3 | grep \"${EMBEDDED_FRAMEWORKS_DIR}\" | awk -F\\( '{print $1}'`\n# echo $INSTALL_NAMES\n\n install_name_tool_args=\"\"\n\n for i in ${INSTALL_NAMES}\n do\n x=`echo $i | sed -e \"s;${EMBEDDED_FRAMEWORKS_DIR};@executable_path/\\.\\./Frameworks/${FRAMEWORKS_FOLDER_PATH};\"`\n# echo \"$i -> $x\"\n install_name_tool_args=\"${install_name_tool_args} -change $i $x\"\n done\n# echo \"install_name_tool ${install_name_tool_args} ${FW_EXE}\"\n if [ \"${install_name_tool_args}\" != \"\" ]; then\n install_name_tool ${install_name_tool_args} ${FW_EXE}\n echo \"Fixed: ${FW_EXE}\"\n fi\n}\n\n## main\n\n# copy raw umbrella to intended destination dir\n\nrm -rf \"${UMBRELLA_DEPLOYMENT_DIR}/${FULL_PRODUCT_NAME}\"\ncp -R \"${EMBEDDED_FRAMEWORKS_DIR}/${FULL_PRODUCT_NAME}\" \"${UMBRELLA_DEPLOYMENT_DIR}\"\n\nfix_installnames_in_framework ${UMBRELLA_EXE}\nFRAMEWORK_DIRS=`find ${UMBRELLA_DEPLOYMENT_DIR}/${FRAMEWORKS_FOLDER_PATH} -type d -name '*.framework'`\nfor fw in ${FRAMEWORK_DIRS}\ndo\n fw_exe=\"${fw##*/}\"\n fw_exe=\"${fw}/${fw_exe%.framework}\"\n fix_installnames_in_framework ${fw_exe}\ndone\n\n# remove Headers\n\nfind ${UMBRELLA_DEPLOYMENT_DIR}/${FRAMEWORKS_FOLDER_PATH} -type d -name Headers -exec rm -rf {} \\; > /dev/null 2>&1\nexit 0\n"; + shellScript = "# setenv PRODUCT_NAME SOPE\n# setenv FULL_PRODUCT_NAME SOPE.framework\n# setenv FRAMEWORKS_FOLDER_PATH SOPE.framework/Versions/A/Frameworks\n\n## defs\n\nUMBRELLA_EXE=${UMBRELLA_DEPLOYMENT_DIR}/${FULL_PRODUCT_NAME}/${PRODUCT_NAME}\nUMBRELLA_FRAMEWORKS_DIR=${UMBRELLA_DEPLOYMENT_DIR}/${FRAMEWORKS_FOLDER_PATH}\n\n\n## sub\n\nfix_installnames_in_framework() {\n FW_EXE=\"$1\"\n# echo \"=========== $1 ============\"\n# otool -L ${FW_EXE}\n\n FW_ID=`otool -L \"${FW_EXE}\" | tail -n +2 | head -1| grep \"${EMBEDDED_FRAMEWORKS_DIR}\" | awk -F\\( '{print $1}'`\n\n if [ \"$FW_ID\" != \"\" ]; then\n x=`echo $FW_ID | sed -e \"s;${EMBEDDED_FRAMEWORKS_DIR};@executable_path/\\.\\./Frameworks/${FRAMEWORKS_FOLDER_PATH};\"`\n install_name_tool -id ${x} ${FW_EXE}\n echo \"Changed ID: ${FW_EXE}\"\n fi\n\n # NOTE: for frameworks, this should be +3... but for bundles, +2 also does the trick\n INSTALL_NAMES=`otool -L \"${FW_EXE}\" | tail -n +2 | grep \"${EMBEDDED_FRAMEWORKS_DIR}\" | awk -F\\( '{print $1}'`\n# echo $INSTALL_NAMES\n\n install_name_tool_args=\"\"\n\n for i in ${INSTALL_NAMES}\n do\n x=`echo $i | sed -e \"s;${EMBEDDED_FRAMEWORKS_DIR};@executable_path/\\.\\./Frameworks/${FRAMEWORKS_FOLDER_PATH};\"`\n# echo \"$i -> $x\"\n install_name_tool_args=\"${install_name_tool_args} -change $i $x\"\n done\n# echo \"install_name_tool ${install_name_tool_args} ${FW_EXE}\"\n if [ \"${install_name_tool_args}\" != \"\" ]; then\n install_name_tool ${install_name_tool_args} ${FW_EXE}\n echo \"Fixed: ${FW_EXE}\"\n fi\n}\n\n## main\n\n# copy raw umbrella to intended destination dir\n\nrm -rf \"${UMBRELLA_DEPLOYMENT_DIR}/${FULL_PRODUCT_NAME}\"\ncp -R \"${EMBEDDED_FRAMEWORKS_DIR}/${FULL_PRODUCT_NAME}\" \"${UMBRELLA_DEPLOYMENT_DIR}\"\n\nfix_installnames_in_framework ${UMBRELLA_EXE}\nFRAMEWORK_DIRS=`find ${UMBRELLA_DEPLOYMENT_DIR}/${FRAMEWORKS_FOLDER_PATH} -type d -name '*.framework'`\n#echo \"FRAMEWORK_DIRS: $FRAMEWORK_DIRS\"\nfor fw in ${FRAMEWORK_DIRS}\ndo\n fw_exe=\"${fw##*/}\"\n fw_exe=\"${fw}/${fw_exe%.framework}\"\n #echo \"fw_exe: $fw_exe\"\n fix_installnames_in_framework ${fw_exe}\ndone\n\nBUNDLE_DIRS=`find ${UMBRELLA_DEPLOYMENT_DIR}/${FRAMEWORKS_FOLDER_PATH} -type d -name '*.sax'`\n#echo \"BUNDLE_DIRS: $BUNDLE_DIRS\"\nfor bndl in ${BUNDLE_DIRS}\ndo\n bndl_exe=\"${bndl##*/}\"\n bndl_exe=\"${bndl}/Contents/MacOS/${bndl_exe%.sax}\"\n #echo \"bndl_exe: $bndl_exe\"\n fix_installnames_in_framework ${bndl_exe}\ndone\n\n# remove Headers\n\nfind ${UMBRELLA_DEPLOYMENT_DIR}/${FRAMEWORKS_FOLDER_PATH} -type d -name Headers -exec rm -rf {} \\; > /dev/null 2>&1\nexit 0\n"; }; /* End PBXShellScriptBuildPhase section */