minor updates for the OS X release script

scripts/release-osx.sh

@@ -101,16 +101,16 @@ check_mandatory_library_linkage ${FATLIB} "${LIBS}" /usr/lib/libxml2.2.dylib
 # check_mandatory_library_linkage ${FATLIB} "${LIBS}" /usr/lib/libz.1.dylib
 
 # Clean up the previous build directory
-rm -rf build/
+rm -rf build/ igraphcore/
 
 # Set up ARCHFLAGS to ensure that we build a multi-arch Python extension
 export ARCHFLAGS="-arch i386 -arch x86_64"
 
 # For each Python version, build the .mpkg and the .dmg
 for PYVER in $PYTHON_VERSIONS; do
   PYTHON=/usr/bin/python$PYVER
-  $PYTHON setup.py build_ext --no-download --no-pkg-config -I ../igraph/include:../igraph/build/include -L `dirname $FATLIB` || exit 3
-  $PYTHON setup.py bdist_mpkg --no-download --no-pkg-config || exit 4
+  $PYTHON setup.py build_ext --no-download --no-wait --no-pkg-config -I ../igraph/include:../igraph/fatbuild/x86/include -L `dirname $FATLIB` || exit 3
+  $PYTHON setup.py bdist_mpkg --no-download --no-wait --no-pkg-config || exit 4
 
   # Ensure that the built library is really universal
   LIB=build/lib.macosx-*-${PYVER}/igraph/_igraph.so

setup.py

@@ -515,6 +515,7 @@ def __init__(self):
         self.excluded_library_dirs = []
         self.pre_build_hooks = []
         self.post_build_hooks = []
+        self.wait = True
 
     @property
     def has_pkgconfig(self):
@@ -682,6 +683,9 @@ def process_args_from_command_line(self):
             elif option == "--no-progress-bar":
                 opts_to_remove.append(idx)
                 self.show_progress_bar = False
+            elif option == "--no-wait":
+                opts_to_remove.append(idx)
+                self.wait = False
             elif option.startswith("--c-core-version"):
                 opts_to_remove.append(idx)
                 if option == "--c-core-version":
@@ -751,7 +755,7 @@ def use_educated_guess(self):
         print("- LIBIGRAPH_FALLBACK_LIBRARY_DIRS")
         print("")
 
-        seconds_remaining = 10
+        seconds_remaining = 10 if self.wait else 0
         while seconds_remaining > 0:
             if seconds_remaining > 1:
                 plural = "s"