Changeset 25923 for trunk/ppTranslate/src

Timestamp:

Oct 22, 2009, 2:09:04 PM (17 years ago)

Author:

Paul Price

Message:

Adding translation program for Dave Monet (ppMonet). This is so similar to ppMops that I thought they should be kept together, so I have put ppMops and ppMonet in a common directory, ppTranslate, which can serve to keep all translation programs.

Location:

trunk/ppTranslate

Files:

• . (moved) (moved from trunk/ppMops ) (1 prop)
• src (modified) (1 prop)
• src/Makefile.am (modified) (3 diffs)
• src/ppMonet.c (added)
• src/ppMonet.h (added)
• src/ppMonetArguments.c (added)
• src/ppMonetMerge.c (added)
• src/ppMops.h (modified) (1 diff)
• src/ppMopsVersion.c (deleted)
• src/ppMopsVersionDefinitions.h.in (deleted)
• src/ppMopsWrite.c (modified) (2 diffs)
• src/ppTranslateVersion.c (copied) (copied from trunk/ppMops/src/ppMopsVersion.c ) (5 diffs, 1 prop)
• src/ppTranslateVersion.h (added)
• src/ppTranslateVersionDefinitions.h.in (copied) (copied from trunk/ppMops/src/ppMopsVersionDefinitions.h.in ) (1 diff, 1 prop)

trunk/ppTranslate/src

@@ -3 +3 @@
 config.h
 config.h.in
-ppMopsVersionDefinitions.h
+ppTranslateVersionDefinitions.h
 .deps
 Makefile
 ppMops
+ppMonet

@@ -3 +3 @@
 config.h
 config.h.in
-ppMopsVersionDefinitions.h
+ppTranslateVersionDefinitions.h
 .deps
 Makefile
 ppMops
+ppMonet

trunk/ppTranslate/src/Makefile.am

@@ -1 @@
-bin_PROGRAMS = ppMops
+bin_PROGRAMS = ppMops ppMonet
 
 if HAVE_SVNVERSION
-PPMOPS_VERSION=`$(SVNVERSION) ..`
+PPTRANSLATE_VERSION=`$(SVNVERSION) ..`
 else
-PPMOPS_VERSION="UNKNOWN"
+PPTRANSLATE_VERSION="UNKNOWN"
 endif
 
 if HAVE_SVN
-PPMOPS_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
-PPMOPS_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
+PPTRANSLATE_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
+PPTRANSLATE_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
 else
-PPMOPS_BRANCH="UNKNOWN"
-PPMOPS_SOURCE="UNKNOWN"
+PPTRANSLATE_BRANCH="UNKNOWN"
+PPTRANSLATE_SOURCE="UNKNOWN"
 endif
 
 # Force recompilation of ppMopsVersion.c, since it gets the version information
-ppMopsVersion.c: ppMopsVersionDefinitions.h
-ppMopsVersionDefinitions.h: ppMopsVersionDefinitions.h.in FORCE
-        -$(RM) ppMopsVersionDefinitions.h
-        $(SED) -e "s|@PPMOPS_VERSION@|\"$(PPMOPS_VERSION)\"|" -e "s|@PPMOPS_BRANCH@|\"$(PPMOPS_BRANCH)\"|" -e "s|@PPMOPS_SOURCE@|\"$(PPMOPS_SOURCE)\"|" ppMopsVersionDefinitions.h.in > ppMopsVersionDefinitions.h
+ppTranslateVersion.c: ppTranslateVersionDefinitions.h
+ppTranslateVersionDefinitions.h: ppTranslateVersionDefinitions.h.in FORCE
+        -$(RM) ppTranslateVersionDefinitions.h
+        $(SED) -e "s|@PPTRANSLATE_VERSION@|\"$(PPTRANSLATE_VERSION)\"|" -e "s|@PPTRANSLATE_BRANCH@|\"$(PPTRANSLATE_BRANCH)\"|" -e "s|@PPTRANSLATE_SOURCE@|\"$(PPTRANSLATE_SOURCE)\"|" ppTranslateVersionDefinitions.h.in > ppTranslateVersionDefinitions.h
 FORCE: ;
 
@@ -27 +27 @@
 ppMops_SOURCES =                \
         ppMops.c                \
-        ppMopsVersion.c         \
+        ppTranslateVersion.c    \
         ppMopsArguments.c       \
         ppMopsDetections.c      \
@@ -34 +34 @@
         ppMopsMerge.c
 
+ppMonet_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(PPMONET_CFLAGS)
+ppMonet_LDFLAGS  = $(PSLIB_LIBS) $(PPMONET_LIBS)
+
+ppMonet_SOURCES =               \
+        ppMonet.c               \
+        ppTranslateVersion.c    \
+        ppMonetArguments.c
+
+
 noinst_HEADERS = \
-        ppMops.h
+        ppTranslateVersion.h \
+        ppMops.h \
+        ppMonet.h
 
 

trunk/ppTranslate/src/ppMops.h

@@ -71 +71 @@
 bool ppMopsWrite(const ppMopsDetections *detections, const ppMopsArguments *args);
 
-
-
-/// Return version
-psString ppMopsVersion(void);
-
-/// Return source
-psString ppMopsSource(void);
-
-/// Return detailed version information
-psString ppMopsVersionLong(void);
-
-/// Put version into header
-bool ppMopsVersionHeader(psMetadata *header);
-
-/// Print version information
-void ppMopsVersionPrint(void);
-
 #endif

trunk/ppTranslate/src/ppMopsWrite.c

@@ -7 +7 @@
 
 #include "ppMops.h"
+#include "ppTranslateVersion.h"
 
 bool ppMopsWrite(const ppMopsDetections *det, const ppMopsArguments *args)
@@ -20 +21 @@
 
     psMetadata *header = psMetadataAlloc(); // Header to write
-    psString source = ppMopsSource(), version = ppMopsVersion();
+    psString source = ppTranslateSource(), version = ppTranslateVersion();
     psMetadataAddStr(header, PS_LIST_TAIL, "SWSOURCE", 0, "Software source", source);
     psMetadataAddStr(header, PS_LIST_TAIL, "SWVERSN", 0, "Software version", version);
-    ppMopsVersionHeader(header);
+    ppTranslateVersionHeader(header);
     psFree(source);
     psFree(version);

trunk/ppTranslate/src/ppTranslateVersion.c

@@ -6 +6 @@
 #include <pslib.h>
 
-#include "ppMops.h"
-#include "ppMopsVersionDefinitions.h"
+#include "ppTranslateVersionDefinitions.h"
 
-#ifndef PPMOPS_VERSION
-#error "PPMOPS_VERSION is not set"
+#ifndef PPTRANSLATE_VERSION
+#error "PPTRANSLATE_VERSION is not set"
 #endif
-#ifndef PPMOPS_BRANCH
-#error "PPMOPS_BRANCH is not set"
+#ifndef PPTRANSLATE_BRANCH
+#error "PPTRANSLATE_BRANCH is not set"
 #endif
-#ifndef PPMOPS_SOURCE
-#error "PPMOPS_SOURCE is not set"
+#ifndef PPTRANSLATE_SOURCE
+#error "PPTRANSLATE_SOURCE is not set"
 #endif
 
-psString ppMopsVersion(void)
+psString ppTranslateVersion(void)
 {
     char *value = NULL;
-    psStringAppend(&value, "%s@%s", PPMOPS_BRANCH, PPMOPS_VERSION);
+    psStringAppend(&value, "%s@%s", PPTRANSLATE_BRANCH, PPTRANSLATE_VERSION);
     return value;
 }
 
-psString ppMopsSource(void)
+psString ppTranslateSource(void)
 {
-    return psStringCopy(PPMOPS_SOURCE);
+    return psStringCopy(PPTRANSLATE_SOURCE);
 }
 
-psString ppMopsVersionLong(void)
+psString ppTranslateVersionLong(void)
 {
-    psString version = ppMopsVersion();  // Version, to return
-    psString source = ppMopsSource();    // Source
+    psString version = ppTranslateVersion();  // Version, to return
+    psString source = ppTranslateSource();    // Source
 
-    psStringPrepend(&version, "ppMops ");
+    psStringPrepend(&version, "ppTranslate ");
     psStringAppend(&version, " from %s, built %s, %s", source, __DATE__, __TIME__);
     psFree(source);
@@ -50 +49 @@
 
 
-bool ppMopsVersionHeader(psMetadata *header)
+bool ppTranslateVersionHeader(psMetadata *header)
 {
     PS_ASSERT_METADATA_NON_NULL(header, false);
@@ -58 +57 @@
     psFree(time);
     psString history = NULL;               // History string
-    psStringAppend(&history, "ppMops at %s", timeString);
+    psStringAppend(&history, "ppTranslate at %s", timeString);
     psFree(timeString);
     psMetadataAddStr(header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, NULL, history);
@@ -65 +64 @@
     psLibVersionHeader(header);
 
-    psString version = ppMopsVersion(); // Software version
-    psString source  = ppMopsSource();  // Software source
+    psString version = ppTranslateVersion(); // Software version
+    psString source  = ppTranslateSource();  // Software source
 
-    psStringPrepend(&version, "ppMops version: ");
-    psStringPrepend(&source, "ppMops source: ");
+    psStringPrepend(&version, "ppTranslate version: ");
+    psStringPrepend(&source, "ppTranslate source: ");
 
     psMetadataAddStr(header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, NULL, version);
@@ -80 +79 @@
 }
 
-void ppMopsVersionPrint(void)
+void ppTranslateVersionPrint(void)
 {
     psTime *time = psTimeGetNow(PS_TIME_TAI); // The time now
     psString timeString = psTimeToISO(time); // The time in an ISO string
     psFree(time);
-    psLogMsg("ppMops", PS_LOG_INFO, "ppMops at %s", timeString);
+    psLogMsg("ppTranslate", PS_LOG_INFO, "ppTranslate at %s", timeString);
     psFree(timeString);
 
     psString pslib = psLibVersionLong();// psLib version
-    psString ppMops = ppMopsVersionLong(); // ppMops version
+    psString ppTranslate = ppTranslateVersionLong(); // ppTranslate version
 
-    psLogMsg("ppMops", PS_LOG_INFO, "%s", pslib);
-    psLogMsg("ppMops", PS_LOG_INFO, "%s", ppMops);
+    psLogMsg("ppTranslate", PS_LOG_INFO, "%s", pslib);
+    psLogMsg("ppTranslate", PS_LOG_INFO, "%s", ppTranslate);
 
     psFree(pslib);
-    psFree(ppMops);
+    psFree(ppTranslate);
 
     return;

trunk/ppTranslate/src/ppTranslateVersionDefinitions.h.in

@@ -1 @@
-#ifndef PPMOPS_VERSION_DEFINITIONS_H
-#define PPMOPS_VERSION_DEFINITIONS_H
+#ifndef PPTRANSLATE_VERSION_DEFINITIONS_H
+#define PPTRANSLATE_VERSION_DEFINITIONS_H
 
-#define PPMOPS_VERSION @PPMOPS_VERSION@ // SVN version
-#define PPMOPS_BRANCH  @PPMOPS_BRANCH@  // SVN branch
-#define PPMOPS_SOURCE  @PPMOPS_SOURCE@  // SVN source
+#define PPTRANSLATE_VERSION @PPTRANSLATE_VERSION@ // SVN version
+#define PPTRANSLATE_BRANCH  @PPTRANSLATE_BRANCH@  // SVN branch
+#define PPTRANSLATE_SOURCE  @PPTRANSLATE_SOURCE@  // SVN source
 
 #endif

@@ -3 +3 @@
 config.h
 config.h.in
-ppMopsVersionDefinitions.h
+ppTranslateVersionDefinitions.h
 .deps
 Makefile
 ppMops
+ppMonet