Commit c69e3e97 authored by Keith Bennett's avatar Keith Bennett

Merge branch 'release/1.5.0'

parents 783b6e07 d78c4ec3
diff --git a/build_visit2_9_2 b/build_visit2_9_2
index ccc27ab..72bd7f8 100644
--- a/build_visit2_9_2
+++ b/build_visit2_9_2
@@ -4003,6 +4003,7 @@ function build_visit
fi
cd $VISIT_DIR
+ bv_patch_2_9_2
#cp $START_DIR/$(hostname).cmake config-site
#
@@ -4119,6 +4120,15 @@ function bv_visit_is_installed
return 0
}
+function bv_patch_2_9_2
+{
+ info "Patching VisIt . . ."
+ grep -v objC avt/VisWindow/CMakeLists.txt > Make.tmp
+ mv -f avt/VisWindow/CMakeLists.txt avt/VisWindow/CMakeLists.txt.orig
+ mv -f Make.tmp avt/VisWindow/CMakeLists.txt
+ patch -p2 < ../../visit2_9_2-Legend.patch
+}
+
function bv_patch_2_5_0
{
This diff is collapsed.
<?xml version="1.0"?>
<Plugin name="SDF" type="database" label="Self Describing Format"
version="2.0" enabled="true" mdspecificcode="false"
version="1.5.0" enabled="true" mdspecificcode="false"
engspecificcode="false" onlyengine="false" noengine="false" dbtype="STMD"
haswriter="false" hasoptions="true" filePatternsStrict="false"
opensWholeDirectory="false">
......
<?xml version="1.0"?>
<Plugin name="SDF" type="database" label="Self Describing Format"
version="2.0" enabled="true" mdspecificcode="false"
version="1.5.0" enabled="true" mdspecificcode="false"
engspecificcode="false" onlyengine="false" noengine="false" dbtype="STMD"
haswriter="false" hasoptions="true" filePatternsStrict="false"
opensWholeDirectory="false">
......
......@@ -342,7 +342,7 @@ avtSDFFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
"SDF reader commit date: %s\n SDF reader build date: %s\n "
"Job ID: %d.%d\n Code name: %s\n Code I/O version: %d\n "
"File revision: %d\n Restart flag: %d\n Other domains: %d",
SDF_READER_COMMIT_ID, SDF_READER_COMMIT_DATE, SDF_READER_BUILD_DATE,
SDF_COMMIT_ID, SDF_COMMIT_DATE, SDF_READER_BUILD_DATE,
h->jobid1, h->jobid2, h->code_name, h->code_io_version,
h->file_revision, h->restart_flag, h->other_domains);
......
......@@ -36,7 +36,7 @@ if [ $? -eq 0 ]; then
commit_date=$(git log --pretty=format:%cd -1 HEAD)
else
# not in a git repo
grep "SDF_READER_COMMIT_ID" $COMMIT_FILE > /dev/null 2>&1
grep "SDF_COMMIT_ID" $COMMIT_FILE > /dev/null 2>&1
[ $? -eq 0 ] && exit
commit_string=unknown-unknown-unknown-unknown
commit_date=unknown
......@@ -48,7 +48,7 @@ grep "$commit_string" $COMMIT_FILE > /dev/null 2>&1
if [ $? -eq 0 ]; then
exit
else
echo "#define SDF_READER_COMMIT_ID \"$commit_string\"" > $COMMIT_FILE
echo "#define SDF_READER_COMMIT_DATE \"$commit_date\"" >> $COMMIT_FILE
echo "#define SDF_COMMIT_ID \"$commit_string\"" > $COMMIT_FILE
echo "#define SDF_COMMIT_DATE \"$commit_date\"" >> $COMMIT_FILE
exit 1
fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment