replace all SVN versions with git, build MovingBoundary solver on MacOS

.github/workflows/cd.yml

@@ -95,7 +95,7 @@ jobs:
           -DOPTION_TARGET_FV_SOLVER=ON \
           -DOPTION_TARGET_STOCHASTIC_SOLVER=ON \
           -DOPTION_TARGET_NFSIM_SOLVER=ON \
-          -DOPTION_TARGET_MOVINGBOUNDARY_SOLVER=OFF \
+          -DOPTION_TARGET_MOVINGBOUNDARY_SOLVER=ON \
           -DOPTION_TARGET_SUNDIALS_SOLVER=ON \
           -DOPTION_TARGET_HY3S_SOLVERS=OFF \
           -B . -S ..

.gitignore

@@ -2,7 +2,6 @@
 /build-dockcross-win64/
 /.project
 /.cproject
-/svnversion.txt
 /build-win64/
 /.DS_Store
 /build-linux64/

CMakeLists.txt

@@ -45,10 +45,6 @@ if(POLICY CMP0057)
   cmake_policy(SET CMP0057 NEW)
 endif()
 
-set(SVERSION "unversionedbuild")
-message("svnversion ${SVERSION}")
-add_definitions(-DSVNVERSION=svn${SVERSION})
-
 #include (LocalJNI.cmake)
 
 set(RULE_MESSAGES OFF)

MBSolver/Solver/src/ReportClient.cpp

@@ -13,7 +13,6 @@
 #include <ReportClient.h>
 #include <Universe.h>
 #include <TextReportClient.h>
-#include <version.h>
 #include <flex.h>
 #include <vhdf5/dataset.h>
 #include <vhdf5/attribute.h>
@@ -27,6 +26,7 @@
 #include <MBridge/Figure.h>
 #include <Hdf5OutputWriter.h>
 #include <VCELL/SimulationMessaging.h>
+#include <VCELL/GitDescribe.h>
 #pragma GCC diagnostic ignored "-Winvalid-offsetof"
 using moving_boundary::World ;
 using moving_boundary::CoordinateType;
@@ -804,11 +804,8 @@ namespace {
 				H5::DataSet runTime = vcellH5::primitiveWrite(baseGroup,"runTime",totalTime);
 				//annotate version info - we place on runTime node to allow easy exclusion when doing
 				//h5diff (see --exclude-path)
-				const vcell_util::Version & version = vcell_util::Version::get( );
-				vcellH5::writeAttribute(runTime,"svnVersion",version.svn);
-				vcellH5::writeAttribute(runTime,"compileDate",version.compileDate);
-				vcellH5::writeAttribute(runTime,"compileTime",version.compileTime);
-
+                std::string gitVersion(g_GIT_DESCRIBE);
+				vcellH5::writeAttribute(runTime,"gitVersion", gitVersion);
 				unsigned int lastTimeIndex = static_cast<unsigned int>(genTimes.size( ));
 				vcellH5::primitiveWrite(baseGroup,"lastTimeIndex",lastTimeIndex);
 

MBSolver/Solver/src/driver.cpp

@@ -3,15 +3,12 @@
 #include <vcellxml.h>
 #include <vhdf5/file.h>
 #include <Logger.h>
-#include <boundaryProviders.h>
 #include <StateClient.h>
 #include <MBridge/MatlabDebug.h>
 #include <tclap/CmdLine.h>
 #include <ReportClient.h>
-#include <TextReportClient.h>
-#include <version.h>
-#include <Timer.h>
 #include <VCELL/SimulationMessaging.h>
+#include <VCELL/GitDescribe.h>
 
 /**
 * usings and typedefs
@@ -88,10 +85,9 @@ namespace {
 
 int main(int argc, char *argv[])
 {
-	const vcell_util::Version & version = vcell_util::Version::get( );
-	std::cout 
-		<< "MovingBoundarySolver version $URL$" 
-		<< "revision " << version.svn << ' ' << version.compileDate << std::endl; 
+    std::cout
+            << "MovingBoundarySolver version " << g_GIT_DESCRIBE
+            << std::endl;
 
 	std::string filename;
 	std::string outname;
@@ -119,7 +115,7 @@ int main(int argc, char *argv[])
 	namespace tclap = TCLAP;
 	try {
 		using namespace TCLAP; 
-		CmdLine cmd("Moving boundary solve",' ',version.svn);
+		CmdLine cmd("Moving boundary solve",' ',g_GIT_DESCRIBE);
 		cmd.setExceptionHandling(false);
 		ValueArg<std::string> config("c","config","Input XML file name",false,"","string",cmd);
 		ValueArg<std::string> output("o","output","HDF5 output file name",false,"","string",cmd);

MBSolver/Tests/CMakeLists.txt

@@ -31,8 +31,7 @@ set(SRC_FILES
 	vcellutil.cpp
 	vdemo.cpp
 	vectortest.cpp
-	versiontest.cpp
-	vi64.cpp
+        vi64.cpp
 	voltest.cpp
 	worldtest.cpp
 )

MBSolver/matlab/CMakeLists.txt

@@ -24,7 +24,6 @@ else (MSVC11)
 endif (MSVC11)
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC")
-add_definitions(-DSVNVERSION="16888")
 include_directories(${MATLAB_INCLUDE_DIR})
 
 add_subdirectory(util)

MBSolver/matlab/clipperLink/matlabClipper.cpp

@@ -1,6 +1,4 @@
 #include <fstream>
-#include <version.h>
-#include "svnversion.h"
 #include "matlabStruct.h"
 #include <clipper.hpp>
 #include "explore.h"

MBSolver/matlab/clipperLink/mexClipper.cpp

@@ -1,6 +1,4 @@
 #include <fstream>
-#include <version.h>
-#include "svnversion.h"
 #include "matlabStruct.h"
 #include <intersection.h>
 #include "explore.h"
@@ -11,7 +9,6 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif
-SVN_VERSION_TAG
 
 using spatial::Point2D;
 void mexFunctionClipper(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) {
@@ -39,7 +36,7 @@ void mexFunctionClipper(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs
 	{
 		const bool showVer = mls.boolean("version", false);
 		if (showVer) {
-			mexPrintf("Moving Boundary version %s\n",svn_version_string);
+			mexPrintf("Moving Boundary version %s\n","unknown - integrate with github version - TODO");
 		}
 	}
 	typedef matlabLink::MData<double> DS;

MBSolver/matlab/fronTierLink/flink.cpp

@@ -7,7 +7,6 @@
 #include <VCDictionary.h>
 #include <matlabAssert.h>
 #include <mexstream.h>
-#include <svnversion.h>
 #include <vcGccCompat.h>
 //#include <VCellFrontierUtil.h>
 using std::vector;
@@ -18,7 +17,6 @@ namespace Frontier {
 	}
 }
 namespace {
-	SVN_VERSION_TAG;
 
 	//slot in
 	std::vector<Front *> fronts;
@@ -292,7 +290,7 @@ void showHelp( ) {
 	const char * const variant = "debug";
 #endif
 
-	help << "link library " << svn_version_string << ' ' << variant << endl;
+	help << "link library " << variant << endl;
     help << std::ends;
 
 	std::string helpString = help.str( ); // create string on stack to keep c_str pointer valid until end of function

MBSolver/matlab/fronTierLink/winbuild.m

@@ -3,4 +3,4 @@
 
 
 %% Fei's command
-mex fronTierCmd.cpp flink.cpp ../util/matlabStruct.cpp ../util/VCDictionary.cpp ../util/mlAssert.cpp -I../util -I../../Solver/include -I../../FronTierLib -I../../FronTierLib/util -I../../vcommons/include -DSVNVERSION="16888" ../FronTierReference/FronTier_64b.lib
+mex fronTierCmd.cpp flink.cpp ../util/matlabStruct.cpp ../util/VCDictionary.cpp ../util/mlAssert.cpp -I../util -I../../Solver/include -I../../FronTierLib -I../../FronTierLib/util -I../../vcommons/include ../FronTierReference/FronTier_64b.lib

MBSolver/matlab/util/matlabStruct.cpp

@@ -1,9 +1,7 @@
 #include <sstream>
 #include "matlabStruct.h"
 #include "matlabAssert.h"
-#include "svnversion.h"
 #include "vcGccCompat.h"
-SVN_VERSION_TAG
 
 using matlabLink::MatlabStruct;
 using matlabLink::MData;