Skip to content

Loading…

OS X 10.8 compatibility etc. #52

Merged
merged 0 commits into from

3 participants

@a2sheppy

Update to handle OS X 10.8, be more intelligent about finding Xcode, prompt the user to install Java if it's not installed (since some of the android stuff requires it), and add information about what to do once Xcode is installed.

@marshall marshall commented on an outdated diff
scripts/bootstrap-mac.sh
@@ -89,7 +89,10 @@ run_command() {
bootstrap_mac() {
check_xcode
-
+
+ java_ver=`java -version`
+ echo "$java_ver"
@marshall Mozilla-B2G member
marshall added a note

Looks like this might be left over debugging code..

@michaelwu Mozilla-B2G member

Please remove this. We do not use java in the build, despite any messages that may complain about it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@marshall marshall commented on an outdated diff
scripts/bootstrap-mac.sh
((24 lines not shown))
+ else
+ echo "You will need to install \"Xcode 3.2.6 for Snow Leopard\" to build Boot2Gecko."
+ echo "Note: This is a 4.1GB download, and requires a free Apple account."
+ echo ""
+ prompt_question "Do you want to download XCode 3.2.6 for Snow Leopard in your browser? [Y/n] " Y
+ if [[ $answer = Y ]]; then
+ run_command open https://developer.apple.com/downloads/download.action\?path=Developer_Tools/xcode_3.2.6_and_ios_sdk_4.3__final/xcode_3.2.6_and_ios_sdk_4.3.dmg
+ fi
+ fi
+ echo ""
+ echo "After installing Xcode, follow these steps:"
+ echo " 1. Run Xcode to allow it to configure itself."
+ echo " 2. If it asks for permission to update the command line tools, let it."
+ echo " 3. If it doesn't, open the Preferences, go to the Downloads panel, and install them."
+ echo ""
+ echo "Then run this script again to continue configuring to build Boot2Gecko."
@marshall Mozilla-B2G member
marshall added a note

Hrm, were these steps necessary in Lion / Snow Leopard as well, or just Mountain Lion?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@marshall marshall commented on an outdated diff
scripts/bootstrap-mac.sh
((85 lines not shown))
+ fi
+
+ # Start with the 10.6 SDK and fall back toward newer and newer
+ # ones until we find one
+
+ if [ -d "$osx_106_sdk" ]; then
+ osx_sdk=$osx_106_sdk
+ elif [ -d "$osx_107_sdk" ]; then
+ osx_sdk=$osx_107_sdk
+ elif [ -d "$osx_108_sdk" ]; then
+ osx_sdk=$osx_108_sdk
+ fi
+
+ # Peel the OS X SDK version out of the path so we don't have to mess with it
+ # by hand; courtesy Geoff Weiss
+ if [[ $osx_sdk =~ MacOSX([0-9]+.[0-9]+).sdk ]]; then
@marshall Mozilla-B2G member
marshall added a note

Nit: the two . here will match any character (not just the literal .), you can fix that by escaping them:

MacOSX([0-9]+\.[0-9]+)\.sdk

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@marshall marshall commented on an outdated diff
scripts/bootstrap-mac.sh
((113 lines not shown))
else
echo "Found Xcode: $xcode_path"
- if [ ! -d "$osx_106_sdk" ]; then
- echo "Error: Could not find MacOSX10.6.sdk in this location:"
- echo " $osx_106_sdk"
+ if [ ! -d "$osx_sdk" ]; then
+ echo "Error: Could not find Mac OS X $sdk_ver SDK in this location:"
@marshall Mozilla-B2G member
marshall added a note

IIRC we actually require the 10.6 SDK in our AOSP build, but I guess 10.7 (or 10.8) worked for you in Mountain Lion?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@a2sheppy a2sheppy merged commit 6940177 into mozilla-b2g:master
@a2sheppy a2sheppy referenced this pull request
Merged

Update to handle OS X 10.8 #75

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 0 additions and 0 deletions.
Something went wrong with that request. Please try again.