Skip to content

Commit ed21ad7

Browse files
author
Juan E. Sanchez
committed
dist script
fix bug in script keep binary name for devsim_py as devsim. note about cmake for Mac OS X redhat 6.5 changes. CMAKE_CXX_FLAGS fixed for older version of cmake remove dead code update install note update manual update name of mac os x script update platform names update README.md for release update submodule ref remove large gmsh generated file
1 parent b8bd009 commit ed21ad7

15 files changed

Lines changed: 68 additions & 293791 deletions

‎INSTALL‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
Supported Platforms:
22
Ubuntu 12.04 32/64 bit
3-
Redhat 6.4 32/64 bit
3+
Red Hat 6.5 32/64 bit
44
Mac OS X 10.9 64 bit
55

6-
Substitute redhat_6.4 for ubuntu_12.04 for Redhat 6.4 installations in the instructions below.
6+
Substitute redhat_6.5 for ubuntu_12.04 for Red Hat 6.5 installations in the instructions below.
77

88
If you have any issues with installation, please contact Devsim LLC through the github website:
99
https://github.com/devsim/devsim/issues
1010

1111
There are the required dependencies for ubuntu 12.04.
1212
sudo apt-get install cmake git python2.7-dev g++ gcc gfortran make tcl8.5 tcl8.5-dev tcl-dev tclthread python2.7 python2.7-dev flex bison sqlite3 libsqlite3-dev zlib1g-dev libsqlite3-tcl cgns-convert libcgns-dev libcgns2 python-numpy
1313

14-
Similar dependencies are required for Redhat 6.4.
14+
Similar dependencies are required for Red Hat 6.5.
1515
sudo yum install bison cmake flex gcc gcc-c++ gcc-gfortran git make python python-devel python-libs sqlite-devel tcl tcl-devel zlib-devel
1616

1717
Note that tcl-dev package must be specified explicitly so that libtclstub.a is a symlink to tcl8.5-dev. Then SYMDIFF will compile properly. The "python-numpy" package is required for laux1.py test.
@@ -20,6 +20,9 @@ For Mac OS X, the Xcode command line developer tools should be installed, these
2020
https://developer.apple.com/technologies/tools
2121
https://developer.apple.com/performance/accelerateframework.html
2222

23+
In addition, cmake is needed for Mac OS X. The package may be downloaded from:
24+
http://www.cmake.org
25+
2326
Note that the -j2 option for make and ctest is for building and testing in 2 parallel threads. This number can be changed to run as many simultaneous processes as desired.
2427

2528
Download DEVSIM:
@@ -42,7 +45,7 @@ Install ACML for linux 32bit.
4245
4. sudo sh install-acml-4-4-0-gfortran-32bit.sh
4346

4447

45-
For Mac OS X, make sure that you have XCode installed which has the math libraries. In the following instructions use setup_osx_10.6.8.sh instead.
48+
For Mac OS X, make sure that you have XCode installed which has the math libraries. In the following instructions use setup_osx_10.9.sh instead.
4649

4750
Compile SuperLU 4.3
4851

@@ -89,7 +92,7 @@ make VERBOSE=1
8992

9093
in order to see what the build process is doing at the point of failure.
9194

92-
Note that tests are based on exact text differences between files. Different configuration options may affect results. The following two tests will fail for the Redhat 6.4 configuration:
95+
Note that tests are based on exact text differences between files. Different configuration options may affect results. The following two tests will fail for the Red Hat 6.5 configuration:
9396
thread_1 (Failed)
9497
fpetest2 (Timeout)
9598

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
It is licensed under the [LGPL Version 3.0](http://www.gnu.org/copyleft/lesser.html), meaning you can link against it with your own software. Example scripts are provided under the [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0.html).
66

77
### Supported Platforms:
8-
* Ubuntu 12.04 32/64 bit
9-
* Redhat 6.4 32/64 bit
10-
* Mac OS X 10.9 64 bit (Mavericks)
8+
* Mac OS X 10.9 (Mavericks)
9+
* Red Hat 6.5
10+
* Ubuntu 12.04 (LTS)
1111

1212
### Software Features:
1313
* [Documentation](https://github.com/devsim/devsim/blob/master/doc/devsim.pdf?raw=true)

‎dist/package_apple.sh‎

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,32 @@
11
#!/bin/bash
22
set -e
3+
if ! [ $1 ]; then
4+
echo "must specify dir name"
5+
exit 2;
6+
fi
37
for ARCH in x86_64; do
48
PLATFORM=osx
59
SRC_DIR=../${PLATFORM}_${ARCH}_release/src/main
6-
SRC_BIN=${SRC_DIR}/devsim_py
7-
DIST_DIR=devsim_${PLATFORM}_${ARCH}
10+
#DIST_DIR=devsim_${PLATFORM}_${ARCH}
11+
DIST_DIR=$1_${ARCH}
812
DIST_BIN=${DIST_DIR}/bin
913
DIST_DATE=`date +%Y%m%d`
1014
DIST_VER=${DIST_DIR}_${DIST_DATE}
1115

1216
# make the bin directory and copy binary in
13-
mkdir -p ${DIST_BIN}
1417
# Assume libstdc++ is a standard part of the system
1518
#http://developer.apple.com/library/mac/#documentation/DeveloperTools/Conceptual/CppRuntimeEnv/Articles/CPPROverview.html
16-
cp ${SRC_BIN} ${DIST_DIR}/bin/devsim
17-
19+
mkdir -p ${DIST_BIN}
20+
#for i in devsim_py devsim_tcl
21+
#do
22+
#cp ${SRC_DIR}/$i ${DIST_DIR}/bin/
23+
cp ${SRC_DIR}/devsim_py ${DIST_DIR}/bin/devsim
24+
cp ${SRC_DIR}/devsim_tcl ${DIST_DIR}/bin/devsim_tcl
1825
# strip unneeded symbols
19-
strip -arch all -u -r ${DIST_DIR}/bin/devsim
26+
#strip -arch all -u -r ${DIST_DIR}/bin/$i
27+
#done
2028
# keep a copy of unstripped binary
21-
cp ${SRC_BIN} ${DIST_VER}_unstripped
29+
#cp ${SRC_BIN} ${DIST_VER}_unstripped
2230

2331

2432
mkdir -p ${DIST_DIR}/doc
@@ -44,9 +52,14 @@ done
4452
#mkdir -p ${DIST_DIR}/lib/shared
4553
#\cp -a /usr/lib/libstdc++*dylib devsim/lib/shared
4654

47-
echo "Available from:\
48-
http://www.github.com/devsim/devsim" > ${DIST_DIR}/VERSION
49-
git rev-parse --verify HEAD >> ${DIST_DIR}/VERSION
55+
COMMIT=`git rev-parse --verify HEAD`
56+
cat <<EOF > ${DIST_DIR}/VERSION
57+
Package released as:
58+
${DIST_VER}.tgz
5059
60+
Source available from:
61+
http://www.github.com/devsim/devsim
62+
commit ${COMMIT}
63+
EOF
5164
tar czf ${DIST_VER}.tgz ${DIST_DIR}
5265
done

‎dist/package_linux.sh‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,33 @@
11
#!/bin/bash
22
set -e
3+
if ! [ $1 ]; then
4+
echo "must specify dir name"
5+
exit 2;
6+
fi
37
ARCH=`uname -m`
48
PLATFORM=linux
59
SRC_DIR=../${PLATFORM}_${ARCH}_release/src/main
6-
SRC_BIN=${SRC_DIR}/devsim_py
7-
DIST_DIR=devsim_${PLATFORM}_${ARCH}
10+
#DIST_DIR=devsim_${PLATFORM}_${ARCH}
11+
DIST_DIR=$1_${ARCH}
812
DIST_BIN=${DIST_DIR}/bin
913
DIST_DATE=`date +%Y%m%d`
1014
DIST_VER=${DIST_DIR}_${DIST_DATE}
1115

1216
# make the bin directory and copy binary in
13-
mkdir -p ${DIST_BIN}
1417
# we need the wrapper script for libstdc++
15-
cp ${SRC_BIN} ${DIST_DIR}/bin/devsim.bin
16-
cp devsim.sh ${DIST_DIR}/bin/devsim
17-
chmod +x ${DIST_DIR}/bin/devsim
18+
#cp devsim.sh ${DIST_DIR}/bin/devsim
19+
#chmod +x ${DIST_DIR}/bin/devsim
20+
mkdir -p ${DIST_BIN}
21+
#for i in devsim_py devsim_tcl
22+
#do
23+
#cp ${SRC_DIR}/$i ${DIST_DIR}/bin/
24+
cp ${SRC_DIR}/devsim_py ${DIST_DIR}/bin/devsim
25+
cp ${SRC_DIR}/devsim_tcl ${DIST_DIR}/bin/devsim_tcl
1826
# strip unneeded symbols
19-
strip --strip-unneeded ${DIST_DIR}/bin/devsim.bin
27+
#strip --strip-unneeded ${DIST_DIR}/bin/$i
28+
#done
2029
# keep a copy of unstripped binary
21-
cp ${SRC_BIN} ${DIST_VER}_unstripped
30+
#cp ${SRC_BIN} ${DIST_VER}_unstripped
2231

2332

2433
mkdir -p ${DIST_DIR}/doc
@@ -44,9 +53,13 @@ done
4453
#mkdir -p ${DIST_DIR}/lib/shared
4554
#\cp -a /usr/lib/libstdc++.so* ${DIST_DIR}/lib/shared
4655

47-
echo "Available from:\
48-
http://www.github.com/devsim/devsim" > ${DIST_DIR}/VERSION
49-
git rev-parse --verify HEAD >> ${DIST_DIR}/VERSION
56+
COMMIT=`git rev-parse --verify HEAD`
57+
cat <<EOF > ${DIST_DIR}/VERSION
58+
Package released as:
59+
${DIST_VER}.tgz
5060
61+
Source available from:
62+
http://www.github.com/devsim/devsim
63+
commit ${COMMIT}
64+
EOF
5165
tar czf ${DIST_VER}.tgz ${DIST_DIR}
52-

‎doc/devsim.pdf‎

12.8 KB
Binary file not shown.

external/superlu_redhat_6.4.sh renamed to external/superlu_redhat_6.5.sh

File renamed without changes.

‎external/symdiff‎

goldenresults/redhat_6.4_x86_64 renamed to goldenresults/redhat_6.5_x86_64

File renamed without changes.

redhat_6.4.cmake renamed to redhat_6.5.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Redhat 6.4 64 bit (not tested on 32 bit)
2-
#IF (${DEVSIM_CONFIG} STREQUAL "redhat_6.4")
1+
# Redhat 6.5 64 bit (not tested on 32 bit)
2+
#IF (${DEVSIM_CONFIG} STREQUAL "redhat_6.5")
33
ADD_DEFINITIONS(-DTCL_THREADS -pthread -fvisibility=hidden)
44
SET (FLEX /usr/bin/flex)
55
SET (BISON /usr/bin/bison)
@@ -39,5 +39,5 @@ SET (CGNS_INCLUDE ${EXTERNAL_LIB}/cgnslib/include)
3939
SET (SYMDIFF_ARCHIVE ${EXTERNAL_LIB}/symdiff/lib/libsymdiff_static.a)
4040
SET (SYMDIFF_INCLUDE ${EXTERNAL_LIB}/symdiff/include)
4141

42-
#ENDIF (${DEVSIM_CONFIG} STREQUAL "redhat_6.4")
42+
#ENDIF (${DEVSIM_CONFIG} STREQUAL "redhat_6.5")
4343

‎scripts/setup_osx_10.9.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
DEVSIM_CONFIG=osx_10.9
1+
DEVSIM_CONFIG="osx_10.9"
22
CC=/usr/bin/gcc
33
CXX=/usr/bin/g++
44
CMAKE_CXX_FLAGS=""

0 commit comments

Comments
 (0)