From: pierre Date: Thu, 7 Jun 2012 09:04:09 +0000 (+0200) Subject: Try to put script before and after install simgrid on mac X-Git-Tag: v3_7_1~11 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a0bd3c52094037747c2348cc273aaf7fe4a775df Try to put script before and after install simgrid on mac --- diff --git a/buildtools/Cmake/SimGrid.packproj b/buildtools/Cmake/SimGrid.packproj index 2dde527bb3..9b66da2b76 100644 --- a/buildtools/Cmake/SimGrid.packproj +++ b/buildtools/Cmake/SimGrid.packproj @@ -15206,9 +15206,11 @@ IFInstallationScriptsPostinstall Path - + postinstall.sh + Path Type + 2 Status - + IFInstallationScriptsPostupgrade @@ -15227,9 +15229,11 @@ IFInstallationScriptsPreinstall Path - + preinstall.sh + Path Type + 2 Status - + IFInstallationScriptsPreupgrade diff --git a/buildtools/Cmake/postinstall.sh b/buildtools/Cmake/postinstall.sh new file mode 100755 index 0000000000..ef11450648 --- /dev/null +++ b/buildtools/Cmake/postinstall.sh @@ -0,0 +1,3 @@ +#! /bin/sh +echo "export SIMGRID_ROOT=/Applications/SimGrid" >> ~/.profile +echo "export DYLD_LYBRARY_PATH=$DYLD_LYBRARY_PATH:$SIMGRID_ROOT/lib" >> ~/.profile \ No newline at end of file diff --git a/buildtools/Cmake/preinstall.sh b/buildtools/Cmake/preinstall.sh new file mode 100755 index 0000000000..f093e59ef3 --- /dev/null +++ b/buildtools/Cmake/preinstall.sh @@ -0,0 +1,3 @@ +#! /bin/bash +echo "\n#SIMGRID ICEBERG" >> ~/.profile +return 0 \ No newline at end of file diff --git a/doc/webcruft/SGicon.icns b/doc/webcruft/SGicon.icns index 40025ab5f7..8200321310 100644 Binary files a/doc/webcruft/SGicon.icns and b/doc/webcruft/SGicon.icns differ diff --git a/postinstall.sh b/postinstall.sh deleted file mode 100755 index 47002adb38..0000000000 --- a/postinstall.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh -export LD_LIBRARY_PATH=$3/lib:$LD_LIBRARY_PATH -export JAVA_LIBRARY_PATH=:$3/lib:$JAVA_LIBRARY_PATH -cd $1 -echo "LD_LIBRARY_PATH = $LD_LIBRARY_PATH" -echo "JAVA_LIBRARY_PATH = $JAVA_LIBRARY_PATH" -pwd -echo "java -cp .:$3/simgrid.jar $2 *platform.xml *deployment.xml" -java -cp .:$3/simgrid.jar $2 *platform.xml *deployment.xml