[Avida-cvs] [avida-svn] r460 - branches/developers/avida-edward/source/python/scripts/osx/one_step_build

[kaben@myxo.css.msu.edu]

Author: kaben
Date: 2006-02-02 16:50:23 -0500 (Thu, 02 Feb 2006)
New Revision: 460

Modified:
   branches/developers/avida-edward/source/python/scripts/osx/one_step_build/All.bash
   branches/developers/avida-edward/source/python/scripts/osx/one_step_build/Avida-ED.bash
   branches/developers/avida-edward/source/python/scripts/osx/one_step_build/Qt.bash
Log:

Changes to Avida-ED one-step build:
- one_step_build/All.bash : Uses Apple's Xcode 2.2.1.
- one_step_build/Qt.bash : Fix Qt to use built-in imaging libraries on OS X --
  this seems to fix the problem of crashes of Avida-ED upon loading png images.
- one_step_build/Avida-ED.bash : Explicitly enables building monolithic
  AvidaCore python module, instead of python package with submodules.



Modified: branches/developers/avida-edward/source/python/scripts/osx/one_step_build/All.bash
===================================================================
--- branches/developers/avida-edward/source/python/scripts/osx/one_step_build/All.bash	2006-02-02 21:36:27 UTC (rev 459)
+++ branches/developers/avida-edward/source/python/scripts/osx/one_step_build/All.bash	2006-02-02 21:50:23 UTC (rev 460)
@@ -65,21 +65,21 @@
 
 	#"$SCRIPT_DIR"/Python.bash -a "$ARCHIVES_DIR"/Python-2.4.2.tar.bz2 -b "$ARCHIVES_DIR" -s Python-2.4.2 -v "$DEBUG"
 
-	#"$SCRIPT_DIR"/Qt.bash -a "$ARCHIVES_DIR"/qt-mac-free-3.3.5.tar.bz2 -b "$ARCHIVES_DIR" -s qt-mac-free-3.3.5 -q "$ARCHIVES_DIR"/qt-mac-free-3.3.5 -v "$DEBUG"
+	"$SCRIPT_DIR"/Qt.bash -a "$ARCHIVES_DIR"/qt-mac-free-3.3.5.tar.bz2 -b "$ARCHIVES_DIR" -s qt-mac-free-3.3.5 -q "$ARCHIVES_DIR"/qt-mac-free-3.3.5 -v "$DEBUG"
 
-	#"$SCRIPT_DIR"/SIP.bash -a "$ARCHIVES_DIR"/sip-4.3.2.tar.gz -b "$ARCHIVES_DIR" -s sip-4.3.2 -q "$ARCHIVES_DIR"/qt-mac-free-3.3.5 -v "$DEBUG"
+	"$SCRIPT_DIR"/SIP.bash -a "$ARCHIVES_DIR"/sip-4.3.2.tar.gz -b "$ARCHIVES_DIR" -s sip-4.3.2 -q "$ARCHIVES_DIR"/qt-mac-free-3.3.5 -v "$DEBUG"
 
-	#"$SCRIPT_DIR"/PyQt.bash -a "$ARCHIVES_DIR"/PyQt-mac-gpl-3.15.1.tar.gz -b "$ARCHIVES_DIR" -s PyQt-mac-gpl-3.15.1 -q "$ARCHIVES_DIR"/qt-mac-free-3.3.5 -v "$DEBUG"
+	"$SCRIPT_DIR"/PyQt.bash -a "$ARCHIVES_DIR"/PyQt-mac-gpl-3.15.1.tar.gz -b "$ARCHIVES_DIR" -s PyQt-mac-gpl-3.15.1 -q "$ARCHIVES_DIR"/qt-mac-free-3.3.5 -v "$DEBUG"
 
-	#"$SCRIPT_DIR"/Numeric.bash -a "$ARCHIVES_DIR"/Numeric-23.6-osx3.tar.gz -b "$ARCHIVES_DIR" -s Numeric-23.6-osx3 -v "$DEBUG"
+	"$SCRIPT_DIR"/Numeric.bash -a "$ARCHIVES_DIR"/Numeric-23.6-osx3.tar.gz -b "$ARCHIVES_DIR" -s Numeric-23.6-osx3 -v "$DEBUG"
 
-	#"$SCRIPT_DIR"/PyQwt.bash -a "$ARCHIVES_DIR"/PyQwt-4.2.tar.gz -b "$ARCHIVES_DIR" -s PyQwt-4.2 -q "$ARCHIVES_DIR"/qt-mac-free-3.3.5 -v "$DEBUG"
+	"$SCRIPT_DIR"/PyQwt.bash -a "$ARCHIVES_DIR"/PyQwt-4.2.tar.gz -b "$ARCHIVES_DIR" -s PyQwt-4.2 -q "$ARCHIVES_DIR"/qt-mac-free-3.3.5 -v "$DEBUG"
 
-	"$SCRIPT_DIR"/ElementTree.bash -a "$ARCHIVES_DIR"/elementtree-1.2.6-20050316.tar.gz -b "$ARCHIVES_DIR" -s elementtree-1.2.6-20050316 -v "$DEBUG"
+	#"$SCRIPT_DIR"/ElementTree.bash -a "$ARCHIVES_DIR"/elementtree-1.2.6-20050316.tar.gz -b "$ARCHIVES_DIR" -s elementtree-1.2.6-20050316 -v "$DEBUG"
 
-	"$SCRIPT_DIR"/GCC-XML.bash -a "$ARCHIVES_DIR"/gccxml-0.6.0.tar.gz -b "$ARCHIVES_DIR" -s gccxml-0.6.0 -v "$DEBUG"
+	#"$SCRIPT_DIR"/GCC-XML.bash -a "$ARCHIVES_DIR"/gccxml-0.6.0.tar.gz -b "$ARCHIVES_DIR" -s gccxml-0.6.0 -v "$DEBUG"
 
-	"$SCRIPT_DIR"/Boost.bash -a "$ARCHIVES_DIR"/boost_1_33_0-osx4.tar.bz2 -b "$ARCHIVES_DIR" -s boost_1_33_0 -v "$DEBUG"
+	#"$SCRIPT_DIR"/Boost.bash -a "$ARCHIVES_DIR"/boost_1_33_0-osx4.tar.bz2 -b "$ARCHIVES_DIR" -s boost_1_33_0 -v "$DEBUG"
 
 	#"$SCRIPT_DIR"/Py2App.bash -a "$ARCHIVES_DIR"/py2app-0.1.7.tar.gz -b "$ARCHIVES_DIR" -s py2app-0.1.7 -v "$DEBUG"
 

Modified: branches/developers/avida-edward/source/python/scripts/osx/one_step_build/Avida-ED.bash
===================================================================
--- branches/developers/avida-edward/source/python/scripts/osx/one_step_build/Avida-ED.bash	2006-02-02 21:36:27 UTC (rev 459)
+++ branches/developers/avida-edward/source/python/scripts/osx/one_step_build/Avida-ED.bash	2006-02-02 21:50:23 UTC (rev 460)
@@ -71,12 +71,13 @@
 
 mkdir -p "$BUILD_DIR/Avida-ED"
 pushd "$BUILD_DIR/Avida-ED"
-rm -fr "$BUILD_DIR/Avida-ED/bin/Avida-ED.app" "$BUILD_DIR/Avida-ED/source/python/build"
+rm -fr "$BUILD_DIR/Avida-ED/lib/AvidaCore"* "$BUILD_DIR/Avida-ED/bin/Avida-ED.app" "$BUILD_DIR/Avida-ED/source/python/build"
 /usr/local/bin/cmake \
  -DAVD_GUI_NCURSES:BOOL=ON \
  -DAVD_GUI_PYQT:BOOL=ON \
  -DAVD_PRIMITIVE:BOOL=ON \
  -DAVD_PY_BINDINGS:BOOL=ON \
+ -DAVD_PY_MONOLITHIC:BOOL=ON \
  -DAVD_PY_MODULE:BOOL=OFF \
  -DAVD_UNIT_TESTS:BOOL=OFF \
  -DBOOST_INCLUDE_PATH:PATH="$BOOST_INCLUDE_PATH" \

Modified: branches/developers/avida-edward/source/python/scripts/osx/one_step_build/Qt.bash
===================================================================
--- branches/developers/avida-edward/source/python/scripts/osx/one_step_build/Qt.bash	2006-02-02 21:36:27 UTC (rev 459)
+++ branches/developers/avida-edward/source/python/scripts/osx/one_step_build/Qt.bash	2006-02-02 21:50:23 UTC (rev 460)
@@ -44,7 +44,7 @@
 pushd "$BUILD_PATH"
 mkdir -p "$SOURCE_SUBDIR"
 pushd "$SOURCE_SUBDIR"
-yes yes | "$SOURCE_PATH/configure" -libdir /usr/local/lib -thread -verbose
+yes yes | "$SOURCE_PATH/configure" -libdir /usr/local/lib -thread -verbose -system-libpng -system-libjpeg -system-libmng
 # The generated makefile isn't parallelized, so we can't use -j2.
 make install