diff options
author | Heikki Lindholm <holin@iki.fi> | 2008-05-30 13:39:35 +0000 |
---|---|---|
committer | Heikki Lindholm <holin@iki.fi> | 2008-05-30 13:39:35 +0000 |
commit | 73fd0c98ca80526f8a0533c6720cf9e315a5053e (patch) | |
tree | 54713e6e6107661c308078dc30db6054bbf0587d /contrib/macosx | |
parent | 2f56fcb02b90dc5081ce9934c4dc107b86b0528e (diff) | |
download | libextractor-73fd0c98ca80526f8a0533c6720cf9e315a5053e.tar.gz libextractor-73fd0c98ca80526f8a0533c6720cf9e315a5053e.zip |
fix permissions and default install location
Diffstat (limited to 'contrib/macosx')
-rwxr-xr-x | contrib/macosx/build-osx-framework.sh | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/contrib/macosx/build-osx-framework.sh b/contrib/macosx/build-osx-framework.sh index 7a9f3dd..bdf0b65 100755 --- a/contrib/macosx/build-osx-framework.sh +++ b/contrib/macosx/build-osx-framework.sh | |||
@@ -15,7 +15,7 @@ | |||
15 | SDK=MacOSX10.4u.sdk | 15 | SDK=MacOSX10.4u.sdk |
16 | ORIG_SDK=/Developer/SDKs/${SDK} | 16 | ORIG_SDK=/Developer/SDKs/${SDK} |
17 | FW_NAME=Extractor.framework | 17 | FW_NAME=Extractor.framework |
18 | FW_BASE_DIR=/tmp/${FW_NAME} | 18 | FW_BASE_DIR=/Library/Frameworks/${FW_NAME} |
19 | BUILD_DIR=/tmp/Extractor-build | 19 | BUILD_DIR=/tmp/Extractor-build |
20 | FINAL_FW_BASE_DIR="${BUILD_DIR}/${FW_NAME}" | 20 | FINAL_FW_BASE_DIR="${BUILD_DIR}/${FW_NAME}" |
21 | SDK_PATH="${BUILD_DIR}/${SDK}" | 21 | SDK_PATH="${BUILD_DIR}/${SDK}" |
@@ -146,6 +146,11 @@ prepare_sdk() | |||
146 | echo "error preparing sdk" | 146 | echo "error preparing sdk" |
147 | exit 1 | 147 | exit 1 |
148 | fi | 148 | fi |
149 | |||
150 | if [ -h "${SDK_PATH}/Library/Frameworks" ] | ||
151 | then | ||
152 | rm -f "${SDK_PATH}/Library/Frameworks" | ||
153 | fi | ||
149 | } | 154 | } |
150 | 155 | ||
151 | prepare_package() | 156 | prepare_package() |
@@ -352,11 +357,13 @@ create_directory_for() | |||
352 | if [ ! -e "${dst_dir}" ] | 357 | if [ ! -e "${dst_dir}" ] |
353 | then | 358 | then |
354 | echo "MKDIR ${dst_dir}" | 359 | echo "MKDIR ${dst_dir}" |
355 | if ! ( mkdir -p "${dst_dir}" ) | 360 | if ! ( mkdir -m 755 -p "${dst_dir}" ) |
356 | then | 361 | then |
357 | echo "failed to create directory: ${dst_dir}" | 362 | echo "failed to create directory: ${dst_dir}" |
358 | exit 1 | 363 | exit 1 |
359 | fi | 364 | fi |
365 | # fix dir permissions | ||
366 | chmod 0755 `find ${FINAL_FW_BASE_DIR} -type d` | ||
360 | fi | 367 | fi |
361 | } | 368 | } |
362 | 369 | ||
@@ -386,6 +393,7 @@ install_executable_to_framework() | |||
386 | then | 393 | then |
387 | echo "LIPO ${dst_file}" | 394 | echo "LIPO ${dst_file}" |
388 | lipo -create -o "${dst_file}" ${src_files} | 395 | lipo -create -o "${dst_file}" ${src_files} |
396 | chmod 0755 "${dst_file}" | ||
389 | fi | 397 | fi |
390 | fi | 398 | fi |
391 | } | 399 | } |
@@ -404,10 +412,11 @@ install_file_to_framework() | |||
404 | then | 412 | then |
405 | echo "CP ${dst_file}" | 413 | echo "CP ${dst_file}" |
406 | cp -PpR "${src_file}" "${dst_file}" | 414 | cp -PpR "${src_file}" "${dst_file}" |
415 | chmod 0755 "${dst_file}" | ||
407 | elif [ -f "${src_file}" ] | 416 | elif [ -f "${src_file}" ] |
408 | then | 417 | then |
409 | echo "INSTALL ${dst_file}" | 418 | echo "INSTALL ${dst_file}" |
410 | install "${src_file}" "${dst_file}" | 419 | install -m 0644 "${src_file}" "${dst_file}" |
411 | else | 420 | else |
412 | echo "no such file: ${src_file}" | 421 | echo "no such file: ${src_file}" |
413 | exit 1 | 422 | exit 1 |
@@ -415,7 +424,7 @@ install_file_to_framework() | |||
415 | else | 424 | else |
416 | if [ -f "${src_file}" ] && [ -f "${dst_file}" ] | 425 | if [ -f "${src_file}" ] && [ -f "${dst_file}" ] |
417 | then | 426 | then |
418 | diff "${src_file}" "${dst_file}" | 427 | diff -q "${src_file}" "${dst_file}" |
419 | fi | 428 | fi |
420 | fi | 429 | fi |
421 | done | 430 | done |
@@ -428,7 +437,7 @@ copy_file_to_framework() | |||
428 | if [ ! -e "$dst_file" ] | 437 | if [ ! -e "$dst_file" ] |
429 | then | 438 | then |
430 | create_directory_for "$dst_file" | 439 | create_directory_for "$dst_file" |
431 | install "$src_file" "$dst_file" | 440 | install -m 0644 "$src_file" "$dst_file" |
432 | fi | 441 | fi |
433 | } | 442 | } |
434 | 443 | ||
@@ -462,9 +471,11 @@ FW_DIR="${FW_BASE_DIR}/${FW_VERSION_DIR}" | |||
462 | FINAL_FW_DIR="${FINAL_FW_BASE_DIR}/${FW_VERSION_DIR}" | 471 | FINAL_FW_DIR="${FINAL_FW_BASE_DIR}/${FW_VERSION_DIR}" |
463 | export PKG_CONFIG_PATH=${FW_DIR}/lib/pkgconfig | 472 | export PKG_CONFIG_PATH=${FW_DIR}/lib/pkgconfig |
464 | ORIG_DIR=$(pwd) | 473 | ORIG_DIR=$(pwd) |
474 | old_umask=$(umask) | ||
465 | 475 | ||
466 | # prepare build env | 476 | # prepare build env |
467 | fetch_all_packages | 477 | fetch_all_packages |
478 | umask 022 | ||
468 | prepare_sdk | 479 | prepare_sdk |
469 | build_toolchain | 480 | build_toolchain |
470 | 481 | ||
@@ -525,4 +536,5 @@ make_framework_link "lib/libextractor" "PlugIns" | |||
525 | make_framework_link "include" "Headers" | 536 | make_framework_link "include" "Headers" |
526 | make_framework_version_links | 537 | make_framework_version_links |
527 | 538 | ||
539 | umask ${old_umask} | ||
528 | echo "done." | 540 | echo "done." |