Skip to content

Commit

Permalink
Merge pull request #27 from visit-dav/task/brugger1/2019_01_28_visit_…
Browse files Browse the repository at this point in the history 
…dist

Update visit-dist script to work with git.
  • Loading branch information
@brugger1
brugger1 committed Jan 29, 2019
2 parents eacc387 + 98bb5fa commit 89bf1b8
Show file tree
Hide file tree
Showing 4 changed files with 108 additions and 100 deletions.
47 changes: 25 additions & 22 deletions src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,9 @@
# Kevin Griffin, Wed Dec 12 18:00:27 PST 2018
# Added back osxfixup logic.
#
# Eric Brugger, Mon Jan 28 15:14:54 PST 2019
# Changed SVN_REVISION to GIT_VERSION.
#
#****************************************************************************/

CMAKE_MINIMUM_REQUIRED(VERSION 3.8 FATAL_ERROR)
Expand Down Expand Up @@ -1802,32 +1805,32 @@ FUNCTION(MAC_NIB_INSTALL exename)
ENDFUNCTION(MAC_NIB_INSTALL)

#-----------------------------------------------------------------------------
# Read the SVN revision
# Read the GIT version
#-----------------------------------------------------------------------------
#dummy revision, in case commands fail
SET(VISIT_SVN_REVISION "Unknown")
SET(VISIT_GIT_VERSION "Unknown")
# Get the subversion revision number
IF(EXISTS ${VISIT_SOURCE_DIR}/SVN_REVISION)
FILE(STRINGS ${VISIT_SOURCE_DIR}/SVN_REVISION VISIT_SVN_REVISION)
ELSE(EXISTS ${VISIT_SOURCE_DIR}/SVN_REVISION)
IF (EXISTS ${VISIT_SOURCE_DIR}/.svn)
IF(EXISTS ${VISIT_SOURCE_DIR}/GIT_VERSION)
FILE(STRINGS ${VISIT_SOURCE_DIR}/GIT_VERSION VISIT_GIT_VERSION)
ELSE(EXISTS ${VISIT_SOURCE_DIR}/GIT_VERSION)
IF (EXISTS ${VISIT_SOURCE_DIR}/../.git)
# Only try and determine the version number if it looks like
# we're in a working copy (a .svn directory should be present)
FIND_PACKAGE(Subversion)
IF(Subversion_FOUND)
Subversion_WC_INFO(${PROJECT_SOURCE_DIR} VISIT)
SET(VISIT_SVN_REVISION "${VISIT_WC_REVISION}")
ELSE(Subversion_FOUND)
IF(WIN32)
INCLUDE(${VISIT_SOURCE_DIR}/CMake/FindTortoiseSVN.cmake)
IF(TortoiseSVN_FOUND)
TortoiseSVN_WC_INFO(${PROJECT_SOURCE_DIR} VISIT)
SET(VISIT_SVN_REVISION "${VISIT_WC_REVISION}")
ENDIF(TortoiseSVN_FOUND)
ENDIF(WIN32)
ENDIF(Subversion_FOUND)
ENDIF (EXISTS ${VISIT_SOURCE_DIR}/.svn)
ENDIF(EXISTS ${VISIT_SOURCE_DIR}/SVN_REVISION)
# we're in a working copy (a .git directory should be present)
# FIND_PACKAGE(Subversion)
# IF(Subversion_FOUND)
# Subversion_WC_INFO(${PROJECT_SOURCE_DIR} VISIT)
# SET(VISIT_SVN_REVISION "${VISIT_WC_REVISION}")
# ELSE(Subversion_FOUND)
# IF(WIN32)
# INCLUDE(${VISIT_SOURCE_DIR}/CMake/FindTortoiseSVN.cmake)
# IF(TortoiseSVN_FOUND)
# TortoiseSVN_WC_INFO(${PROJECT_SOURCE_DIR} VISIT)
# SET(VISIT_SVN_REVISION "${VISIT_WC_REVISION}")
# ENDIF(TortoiseSVN_FOUND)
# ENDIF(WIN32)
# ENDIF(Subversion_FOUND)
ENDIF (EXISTS ${VISIT_SOURCE_DIR}/../.git)
ENDIF(EXISTS ${VISIT_SOURCE_DIR}/GIT_VERSION)

#-----------------------------------------------------------------------------
# Set up resource files for Windows applications.
Expand Down
10 changes: 5 additions & 5 deletions src/common/misc/ConfigureInfo.C.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ Version()
}

std::string
SVNVersion()
GITVersion()
{
#cmakedefine VISIT_SVN_REVISION "@VISIT_SVN_REVISION@"
#ifdef VISIT_SVN_REVISION
return std::string(VISIT_SVN_REVISION);
#cmakedefine VISIT_GIT_VERSION "@VISIT_GIT_VERSION@"
#ifdef VISIT_GIT_VERSION
return std::string(VISIT_GIT_VERSION);
#else
return std::string("");
#endif
Expand All @@ -71,7 +71,7 @@ VersionControlVersionString()
#ifdef VISIT_VERSION_STRING
return std::string(VISIT_VERSION_STRING);
#else
return std::string("svn version ") + SVNVersion();
return std::string("git version ") + GITVersion();
#endif
}

Expand Down
147 changes: 76 additions & 71 deletions src/tools/dev/scripts/source_files
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ exec perl -x $0 ${1+"$@"};
# Eric Brugger, Fri Aug 12 13:47:44 PDT 2016
# Add vtkm directory.
#
# Eric Brugger, Mon Jan 28 14:39:03 PST 2019
# Modify to work with git.
#
# ----------------------------------------------------------------------------

if (! -d "src")
Expand All @@ -42,7 +45,9 @@ if (! -d "src")
sub get ($@)
{
my ($dir, $recursearg) = @_;
@tmpfiles = `svn status -v $recursearg $dir | grep -v '^?' | tr -s ' ' | cut -d' ' -f5 | grep -v -x \.`;
$curbranch = `git branch | grep "^*" | cut -d ' ' -f 2`;
chomp $curbranch;
@tmpfiles = `git ls-tree --name-only $recursearg $curbranch $dir`;
my @files = ();
foreach (@tmpfiles)
{
Expand All @@ -52,16 +57,16 @@ sub get ($@)
return @files
}

sub get_svn_recursive ($@)
sub get_git_recursive ($@)
{
my ($dir) = @_;
return get($dir, "");
}

sub get_svn_norecursive ($@)
sub get_git_norecursive ($@)
{
my ($dir) = @_;
return get($dir, "-N");
return get($dir, "-r");
}

sub get_norecursive ($@)
Expand All @@ -82,76 +87,76 @@ sub get_norecursive ($@)

if ($ARGV[0] eq "-dbio-only")
{
push @files, get_svn_norecursive "./src";
push @files, get_svn_recursive "./src/CMake";
push @files, get_svn_norecursive "./src/common";
push @files, get_svn_norecursive "./src/common/Exceptions";
push @files, get_svn_recursive "./src/common/Exceptions/Database";
push @files, get_svn_recursive "./src/common/Exceptions/Pipeline";
push @files, get_svn_recursive "./src/common/comm";
push @files, get_svn_recursive "./src/common/expr";
push @files, get_svn_recursive "./src/common/misc";
push @files, get_svn_recursive "./src/common/parser";
push @files, get_svn_recursive "./src/common/plugin";
push @files, get_svn_recursive "./src/common/proxybase";
push @files, get_svn_recursive "./src/common/state";
push @files, get_svn_recursive "./src/common/utility";
push @files, get_svn_norecursive "./src/visit_vtk";
push @files, get_svn_recursive "./src/visit_vtk/full";
push @files, get_svn_recursive "./src/visit_vtk/lightweight";
push @files, get_svn_norecursive "./src/avt";
push @files, get_svn_norecursive "./src/avt/Math/avtVector.h";
push @files, get_svn_norecursive "./src/avt/Math/avtMatrix.h";
push @files, get_svn_norecursive "./src/avt/Math/math_exports.h";
push @files, get_svn_norecursive "./src/avt/VisWindow/VisWindow/VisWindowTypes.h";
push @files, get_svn_recursive "./src/avt/DBAtts";
push @files, get_svn_recursive "./src/avt/Database";
push @files, get_svn_recursive "./src/avt/Pipeline";
push @files, get_svn_recursive "./src/databases";
push @files, get_svn_norecursive "./src/tools";
push @files, get_svn_recursive "./src/tools/data/convert";
push @files, get_svn_recursive "./src/include";
push @files, get_svn_norecursive "./src/bin";
push @files, get_svn_recursive "./src/exe";
push @files, get_svn_norecursive "./src/lib";
push @files, get_svn_recursive "./src/plugins";
push @files, get_svn_recursive "./src/tools/dev/scripts";
push @files, get_svn_norecursive "./src/third_party_builtin";
push @files, get_svn_recursive "./src/third_party_builtin/bow";
push @files, get_svn_recursive "./src/tools/dev/osfixup";
push @files, get_git_norecursive "./src";
push @files, get_git_recursive "./src/CMake";
push @files, get_git_norecursive "./src/common";
push @files, get_git_norecursive "./src/common/Exceptions";
push @files, get_git_recursive "./src/common/Exceptions/Database";
push @files, get_git_recursive "./src/common/Exceptions/Pipeline";
push @files, get_git_recursive "./src/common/comm";
push @files, get_git_recursive "./src/common/expr";
push @files, get_git_recursive "./src/common/misc";
push @files, get_git_recursive "./src/common/parser";
push @files, get_git_recursive "./src/common/plugin";
push @files, get_git_recursive "./src/common/proxybase";
push @files, get_git_recursive "./src/common/state";
push @files, get_git_recursive "./src/common/utility";
push @files, get_git_norecursive "./src/visit_vtk";
push @files, get_git_recursive "./src/visit_vtk/full";
push @files, get_git_recursive "./src/visit_vtk/lightweight";
push @files, get_git_norecursive "./src/avt";
push @files, get_git_norecursive "./src/avt/Math/avtVector.h";
push @files, get_git_norecursive "./src/avt/Math/avtMatrix.h";
push @files, get_git_norecursive "./src/avt/Math/math_exports.h";
push @files, get_git_norecursive "./src/avt/VisWindow/VisWindow/VisWindowTypes.h";
push @files, get_git_recursive "./src/avt/DBAtts";
push @files, get_git_recursive "./src/avt/Database";
push @files, get_git_recursive "./src/avt/Pipeline";
push @files, get_git_recursive "./src/databases";
push @files, get_git_norecursive "./src/tools";
push @files, get_git_recursive "./src/tools/data/convert";
push @files, get_git_recursive "./src/include";
push @files, get_git_norecursive "./src/bin";
push @files, get_git_recursive "./src/exe";
push @files, get_git_norecursive "./src/lib";
push @files, get_git_recursive "./src/plugins";
push @files, get_git_recursive "./src/tools/dev/scripts";
push @files, get_git_norecursive "./src/third_party_builtin";
push @files, get_git_recursive "./src/third_party_builtin/bow";
push @files, get_git_recursive "./src/tools/dev/osfixup";
}
else
{
push @files, get_svn_norecursive "./src";
push @files, get_svn_recursive "./src/CMake";
push @files, get_svn_recursive "./src/common";
push @files, get_svn_recursive "./src/visit_vtk";
push @files, get_svn_recursive "./src/engine";
push @files, get_svn_recursive "./src/launcher";
push @files, get_svn_recursive "./src/avt";
push @files, get_svn_recursive "./src/vtkqt";
push @files, get_svn_recursive "./src/plots";
push @files, get_svn_recursive "./src/operators";
push @files, get_svn_recursive "./src/databases";
push @files, get_svn_recursive "./src/winutil";
push @files, get_svn_recursive "./src/viewer";
push @files, get_svn_recursive "./src/gui";
push @files, get_svn_recursive "./src/mdserver";
push @files, get_svn_recursive "./src/visitpy";
push @files, get_svn_recursive "./src/java";
push @files, get_svn_recursive "./src/tools";
push @files, get_svn_recursive "./src/sim";
push @files, get_svn_recursive "./src/include";
push @files, get_svn_recursive "./src/bin";
push @files, get_svn_recursive "./src/exe";
push @files, get_svn_norecursive "./src/lib";
push @files, get_svn_recursive "./src/archives";
push @files, get_svn_recursive "./src/plugins";
push @files, get_svn_recursive "./src/config-site";
push @files, get_svn_recursive "./src/third_party_builtin";
push @files, get_svn_recursive "./src/resources";
push @files, get_svn_recursive "./src/test";
push @files, get_norecursive "./src/SVN_REVISION";
push @files, get_git_norecursive "./src";
push @files, get_git_recursive "./src/CMake";
push @files, get_git_recursive "./src/common";
push @files, get_git_recursive "./src/visit_vtk";
push @files, get_git_recursive "./src/engine";
push @files, get_git_recursive "./src/launcher";
push @files, get_git_recursive "./src/avt";
push @files, get_git_recursive "./src/vtkqt";
push @files, get_git_recursive "./src/plots";
push @files, get_git_recursive "./src/operators";
push @files, get_git_recursive "./src/databases";
push @files, get_git_recursive "./src/winutil";
push @files, get_git_recursive "./src/viewer";
push @files, get_git_recursive "./src/gui";
push @files, get_git_recursive "./src/mdserver";
push @files, get_git_recursive "./src/visitpy";
push @files, get_git_recursive "./src/java";
push @files, get_git_recursive "./src/tools";
push @files, get_git_recursive "./src/sim";
push @files, get_git_recursive "./src/include";
push @files, get_git_recursive "./src/bin";
push @files, get_git_recursive "./src/exe";
push @files, get_git_norecursive "./src/lib";
push @files, get_git_recursive "./src/archives";
push @files, get_git_recursive "./src/plugins";
push @files, get_git_recursive "./src/config-site";
push @files, get_git_recursive "./src/third_party_builtin";
push @files, get_git_recursive "./src/resources";
push @files, get_git_recursive "./src/test";
push @files, get_norecursive "./src/GIT_VERSION";
}

foreach (sort @files)
Expand Down
4 changes: 2 additions & 2 deletions src/tools/dev/scripts/visit-dist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ if (! -d "src")
exit(-1);
}

system("cd src; svn info . | grep \"Revision:\" | cut -d' ' -f2 > SVN_REVISION; cd ..");
system("git log -1 | grep \"^commit\" | cut -d' ' -f2 | head -c 7 > ./src/GIT_VERSION");

# Parse the argument list.
&NGetOpt("withtest","dbioonly");
Expand Down Expand Up @@ -211,5 +211,5 @@ Unable to remove temporary directory \"$dist\".
EOF
}

system("rm -f ./src/SVN_REVISION");
system("rm -f ./src/GIT_VERSION");
print "Finished.\nYour distribution is in the file \"$fulldist.tar.gz\".\n";

0 comments on commit 89bf1b8

Please sign in to comment.