diff --git a/Geo/MElement.cpp b/Geo/MElement.cpp index 50e4f519c9edd127ce0f2fdd49ef3036380c7673..4ea7810399182a5e9e9365219a263a19b8f37b64 100644 --- a/Geo/MElement.cpp +++ b/Geo/MElement.cpp @@ -1470,7 +1470,7 @@ void MElement::writeSU2(FILE *fp, int num) else fprintf(fp, "\n"); } -int MElement::getInfoMSH(const int typeMSH, const char **const name) +unsigned int MElement::getInfoMSH(const int typeMSH, const char **const name) { switch(typeMSH){ case MSH_PNT : if(name) *name = "Point"; return 1; diff --git a/utils/misc/package_onelab.sh b/utils/misc/package_onelab.sh index d7f211ebc237ef1da23d23a1bade9e8c237c283f..74ceaf29970a26762de799f9e93fde8d02a8c7df 100755 --- a/utils/misc/package_onelab.sh +++ b/utils/misc/package_onelab.sh @@ -145,6 +145,34 @@ if [ $# -lt 1 ] || [ $1 == "linux64" ]; then rm -rf onelab-Linux64 fi +if [ $# -lt 1 ] || [ $1 == "linux32" ]; then + rm -rf onelab-Linux32* + mkdir onelab-Linux32 + curl -O http://gmsh.info/bin/Linux/gmsh-${GMSH}-Linux32.tgz + curl -O http://getdp.info/bin/Linux/getdp-${GETDP}-Linux32c.tgz + mv gmsh-${GMSH}-Linux32.tgz /tmp + mv getdp-${GETDP}-Linux32c.tgz /tmp + tar zxvf /tmp/gmsh-${GMSH}-Linux32.tgz -C /tmp + tar zxvf /tmp/getdp-${GETDP}-Linux32c.tgz -C /tmp + cp /tmp/README.txt onelab-Linux32 + mv /tmp/gmsh-*${GMSH}-Linux32/bin/gmsh onelab-Linux32 + mv /tmp/gmsh-*${GMSH}-Linux32/bin/onelab.py onelab-Linux32 + mv /tmp/getdp-*${GETDP}-Linux32/bin/getdp onelab-Linux32 + mv /tmp/gmsh-*${GMSH}-Linux32/share/doc/gmsh/LICENSE.txt onelab-Linux32/LICENSE.txt + echo "\n\n" >> onelab-Linux32/LICENSE.txt + cat /tmp/getdp-*${GETDP}-Linux32/share/doc/getdp/LICENSE.txt >> onelab-Linux32/LICENSE.txt + mv /tmp/gmsh-*${GMSH}-Linux32/share/doc/gmsh/CREDITS.txt onelab-Linux32/CREDITS.txt + echo "\n\n" >> onelab-Linux32/CREDITS.txt + cat /tmp/getdp-*${GETDP}-Linux32/share/doc/getdp/CREDITS.txt >> onelab-Linux32/CREDITS.txt + mv /tmp/getdp-*${GETDP}-Linux32/share/doc/getdp/templates onelab-Linux32 + mv /tmp/gmsh-*${GMSH}-Linux32/share/doc/gmsh/tutorial onelab-Linux32 + cp -R /tmp/models onelab-Linux32 + rm -rf /tmp/gmsh-* + rm -rf /tmp/getdp-* + zip -r onelab-Linux32.zip onelab-Linux32 + rm -rf onelab-Linux32 +fi + if [ $# -lt 1 ] || [ $1 == "mac" ]; then rm -rf onelab-MacOSX* mkdir onelab-MacOSX