[Yt-svn] commit/yt: 2 new changesets

[Bitbucket]

2 new changesets in yt:

http://bitbucket.org/yt_analysis/yt/changeset/163aee6d71a3/
changeset:   r3883:163aee6d71a3
branch:      yt
user:        MatthewTurk
date:        2011-03-24 00:51:18
summary:     Adding cedit enable-ment to the bootstrap_dev script.
affected #:  1 file (1.0 KB)

--- a/yt/utilities/command_line.py	Wed Mar 23 13:56:03 2011 -0500
+++ b/yt/utilities/command_line.py	Wed Mar 23 19:51:18 2011 -0400
@@ -759,6 +759,24 @@
         hgrc_path = [cedit.config.defaultpath("user", uu)]
         hgrc_path = cedit.config.verifypaths(hgrc_path)
         # Now we set up the hgbb extension
+        if uu.config("extensions","config",None) is None:
+            # cedit is a module, but hgbb is a file.  So we call dirname here.
+            cedit_path = os.path.dirname(cedit.__file__)
+            print "Now we're going to turn on the cedit extension in:"
+            print "    ", hgrc_path
+            print "This will enable you to edit your configuration from the"
+            print "command line.  Mainly, this is useful to use the command"
+            print "'addsource', which will let you add a new source to a given"
+            print "mercurial repository -- like a fork, or your own fork."
+            print
+            print "This constitutes adding the path to the cedit extension,"
+            print "which will look like this:"
+            print
+            print "   [extensions]"
+            print "   config=%s" % cedit_path
+            print
+            loki = raw_input("Press enter to go on, Ctrl-C to exit.")
+            cedit.config.setoption(uu, hgrc_path, "extensions.config=%s" % cedit_path)
         if uu.config("extensions","hgbb",None) is None:
             hgbb_path = hgbb.__file__
             if hgbb_path.endswith(".pyc"): hgbb_path = hgbb_path[:-1]


http://bitbucket.org/yt_analysis/yt/changeset/dfd17eb90072/
changeset:   r3884:dfd17eb90072
branch:      yt
user:        MatthewTurk
date:        2011-03-24 00:53:53
summary:     Fixing install script for some odd cases with the compilation of libpng, and
adding a MAKE_PROCS argument so that you can spawn multiple jobs when compiling
a few of the packages.
affected #:  1 file (193 bytes)

--- a/doc/install_script.sh	Wed Mar 23 19:51:18 2011 -0400
+++ b/doc/install_script.sh	Wed Mar 23 19:53:53 2011 -0400
@@ -50,6 +50,10 @@
 MPL_SUPP_CFLAGS=""
 MPL_SUPP_CXXFLAGS=""
 
+# If you want to spawn multiple Make jobs, here's the place to set the
+# arguments.  For instance, "-j4"
+MAKE_PROCS=""
+
 #------------------------------------------------------------------------------#
 #                                                                              #
 # Okay, the script starts here.  Feel free to play with it, but hopefully      #
@@ -334,7 +338,7 @@
         [ ! -e libpng-1.2.43 ] && tar xfz libpng-1.2.43.tar.gz
         echo "Installing PNG"
         cd libpng-1.2.43
-        ( ./configure CFLAGS=-I${DEST_DIR}/include --prefix=${DEST_DIR}/ 2>&1 ) 1>> ${LOG_FILE} || do_exit
+        ( ./configure CPPFLAGS=-I${DEST_DIR}/include CFLAGS=-I${DEST_DIR}/include --prefix=${DEST_DIR}/ 2>&1 ) 1>> ${LOG_FILE} || do_exit
         ( make install 2>&1 ) 1>> ${LOG_FILE} || do_exit
         touch done
         cd ..
@@ -369,7 +373,7 @@
         echo "Installing HDF5"
         cd hdf5-1.8.6
         ( ./configure --prefix=${DEST_DIR}/ --enable-shared 2>&1 ) 1>> ${LOG_FILE} || do_exit
-        ( make install 2>&1 ) 1>> ${LOG_FILE} || do_exit
+        ( make ${MAKE_PROCS} install 2>&1 ) 1>> ${LOG_FILE} || do_exit
         touch done
         cd ..
     fi
@@ -387,7 +391,7 @@
         echo "Installing SQLite3"
         cd sqlite-autoconf-3070500
         ( ./configure --prefix=${DEST_DIR}/ 2>&1 ) 1>> ${LOG_FILE} || do_exit
-        ( make install 2>&1 ) 1>> ${LOG_FILE} || do_exit
+        ( make ${MAKE_PROCS} install 2>&1 ) 1>> ${LOG_FILE} || do_exit
         touch done
         cd ..
     fi
@@ -400,7 +404,7 @@
     cd Python-2.7.1
     ( ./configure --prefix=${DEST_DIR}/ 2>&1 ) 1>> ${LOG_FILE} || do_exit
 
-    ( make 2>&1 ) 1>> ${LOG_FILE} || do_exit
+    ( make ${MAKE_PROCS} 2>&1 ) 1>> ${LOG_FILE} || do_exit
     ( make install 2>&1 ) 1>> ${LOG_FILE} || do_exit
     ( ln -sf ${DEST_DIR}/bin/python2.7 ${DEST_DIR}/bin/pyyt 2>&1 ) 1>> ${LOG_FILE}
     touch done

Repository URL: https://bitbucket.org/yt_analysis/yt/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.