Changeset 12720


Ignore:
Timestamp:
07/24/12 15:43:09 (13 years ago)
Author:
Eric.Larour
Message:

Updated patching of pyport.h + ignore some files under svn

Location:
issm/trunk-jpl/externalpackages/python
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/externalpackages/python

    • Property svn:ignore

      •  

        old new  
        11install
         2install-python*
        23src
        34*.tgz

  • issm/trunk-jpl/externalpackages/python/install-macosx-lion.sh

    r12244 r12720  
    2323#Configure doxygen
    2424cd src
    25 ./configure --prefix="$ISSM_DIR/externalpackages/python/install" --enable-framework="$ISSM_DIR/externalpackages/python/install"
     25./configure --enable-framework="$ISSM_DIR/externalpackages/python/install/Library/Frameworks"
     26#obsolete?
     27#./configure --prefix="$ISSM_DIR/externalpackages/python/install" --enable-framework="$ISSM_DIR/externalpackages/python/install"
     28
     29#make
    2630if [ -z $1 ]; then
    2731        make
    … …  
    3842        ln -s Python.framework/Versions/3.2/include/python3.2m include
    3943        ln -s Python.framework/Versions/3.2/lib/ lib
     44fi
    4045
     46#Some modifications to be done in case version is 2.7
     47if [[ $version == "2.7.2" ]]; then
     48        cd ../install
     49        ln -s Library/Frameworks/Python.framework/Headers include
     50        ln -s Library/Frameworks/Python.framework/Versions/2.7/lib lib
    4151
     52        #Patch pyport.h:
     53        cd include
     54        patch pyport.h ../patch/pyport.h.patch
    4255fi

  • issm/trunk-jpl/externalpackages/python/install-macosx-snowleopard.sh

    r12536 r12720  
    2727# --prefix is recognized as $SOME_PATH as long as this form is taken, so it's not necessary to include
    2828./configure --enable-framework="$ISSM_DIR/externalpackages/python/install/Library/Frameworks"
     29
     30#make
    2931if [ -z $1 ]; then
    3032        make
    … …  
    4850        ln -s Library/Frameworks/Python.framework/Headers include
    4951        ln -s Library/Frameworks/Python.framework/Versions/2.7/lib lib
     52       
     53        #Patch pyport.h:
     54        cd include
     55        patch pyport.h ../patch/pyport.h.patch
    5056fi
Note: See TracChangeset for help on using the changeset viewer.