OSDN Git Service
(root)
/
handbrake-jp
/
handbrake-jp-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WinGui:
[handbrake-jp/handbrake-jp-git.git]
/
make
/
xcodemake
diff --git
a/make/xcodemake
b/make/xcodemake
index
aca4c41
..
93c927c
100755
(executable)
--- a/
make/xcodemake
+++ b/
make/xcodemake
@@
-49,9
+49,8
@@
if [ -n "$reconfigure" ]; then
esac
## invoke configure with (hidden) option which indicates conf performed by xcode
esac
## invoke configure with (hidden) option which indicates conf performed by xcode
- (set -x; $EXTERNAL_SRC/configure --force --build=$EXTERNAL_BUILD \
- $EXTERNAL_CONFARGS \
- --arch=$ARCHS $debug --conf-method=xcode PATH=$PATH )
+ (set -x; $EXTERNAL_SRC/configure --force $EXTERNAL_CONFARGS \
+ --build=$EXTERNAL_BUILD --arch=$ARCHS $debug --conf-method=xcode PATH=$PATH )
fi
## compute goals; these correlate with TARGET_NAME and ACTION from Xcode
fi
## compute goals; these correlate with TARGET_NAME and ACTION from Xcode
@@
-93,6
+92,14
@@
else
jobs=--jobs=$EXTERNAL_JOBS
fi
jobs=--jobs=$EXTERNAL_JOBS
fi
+## log environment as provided by Xcode
+logdir=$EXTERNAL_BUILD/log
+if [ ! -d $logdir ]; then
+ mkdir -p $logdir
+fi
+env | sort > $logdir/xcodemake.env.txt
+
## pull the trigger
## pull the trigger
+## must set BUILD.method != terminal to prevent inifinite recursion
set -x
exec make -C $EXTERNAL_BUILD BUILD.method=xcode $jobs $goals $EXTERNAL_VARS
set -x
exec make -C $EXTERNAL_BUILD BUILD.method=xcode $jobs $goals $EXTERNAL_VARS