Start changing some references to the LBS name to Cumulus instead. So far,
changes are in a few of the more user-visible places (name of the
executable, name in the version string). Many internal references are not
changed, and likely will not be changed immediately (since some of the
changes would change format compatibility).
PACKAGES=sqlite3 uuid
DEBUG=-g #-pg
CXXFLAGS=-O -Wall -D_FILE_OFFSET_BITS=64 $(DEBUG) \
PACKAGES=sqlite3 uuid
DEBUG=-g #-pg
CXXFLAGS=-O -Wall -D_FILE_OFFSET_BITS=64 $(DEBUG) \
- `pkg-config --cflags $(PACKAGES)` -DLBS_VERSION=`cat version`
+ `pkg-config --cflags $(PACKAGES)` -DCUMULUS_VERSION=`cat version`
LDFLAGS=$(DEBUG) `pkg-config --libs $(PACKAGES)`
SRCS=chunk.cc localdb.cc metadata.cc ref.cc remote.cc scandir.cc sha1.cc \
store.cc subfile.cc util.cc
OBJS=$(SRCS:.cc=.o)
LDFLAGS=$(DEBUG) `pkg-config --libs $(PACKAGES)`
SRCS=chunk.cc localdb.cc metadata.cc ref.cc remote.cc scandir.cc sha1.cc \
store.cc subfile.cc util.cc
OBJS=$(SRCS:.cc=.o)
$(CXX) $(LDFLAGS) -o $@ $^
version : NEWS
$(CXX) $(LDFLAGS) -o $@ $^
version : NEWS
using std::ostream;
/* Version information. This will be filled in by the Makefile. */
using std::ostream;
/* Version information. This will be filled in by the Makefile. */
-#ifndef LBS_VERSION
-#define LBS_VERSION Unknown
+#ifndef CUMULUS_VERSION
+#define CUMULUS_VERSION Unknown
-#define LBS_STRINGIFY(s) LBS_STRINGIFY2(s)
-#define LBS_STRINGIFY2(s) #s
-static const char lbs_version[] = LBS_STRINGIFY(LBS_VERSION);
+#define CUMULUS_STRINGIFY(s) CUMULUS_STRINGIFY2(s)
+#define CUMULUS_STRINGIFY2(s) #s
+static const char cumulus_version[] = CUMULUS_STRINGIFY(CUMULUS_VERSION);
static RemoteStore *remote = NULL;
static TarSegmentStore *tss = NULL;
static RemoteStore *remote = NULL;
static TarSegmentStore *tss = NULL;
"Usage: %s [OPTION]... --dest=DEST PATHS...\n"
"Produce backup snapshot of files in SOURCE and store to DEST.\n"
"\n"
"Usage: %s [OPTION]... --dest=DEST PATHS...\n"
"Produce backup snapshot of files in SOURCE and store to DEST.\n"
"\n"
" --full-metadata do not re-use metadata from previous backups\n"
"\n"
"Exactly one of --dest or --upload-script must be specified.\n",
" --full-metadata do not re-use metadata from previous backups\n"
"\n"
"Exactly one of --dest or --upload-script must be specified.\n",
+ cumulus_version, program
FILE *descriptor = fdopen(descriptor_fd, "w");
fprintf(descriptor, "Format: LBS Snapshot v0.6\n");
FILE *descriptor = fdopen(descriptor_fd, "w");
fprintf(descriptor, "Format: LBS Snapshot v0.6\n");
- fprintf(descriptor, "Producer: LBS %s\n", lbs_version);
+ fprintf(descriptor, "Producer: Cumulus %s\n", cumulus_version);
strftime(desc_buf, sizeof(desc_buf), "%Y-%m-%d %H:%M:%S %z", &time_buf);
fprintf(descriptor, "Date: %s\n", desc_buf);
if (backup_scheme.size() > 0)
strftime(desc_buf, sizeof(desc_buf), "%Y-%m-%d %H:%M:%S %z", &time_buf);
fprintf(descriptor, "Date: %s\n", desc_buf);
if (backup_scheme.size() > 0)