Fixed #75: Handle updates of autogen-result.tar.gz properly.

dvh-chacham15-master
Hoa V. DINH 10 years ago
parent f6a2448621
commit 1eee95d3b1
  1. 1
      .gitignore
  2. 2
      build-mac/libetpan.xcodeproj/project.pbxproj
  3. 9
      build-mac/update.sh

1
.gitignore vendored

@ -9,6 +9,7 @@
project.xcworkspace/
xcuserdata/
/build-mac/autogen-result.md5
/build-mac/build
/build-mac/include
/build-mac/dependencies/build/

@ -1859,7 +1859,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "mkdir -p \"$BUILT_PRODUCTS_DIR/$PUBLIC_HEADERS_FOLDER_PATH\"\nln -sf \"Versions/Current/Headers\" \"$BUILT_PRODUCTS_DIR/$FULL_PRODUCT_NAME/Headers\"\nrsync -aL \"$SRCROOT/../include/libetpan/\" \"$BUILT_PRODUCTS_DIR/$PUBLIC_HEADERS_FOLDER_PATH/\"\n";
shellScript = "mkdir -p \"$BUILT_PRODUCTS_DIR/$PUBLIC_HEADERS_FOLDER_PATH\"\nmkdir -p \"$BUILT_PRODUCTS_DIR/include/libetpan\"\nln -sf \"Versions/Current/Headers\" \"$BUILT_PRODUCTS_DIR/$FULL_PRODUCT_NAME/Headers\"\nrsync -aL \"$SRCROOT/../include/libetpan/\" \"$BUILT_PRODUCTS_DIR/include/libetpan/\"\nrsync -aL \"$SRCROOT/../include/libetpan/\" \"$BUILT_PRODUCTS_DIR/$PUBLIC_HEADERS_FOLDER_PATH/\"\n";
};
C6740DB515B384FB00D4A16B /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;

@ -32,9 +32,16 @@ if test x$ACTION = x ; then
fi
if test x$ACTION = xbuild ; then
md5 build-mac/autogen-result.tar.gz > build-mac/autogen-result.md5.new
if ! cmp -s build-mac/autogen-result.md5 build-mac/autogen-result.md5.new ; then
rm Makefile
fi
rm -f build-mac/autogen-result.md5.new
if test ! -f Makefile ; then
echo configuring
tar xzf build-mac/autogen-result.tar.gz
export SDKROOT=
./configure --enable-debug > "$logfile" 2>&1
if [[ "$?" != "0" ]]; then
echo "configure failed"
@ -43,6 +50,7 @@ if test x$ACTION = xbuild ; then
make stamp-prepare-target >> "$logfile" 2>&1
make libetpan-config.h >> "$logfile" 2>&1
md5 build-mac/autogen-result.tar.gz > build-mac/autogen-result.md5
fi
if test x$PLATFORM_NAME = xiphoneos -o x$PLATFORM_NAME = xiphonesimulator ; then
if test ! -d build-mac/libsasl-ios ; then
@ -55,6 +63,7 @@ elif test x$ACTION = xclean ; then
if test -f Makefile ; then
make distclean >/dev/null
cd build-mac
rm -f autogen-result.md5
rm -rf libsasl-ios
rm -rf dependencies/build
fi

Loading…
Cancel
Save