Changeset 12833

Timestamp:

07/30/12 21:49:33 (13 years ago)

Author:

Mathieu Morlighem

Message:

One script per version, as usual

File:

• issm/trunk-jpl/externalpackages/python/install-2.7.2-macosx-lion.sh (modified) (2 diffs)

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

@@ -17 +17 @@
 rm -rf Python-2.7.2
 
-#Configure doxygen
+#Configure and compile
 cd src 
 ./configure \
  --enable-framework="$ISSM_DIR/externalpackages/python/install/Library/Frameworks" 
-
-
-#make
 if [ -z $1 ]; then
         make
@@ -32 +29 @@
 
 cd ../install
+
+#get rid of bin, because it's just a copy of
+#Library/Frameworks/Python.framework/Versions/2.7/bin, and will not reflect
+#new changes being made
+rm -rf bin
 ln -s Library/Frameworks/Python.framework/Headers include
 ln -s Library/Frameworks/Python.framework/Versions/2.7/lib lib
+ln -s Library/Frameworks/Python.framework/Versions/2.7/bin bin
 
-#Some modifications to be done in case version is 2.7
-if [[ $version == "2.7.2" ]]; then 
-        cd ../install
-        #get rid of bin, because it's just a copy of Library/Frameworks/Python.framework/Versions/2.7/bin, and will not reflect new changes being made
-        rm -rf bin
-        ln -s Library/Frameworks/Python.framework/Headers include
-        ln -s Library/Frameworks/Python.framework/Versions/2.7/lib lib
-        ln -s Library/Frameworks/Python.framework/Versions/2.7/bin bin
-
-        #Patch pyport.h:
-        cd include
-        patch pyport.h $ISSM_DIR/externalpackages/python/patches/pyport.h.patch
-fi
+#Patch pyport.h:
+cd include
+patch pyport.h $ISSM_DIR/externalpackages/python/patches/pyport.h.patch