Changeset 25923 for trunk/ppTranslate/src/ppTranslateVersion.c
- Timestamp:
- Oct 22, 2009, 2:09:04 PM (17 years ago)
- Location:
- trunk/ppTranslate
- Files:
-
- 1 edited
- 1 copied
- 1 moved
-
. (moved) (moved from trunk/ppMops ) (1 prop)
-
src (modified) (1 prop)
-
src/ppTranslateVersion.c (copied) (copied from trunk/ppMops/src/ppMopsVersion.c ) (5 diffs, 1 prop)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ppTranslate
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/czw_branch/cleanup/ppMops merged eligible /branches/eam_branches/20090522/ppMops merged eligible /branches/eam_branches/20090715/ppMops merged eligible /branches/pap/ppMops merged eligible /branches/pap_mops/ppMops 25137-25255
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/ppTranslate/src
- Property svn:ignore
-
old new 3 3 config.h 4 4 config.h.in 5 pp MopsVersionDefinitions.h5 ppTranslateVersionDefinitions.h 6 6 .deps 7 7 Makefile 8 8 ppMops 9 ppMonet
-
- Property svn:ignore
-
trunk/ppTranslate/src/ppTranslateVersion.c
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/czw_branch/cleanup/ppMops/src/ppMopsVersion.c merged eligible /branches/eam_branches/20090522/ppMops/src/ppMopsVersion.c merged eligible /branches/eam_branches/20090715/ppMops/src/ppMopsVersion.c merged eligible /branches/pap/ppMops/src/ppMopsVersion.c merged eligible /branches/pap_mops/ppMops/src/ppMopsVersion.c 25137-25255
r25846 r25923 6 6 #include <pslib.h> 7 7 8 #include "ppMops.h" 9 #include "ppMopsVersionDefinitions.h" 8 #include "ppTranslateVersionDefinitions.h" 10 9 11 #ifndef PP MOPS_VERSION12 #error "PP MOPS_VERSION is not set"10 #ifndef PPTRANSLATE_VERSION 11 #error "PPTRANSLATE_VERSION is not set" 13 12 #endif 14 #ifndef PP MOPS_BRANCH15 #error "PP MOPS_BRANCH is not set"13 #ifndef PPTRANSLATE_BRANCH 14 #error "PPTRANSLATE_BRANCH is not set" 16 15 #endif 17 #ifndef PP MOPS_SOURCE18 #error "PP MOPS_SOURCE is not set"16 #ifndef PPTRANSLATE_SOURCE 17 #error "PPTRANSLATE_SOURCE is not set" 19 18 #endif 20 19 21 psString pp MopsVersion(void)20 psString ppTranslateVersion(void) 22 21 { 23 22 char *value = NULL; 24 psStringAppend(&value, "%s@%s", PP MOPS_BRANCH, PPMOPS_VERSION);23 psStringAppend(&value, "%s@%s", PPTRANSLATE_BRANCH, PPTRANSLATE_VERSION); 25 24 return value; 26 25 } 27 26 28 psString pp MopsSource(void)27 psString ppTranslateSource(void) 29 28 { 30 return psStringCopy(PP MOPS_SOURCE);29 return psStringCopy(PPTRANSLATE_SOURCE); 31 30 } 32 31 33 psString pp MopsVersionLong(void)32 psString ppTranslateVersionLong(void) 34 33 { 35 psString version = pp MopsVersion(); // Version, to return36 psString source = pp MopsSource(); // Source34 psString version = ppTranslateVersion(); // Version, to return 35 psString source = ppTranslateSource(); // Source 37 36 38 psStringPrepend(&version, "pp Mops");37 psStringPrepend(&version, "ppTranslate "); 39 38 psStringAppend(&version, " from %s, built %s, %s", source, __DATE__, __TIME__); 40 39 psFree(source); … … 50 49 51 50 52 bool pp MopsVersionHeader(psMetadata *header)51 bool ppTranslateVersionHeader(psMetadata *header) 53 52 { 54 53 PS_ASSERT_METADATA_NON_NULL(header, false); … … 58 57 psFree(time); 59 58 psString history = NULL; // History string 60 psStringAppend(&history, "pp Mopsat %s", timeString);59 psStringAppend(&history, "ppTranslate at %s", timeString); 61 60 psFree(timeString); 62 61 psMetadataAddStr(header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, NULL, history); … … 65 64 psLibVersionHeader(header); 66 65 67 psString version = pp MopsVersion(); // Software version68 psString source = pp MopsSource(); // Software source66 psString version = ppTranslateVersion(); // Software version 67 psString source = ppTranslateSource(); // Software source 69 68 70 psStringPrepend(&version, "pp Mopsversion: ");71 psStringPrepend(&source, "pp Mopssource: ");69 psStringPrepend(&version, "ppTranslate version: "); 70 psStringPrepend(&source, "ppTranslate source: "); 72 71 73 72 psMetadataAddStr(header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, NULL, version); … … 80 79 } 81 80 82 void pp MopsVersionPrint(void)81 void ppTranslateVersionPrint(void) 83 82 { 84 83 psTime *time = psTimeGetNow(PS_TIME_TAI); // The time now 85 84 psString timeString = psTimeToISO(time); // The time in an ISO string 86 85 psFree(time); 87 psLogMsg("pp Mops", PS_LOG_INFO, "ppMopsat %s", timeString);86 psLogMsg("ppTranslate", PS_LOG_INFO, "ppTranslate at %s", timeString); 88 87 psFree(timeString); 89 88 90 89 psString pslib = psLibVersionLong();// psLib version 91 psString pp Mops = ppMopsVersionLong(); // ppMopsversion90 psString ppTranslate = ppTranslateVersionLong(); // ppTranslate version 92 91 93 psLogMsg("pp Mops", PS_LOG_INFO, "%s", pslib);94 psLogMsg("pp Mops", PS_LOG_INFO, "%s", ppMops);92 psLogMsg("ppTranslate", PS_LOG_INFO, "%s", pslib); 93 psLogMsg("ppTranslate", PS_LOG_INFO, "%s", ppTranslate); 95 94 96 95 psFree(pslib); 97 psFree(pp Mops);96 psFree(ppTranslate); 98 97 99 98 return; -
Property svn:mergeinfo
set to (toggle deleted branches)
Note:
See TracChangeset
for help on using the changeset viewer.
