Relintai/osxcross
1
0
Fork 0
mirror of https://github.com/Relintai/osxcross.git synced 2025-02-03 22:45:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

build.sh: ignore directories in tarballs/ (#37)

Browse Source 
build.sh, tools.sh: add UNATTENDED option (#37)
xcrun.cpp: make local functions static
This commit is contained in:
Thomas Pöchtrager 2015-06-21 19:35:09 +02:00
parent 54d6ae9172
commit c1e2c3a6d6
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -42,7 +42,7 @@ On debian like systems you can also use [llvm.org/apt](http://llvm.org/apt) to g
But be careful, that repository is known to cause [troubles](https://github.com/tpoechtrager/osxcross/issues/16). But be careful, that repository is known to cause [troubles](https://github.com/tpoechtrager/osxcross/issues/16).
\-- \--
Then run `./build.sh` to build the cross toolchain. Then run `[UNATTENDED=1] ./build.sh` to build the cross toolchain.
(It will search 'tarballs' for your SDK and then build in its own directory.) (It will search 'tarballs' for your SDK and then build in its own directory.)
**Do not forget** to add `<path>/target/bin` to your PATH variable. **Do not forget** to add `<path>/target/bin` to your PATH variable.

16
build.sh
View File

@ -18,14 +18,14 @@ function guess_sdk_version()
echo no SDK found in 'tarballs/'. please see README.md echo no SDK found in 'tarballs/'. please see README.md
exit 1 exit 1
elif [ $sdkcount -gt 1 ]; then elif [ $sdkcount -gt 1 ]; then
sdks=`find tarballs/ | grep MacOSX` sdks=`find tarballs/ -type f | grep MacOSX`
for sdk in $sdks; do echo $sdk; done for sdk in $sdks; do echo $sdk; done
echo 'more than one MacOSX SDK tarball found. please set' echo 'more than one MacOSX SDK tarball found. please set'
echo 'SDK_VERSION environment variable for the one you want' echo 'SDK_VERSION environment variable for the one you want'
echo '(for example: SDK_VERSION=10.x [OSX_VERSION_MIN=10.x] ./build.sh)' echo '(for example: SDK_VERSION=10.x [OSX_VERSION_MIN=10.x] ./build.sh)'
exit 1 exit 1
else else
sdk=`find tarballs/ | grep MacOSX` sdk=`find tarballs/ -type f | grep MacOSX`
tmp2=`echo ${sdk/bz2/} | sed s/[^0-9.]//g` tmp2=`echo ${sdk/bz2/} | sed s/[^0-9.]//g`
tmp3=`echo $tmp2 | sed s/\\\.*$//g` tmp3=`echo $tmp2 | sed s/\\\.*$//g`
guess_sdk_version_result=$tmp3 guess_sdk_version_result=$tmp3
@ -44,7 +44,7 @@ function verify_sdk_version()
{ {
sdkv=$1 sdkv=$1
for file in tarballs/*; do for file in tarballs/*; do
if [ `echo $file | grep OSX.*$sdkv` ]; then if [ -f "$file" ] && [ `echo $file | grep OSX.*$sdkv` ]; then
echo "verified at "$file echo "verified at "$file
sdk=$file sdk=$file
fi fi
@ -104,8 +104,10 @@ echo "Tarball Directory: $TARBALL_DIR"
echo "Build Directory: $BUILD_DIR" echo "Build Directory: $BUILD_DIR"
echo "Install Directory: $TARGET_DIR" echo "Install Directory: $TARGET_DIR"
echo "SDK Install Directory: $SDK_DIR" echo "SDK Install Directory: $SDK_DIR"
echo "" if [ -z "$UNATTENDED" ]; then
read -p "Press enter to start building" echo ""
read -p "Press enter to start building"
fi
echo "" echo ""
export PATH=$TARGET_DIR/bin:$PATH export PATH=$TARGET_DIR/bin:$PATH
@ -267,7 +269,9 @@ do
echo "You can press ctrl-c to break the build process," echo "You can press ctrl-c to break the build process,"
echo "if you restart ./build.sh then we will continue from here" echo "if you restart ./build.sh then we will continue from here"
echo "" echo ""
read -p "Press enter to continue" if [ -z "$UNATTENDED" ]; then
read -p "Press enter to continue"
fi
ls $TARBALL_DIR/MacOSX$SDK_VERSION* &>/dev/null ls $TARBALL_DIR/MacOSX$SDK_VERSION* &>/dev/null
done done
set -e set -e

9
tools/tools.sh
View File

@ -48,8 +48,13 @@ function require()
which $1 &>/dev/null which $1 &>/dev/null
while [ $? -ne 0 ] while [ $? -ne 0 ]
do do
echo "" if [ -z "$UNATTENDED" ]; then
read -p "Please install $1 then press enter" echo ""
read -p "Please install '$1' then press enter"
else
echo "Required dependency '$1' is not installed" 1>&2
exit 1
fi
which $1 &>/dev/null which $1 &>/dev/null
done done
set -e set -e

5
wrapper/programs/xcrun.cpp
View File

@ -29,8 +29,9 @@ using namespace tools;
using namespace target; using namespace target;
namespace program { namespace program {
namespace {
static bool showCommand = false; bool showCommand = false;
bool getToolPath(Target &target, std::string &toolpath, const char *tool) { bool getToolPath(Target &target, std::string &toolpath, const char *tool) {
toolpath = target.execpath; toolpath = target.execpath;
@ -130,6 +131,8 @@ int showSDKVersion(Target &target, char **) {
return 0; return 0;
} }
} // anonymous namespace
int xcrun(int argc, char **argv, Target &target) { int xcrun(int argc, char **argv, Target &target) {
if (getenv("xcrun_log")) if (getenv("xcrun_log"))
showCommand = true; showCommand = true;