subdirs = src scripts doc src/lib src/findlib src/cats \
@READLINE_SRC@ src/console src/dird src/filed \
- src/stored @GNOME_DIR@ src/tools
+ src/stored @GNOME_DIR@ src/tools \
+ rescue rescue/linux
FDsubdirs = src/lib src/findlib src/filed
AC_OUTPUT([autoconf/Make.common \
Makefile \
+ rescue/Makefile \
+ rescue/linux/Makefile \
+ rescue/freebsd/Makefile \
scripts/startmysql \
scripts/stopmysql \
scripts/btraceback \
trap 'rm -fr `echo "autoconf/Make.common \
Makefile \
+ rescue/Makefile \
+ rescue/linux/Makefile \
+ rescue/freebsd/Makefile \
scripts/startmysql \
scripts/stopmysql \
scripts/btraceback \
CONFIG_FILES=\${CONFIG_FILES-"autoconf/Make.common \
Makefile \
+ rescue/Makefile \
+ rescue/linux/Makefile \
+ rescue/freebsd/Makefile \
scripts/startmysql \
scripts/stopmysql \
scripts/btraceback \
- blocksize recognition code.
For 1.28 release:
+- Look at ua_prune.c in detail. Why did JobType work at all??????
- Implement FileOptions (see end of this document)
- Make hash table for linked files in findlib/find_one.c:161
- Make bcopy read through bad tape records.
# this dir relative to top dir
thisdir = src
-DEBUG=-DDEBUG_STRICT @DEBUG@
first_rule: all
dummy:
-#
-# these are the objects that are changed by the .configure process
-EXTRAOBJS = @OBJLIST@
-
-# it's ``be kind to gmake week''
-#EXTPROS = $(SRCS:S,.c,.extpro,)
-EXTPROS =
.SUFFIXES: .c .o
.PHONY:
$(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
$(LIBS) $(DLIB) $(CONS_LIBS) -lbac -lsql -lm
+static-console: $(CONSOBJS) ../lib/libbac.a ../cats/libsql.a
+ $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
+ $(LIBS) $(DLIB) $(CONS_LIBS) -lbac -lsql -lm
+ strip $@
+
+
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
cd $(topdir) \
&& CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
$(CXX) $(LDFLAGS) $(DIR_LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
-lsql -lbac -lfind -lm $(LIBS) $(DLIB) $(DB_LIBS)
+static-bacula-dir: $(SVROBJS) ../lib/libbac.a ../cats/libsql.a ../findlib/libfind.a
+ $(CXX) $(LDFLAGS) $(DIR_LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
+ -lsql -lbac -lfind -lm $(LIBS) $(DLIB) $(DB_LIBS)
+ strip $@
+
+
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
cd $(topdir) \
&& CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
char *insert_delcand =
"INSERT INTO DelCandidates "
"SELECT JobId, PurgedFiles, FileSetId FROM Job "
- "WHERE JobType='%c' "
+ "WHERE Type='%c' "
"AND JobTDate<%s "
"AND ClientId=%u";
"FROM Job,DelCandidates "
"WHERE Job.JobTDate>%s "
"AND Job.ClientId=%u "
- "AND Job.JobType='B' "
+ "AND Job.Type='B' "
"AND Job.Level='F' "
"AND Job.JobStatus='T' "
"AND Job.FileSetId=DelCandidates.FileSetId";
"FROM Job,DelCandidates "
"WHERE Job.JobTDate>%s "
"AND Job.ClientId=%u "
- "AND Job.JobType='V' "
+ "AND Job.Type='V' "
"AND Job.Level='V' "
"AND Job.JobStatus='T' "
"AND Job.FileSetId=DelCandidates.FileSetId";
"FROM Job,DelCandidates "
"WHERE Job.JobTDate>%s "
"AND Job.ClientId=%u "
- "AND Job.JobType='R'";
+ "AND Job.Type='R'";
strcpy(query, cnt_DelCand);
Dmsg1(100, "select sql=%s\n", query);
if (!db_sql_query(ua->db, query, count_handler, (void *)&cnt)) {
- if (ua->verbose) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
- }
+ bsendmsg(ua, "%s", db_strerror(ua->db));
Dmsg0(050, "Count failed\n");
goto bail_out;
}
Mmsg(&query, select_verify_del, ed1, cr.ClientId);
break;
}
- db_sql_query(ua->db, query, job_delete_handler, (void *)&del);
+ if (!db_sql_query(ua->db, query, job_delete_handler, (void *)&del)) {
+ bsendmsg(ua, "%s", db_strerror(ua->db));
+ }
/*
* OK, now we have the list of JobId's to be pruned, first check
Dmsg1(050, "Delete JobId=%d\n", del.JobId[i]);
if (!del.PurgedFiles[i]) {
Mmsg(&query, del_File, del.JobId[i]);
- db_sql_query(ua->db, query, NULL, (void *)NULL);
+ if (!db_sql_query(ua->db, query, NULL, (void *)NULL)) {
+ bsendmsg(ua, "%s", db_strerror(ua->db));
+ }
Dmsg1(050, "Del sql=%s\n", query);
}
Mmsg(&query, del_Job, del.JobId[i]);
- db_sql_query(ua->db, query, NULL, (void *)NULL);
+ if (!db_sql_query(ua->db, query, NULL, (void *)NULL)) {
+ bsendmsg(ua, "%s", db_strerror(ua->db));
+ }
Dmsg1(050, "Del sql=%s\n", query);
Mmsg(&query, del_JobMedia, del.JobId[i]);
- db_sql_query(ua->db, query, NULL, (void *)NULL);
+ if (!db_sql_query(ua->db, query, NULL, (void *)NULL)) {
+ bsendmsg(ua, "%s", db_strerror(ua->db));
+ }
Dmsg1(050, "Del sql=%s\n", query);
}
bsendmsg(ua, _("Pruned %d %s for client %s from catalog.\n"), del.num_ids,
$(CXX) $(LDFLAGS) $(FD_LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
$(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(LIBS) $(DLIB)
+static-bacula-fd: $(SVROBJS) ../findlib/libfind.a ../lib/libbac.a @WIN32@
+ $(CXX) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
+ $(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(LIBS) $(DLIB)
+ strip $@
+
+
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
cd $(topdir) \
&& CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
bacula-sd: $(SVROBJS) ../lib/libbac.a
$(CXX) $(LDFLAGS) $(SD_LDFLAGS) -L../lib -o $@ $(SVROBJS) $(FDLIBS) -lbac -lm $(LIBS) $(DLIB)
+static-bacula-sd: $(SVROBJS) ../lib/libbac.a
+ $(CXX) $(LDFLAGS) $(SD_LDFLAGS) -L../lib -o $@ $(SVROBJS) $(FDLIBS) -lbac -lm $(LIBS) $(DLIB)
+ strip $@
+
btape: $(TAPEOBJS) ../lib/libbac.a ../cats/libsql.a
$(CXX) $(TTOOL_LDFLSGS) $(LDFLAGS) -L../lib -L../cats -o $@ $(TAPEOBJS) -lsql $(LIBS) $(DLIB) -lbac -lm
/* */
#define VERSION "1.28"
#define VSTRING "1"
-#define DATE "19 December 2002"
-#define LSMDATE "19Dec02"
+#define DATE "20 December 2002"
+#define LSMDATE "20Dec02"
/* Debug flags */
#define DEBUG 1