- Timestamp:
- Feb 9, 2010, 8:24:35 PM (16 years ago)
- Location:
- branches/eam_branches/20091201/ppViz
- Files:
-
- 3 copied
-
. (copied) (copied from trunk/ppViz ) (1 prop)
-
src/ppVizPattern (copied) (copied from trunk/ppViz/src/ppVizPSF )
-
src/ppVizPattern/ppVizPatternVersion.c (copied) (copied from trunk/ppViz/src/ppVizPSF/ppVizPSFVersion.c ) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/eam_branches/20091201/ppViz
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/eam_branches/20091113/ppViz 26119-26255 /branches/pap/ppViz 26320
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
branches/eam_branches/20091201/ppViz/src/ppVizPattern/ppVizPatternVersion.c
r26827 r26837 1 /** @file ppVizP SFVersion.c1 /** @file ppVizPatternVersion.c 2 2 * 3 3 * @brief 4 4 * 5 * @ingroup ppVizP SF5 * @ingroup ppVizPattern 6 6 * 7 7 * @author IfA … … 19 19 #include <psmodules.h> 20 20 21 #include "ppVizP SF.h"22 #include "ppVizP SFVersionDefinitions.h"21 #include "ppVizPattern.h" 22 #include "ppVizPatternVersionDefinitions.h" 23 23 24 #ifndef PPVIZP SF_VERSION25 #error "PPVIZP SF_VERSION is not set"24 #ifndef PPVIZPATTERN_VERSION 25 #error "PPVIZPATTERN_VERSION is not set" 26 26 #endif 27 #ifndef PPVIZP SF_BRANCH28 #error "PPVIZP SF_BRANCH is not set"27 #ifndef PPVIZPATTERN_BRANCH 28 #error "PPVIZPATTERN_BRANCH is not set" 29 29 #endif 30 #ifndef PPVIZP SF_SOURCE31 #error "PPVIZP SF_SOURCE is not set"30 #ifndef PPVIZPATTERN_SOURCE 31 #error "PPVIZPATTERN_SOURCE is not set" 32 32 #endif 33 33 34 psString ppVizP SFVersion(void)34 psString ppVizPatternVersion(void) 35 35 { 36 36 char *value = NULL; 37 psStringAppend(&value, "%s@%s", PPVIZP SF_BRANCH, PPVIZPSF_VERSION);37 psStringAppend(&value, "%s@%s", PPVIZPATTERN_BRANCH, PPVIZPATTERN_VERSION); 38 38 return value; 39 39 } 40 40 41 psString ppVizP SFSource(void)41 psString ppVizPatternSource(void) 42 42 { 43 return psStringCopy(PPVIZP SF_SOURCE);43 return psStringCopy(PPVIZPATTERN_SOURCE); 44 44 } 45 45 46 psString ppVizP SFVersionLong(void)46 psString ppVizPatternVersionLong(void) 47 47 { 48 psString version = ppVizP SFVersion(); // Version, to return49 psString source = ppVizP SFSource(); // Source48 psString version = ppVizPatternVersion(); // Version, to return 49 psString source = ppVizPatternSource(); // Source 50 50 51 psStringPrepend(&version, "ppVizP SF");51 psStringPrepend(&version, "ppVizPattern "); 52 52 psStringAppend(&version, " from %s, built %s, %s", source, __DATE__, __TIME__); 53 53 psFree(source); … … 62 62 }; 63 63 64 bool ppVizP SFVersionHeader(psMetadata *header)64 bool ppVizPatternVersionHeader(psMetadata *header) 65 65 { 66 66 PS_ASSERT_METADATA_NON_NULL(header, false); … … 70 70 psFree(time); 71 71 psString history = NULL; // History string 72 psStringAppend(&history, "ppVizP SFat %s", timeString);72 psStringAppend(&history, "ppVizPattern at %s", timeString); 73 73 psFree(timeString); 74 74 psMetadataAddStr(header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, NULL, history); … … 78 78 psModulesVersionHeader(header); 79 79 80 psString version = ppVizP SFVersion(); // Software version81 psString source = ppVizP SFSource(); // Software source80 psString version = ppVizPatternVersion(); // Software version 81 psString source = ppVizPatternSource(); // Software source 82 82 83 psStringPrepend(&version, "ppVizP SFversion: ");84 psStringPrepend(&version, "ppVizP SFsource: ");83 psStringPrepend(&version, "ppVizPattern version: "); 84 psStringPrepend(&version, "ppVizPattern source: "); 85 85 86 86 psMetadataAddStr(header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, NULL, version); … … 93 93 } 94 94 95 void ppVizP SFVersionPrint(void)95 void ppVizPatternVersionPrint(void) 96 96 { 97 97 psTime *time = psTimeGetNow(PS_TIME_TAI); // The time now 98 98 psString timeString = psTimeToISO(time); // The time in an ISO string 99 99 psFree(time); 100 psLogMsg("ppVizP SF", PS_LOG_INFO, "ppVizPSFat %s", timeString);100 psLogMsg("ppVizPattern", PS_LOG_INFO, "ppVizPattern at %s", timeString); 101 101 psFree(timeString); 102 102 103 103 psString pslib = psLibVersionLong();// psLib version 104 104 psString psmodules = psModulesVersionLong(); // psModules version 105 psString ppVizP SF = ppVizPSFVersionLong(); // ppVizPSFversion105 psString ppVizPattern = ppVizPatternVersionLong(); // ppVizPattern version 106 106 107 psLogMsg("ppVizP SF", PS_LOG_INFO, "%s", pslib);108 psLogMsg("ppVizP SF", PS_LOG_INFO, "%s", psmodules);109 psLogMsg("ppVizP SF", PS_LOG_INFO, "%s", ppVizPSF);107 psLogMsg("ppVizPattern", PS_LOG_INFO, "%s", pslib); 108 psLogMsg("ppVizPattern", PS_LOG_INFO, "%s", psmodules); 109 psLogMsg("ppVizPattern", PS_LOG_INFO, "%s", ppVizPattern); 110 110 111 111 psFree(pslib); 112 112 psFree(psmodules); 113 psFree(ppVizP SF);113 psFree(ppVizPattern); 114 114 115 115 return;
Note:
See TracChangeset
for help on using the changeset viewer.
