From 190dd2d961a7410113809e736f7aba377bddfeef Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 29 Mar 2003 18:25:05 +0000 Subject: [PATCH] Windows tweaks git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@403 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/autoconf/Make.common.in | 6 +++++- bacula/autoconf/configure.in | 13 +++++++++---- bacula/configure | 15 +++++++++++---- bacula/kernstodo | 4 ++-- bacula/src/cats/Makefile.in | 4 ++-- bacula/src/dird/Makefile.in | 6 +++--- bacula/src/dird/job.c | 2 +- bacula/src/filed/Makefile.in | 12 +++++++++--- bacula/src/filed/win32/Makefile.in | 15 ++++++--------- bacula/src/findlib/Makefile.in | 2 +- bacula/src/lib/Makefile.in | 4 ++-- bacula/src/stored/Makefile.in | 21 ++++++++++++++++++--- 12 files changed, 69 insertions(+), 35 deletions(-) diff --git a/bacula/autoconf/Make.common.in b/bacula/autoconf/Make.common.in index facdd8f7b2..953e74db35 100644 --- a/bacula/autoconf/Make.common.in +++ b/bacula/autoconf/Make.common.in @@ -1,4 +1,4 @@ -# autoconf/Make.common.in -*- Makefile -*- +# autoconf/Make.common.in -*- Makefile -*- # release date (man), LSM date, version number/name, current maintainer DATE="@DATE@" LSMDATE=@LSMDATE@ @@ -66,6 +66,10 @@ DINCLUDE = @DINCLUDE@ DLIB = @DLIB@ DB_LIBS = @DB_LIBS@ +# Windows (cygwin) flags +WCFLAGS = @WCFLAGS@ +WLDFLAGS = @WLDFLAGS@ + # X Include directory #XINC = @X_CFLAGS@ @XPM_CFLAGS@ diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index 86d8008785..e786f0b215 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -1150,6 +1150,8 @@ AC_SUBST(DLIB) AC_SUBST(DB_LIBS) AC_SUBST(X_LIBS) AC_SUBST(X_EXTRA_LIBS) +AC_SUBST(WCFLAGS) +AC_SUBST(WLDFLAGS) dnl# extra configurable objects OBJLIST= @@ -1158,6 +1160,9 @@ AC_SUBST(OBJLIST) lld="lld" llu="llu" +WCFLAGS= +WLDFLAGS= + # # Finally we set appropriate distribution specific # variables and defaults @@ -1200,8 +1205,8 @@ cygwin) DISTVER=`uname -a |awk '{print $3}'` TAPEDRIVE="/dev/nrst0" WIN32=win32 - CFLAGS="${CFLAGS} -mwindows" - LDFLAGS="${LDFLAGS} -mwindows" + WCFLAGS="-mwindows" + WLDFLAGS="-mwindows" ;; darwin) DISTVER=`uname -r` @@ -1451,8 +1456,8 @@ Configuration on `date`: Working directory ${working_dir} C Compiler: ${CC} ${CCVERSION} C++ Compiler: ${CXX} ${CXXVERSION} - Compiler flags: ${CFLAGS} - Linker flags: ${LDFLAGS} + Compiler flags: ${WCFLAGS} ${CFLAGS} + Linker flags: ${WLDFLAGS} ${LDFLAGS} Libraries: ${LIBS} Statically Linked Tools: ${support_static_tools} Statically Linked FD: ${support_static_fd} diff --git a/bacula/configure b/bacula/configure index 80d2ded75e..94b705982d 100755 --- a/bacula/configure +++ b/bacula/configure @@ -9340,12 +9340,17 @@ CPPFLAGS="$CPPFLAGS" + + OBJLIST= lld="lld" llu="llu" +WCFLAGS= +WLDFLAGS= + # # Finally we set appropriate distribution specific # variables and defaults @@ -9388,8 +9393,8 @@ cygwin) DISTVER=`uname -a |awk '{print $3}'` TAPEDRIVE="/dev/nrst0" WIN32=win32 - CFLAGS="${CFLAGS} -mwindows" - LDFLAGS="${LDFLAGS} -mwindows" + WCFLAGS="-mwindows" + WLDFLAGS="-mwindows" ;; darwin) DISTVER=`uname -r` @@ -9869,6 +9874,8 @@ s%@DEBUG@%$DEBUG%g s%@DINCLUDE@%$DINCLUDE%g s%@DLIB@%$DLIB%g s%@DB_LIBS@%$DB_LIBS%g +s%@WCFLAGS@%$WCFLAGS%g +s%@WLDFLAGS@%$WLDFLAGS%g s%@OBJLIST@%$OBJLIST%g s%@hostname@%$hostname%g s%@TAPEDRIVE@%$TAPEDRIVE%g @@ -10191,8 +10198,8 @@ Configuration on `date`: Working directory ${working_dir} C Compiler: ${CC} ${CCVERSION} C++ Compiler: ${CXX} ${CXXVERSION} - Compiler flags: ${CFLAGS} - Linker flags: ${LDFLAGS} + Compiler flags: ${WCFLAGS} ${CFLAGS} + Linker flags: ${WLDFLAGS} ${LDFLAGS} Libraries: ${LIBS} Statically Linked Tools: ${support_static_tools} Statically Linked FD: ${support_static_fd} diff --git a/bacula/kernstodo b/bacula/kernstodo index 90c0434183..69054e2f85 100644 --- a/bacula/kernstodo +++ b/bacula/kernstodo @@ -1,5 +1,5 @@ Kern's ToDo List - 25 March 2003 + 28 March 2003 Documentation to do: (a little bit at a time) - Document running a test version. @@ -20,6 +20,7 @@ Testing to do: (painful) - multiple simultaneous Volumes For 1.30 release: +- Figure out how to use ssh to protect Bacula communications. - Fix "access not allowed" for backup of files on WinXP. - Issue message to mount a new tape before the rewind. - Simplified client job initiation for portables. @@ -905,4 +906,3 @@ rufus-dir: Volume used once. Marking Volume "File0003" as Used. that no longer exist on the machine -- so that we maintain say backups for 30 days, but if the file is deleted, we maintain the last copy for 1 year. -- answer Volume retention. - diff --git a/bacula/src/cats/Makefile.in b/bacula/src/cats/Makefile.in index 3b7d0a29bc..6117b4f338 100644 --- a/bacula/src/cats/Makefile.in +++ b/bacula/src/cats/Makefile.in @@ -37,7 +37,7 @@ LIBOBJS = mysql.o bdb.o bdb_create.o bdb_get.o bdb_update.o \ # inference rules .c.o: - $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(SQL_INC) $(DINCLUDE) $(CFLAGS) $< + $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(SQL_INC) $(DINCLUDE) $(CFLAGS) $< #------------------------------------------------------------------------- all: Makefile libsql.a @echo "==== Make of cats is good ====" @@ -48,7 +48,7 @@ libsql.a: $(LIBOBJS) $(RANLIB) $@ cats: $(SVROBJS) ../findlib/libfind.a - $(CC) $(LDFLAGS) -L../findlib -L../lib -o $@ $(SVROBJS) $(LIBS) $(DB_LIBS) -lfind -lbac + $(CC) $(WLDFLAGS) $(LDFLAGS) -L../findlib -L../lib -o $@ $(SVROBJS) $(LIBS) $(DB_LIBS) -lfind -lbac Makefile: $(srcdir)/Makefile.in $(topdir)/config.status cd $(topdir) \ diff --git a/bacula/src/dird/Makefile.in b/bacula/src/dird/Makefile.in index 69d15a2172..3eebd8b51b 100644 --- a/bacula/src/dird/Makefile.in +++ b/bacula/src/dird/Makefile.in @@ -58,18 +58,18 @@ EXTRAOBJS = @OBJLIST@ # inference rules .c.o: - $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< #------------------------------------------------------------------------- all: Makefile bacula-dir @STATIC_DIR@ @echo "==== Make of dird is good ====" @echo " " bacula-dir: $(SVROBJS) ../lib/libbac.a ../cats/libsql.a ../findlib/libfind.a - $(CXX) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \ + $(CXX) $(WLDFLAGS) $(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) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \ + $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \ -lsql -lbac -lfind -lm $(LIBS) $(DLIB) $(DB_LIBS) strip $@ diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c index 65c69de768..2618aec553 100644 --- a/bacula/src/dird/job.c +++ b/bacula/src/dird/job.c @@ -395,7 +395,7 @@ int get_or_create_client_record(JCR *jcr) jcr->client_name = get_memory(strlen(jcr->client->hdr.name) + 1); strcpy(jcr->client_name, jcr->client->hdr.name); if (!db_create_client_record(jcr, jcr->db, &cr)) { - Jmsg(jcr, M_FATAL, 0, _("Could not create Client record. %s"), + Jmsg(jcr, M_FATAL, 0, _("Could not create Client record. ERR=%s"), db_strerror(jcr->db)); return 0; } diff --git a/bacula/src/filed/Makefile.in b/bacula/src/filed/Makefile.in index 9e1ea66ea3..91c48f7c06 100755 --- a/bacula/src/filed/Makefile.in +++ b/bacula/src/filed/Makefile.in @@ -1,3 +1,9 @@ +# +# Bacula Makefile +# +# Version $Id$ +# + @MCOMMON@ srcdir = . @@ -41,7 +47,7 @@ WIN32LIBS = $(@WIN32@) # inference rules .c.o: - $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< #------------------------------------------------------------------------- all: Makefile @WIN32@ bacula-fd @STATIC_FD@ @echo "==== Make of filed is good ====" @@ -65,11 +71,11 @@ win32: $(WIN32OBJS) @rm -f bacula-fd.exe bacula-fd: $(SVROBJS) ../findlib/libfind.a ../lib/libbac.a @WIN32@ - $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \ + $(CXX) $(WLDFLAGS) $(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) \ + $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ $(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(LIBS) $(DLIB) strip $@ diff --git a/bacula/src/filed/win32/Makefile.in b/bacula/src/filed/win32/Makefile.in index 57be855e06..d53a006a74 100755 --- a/bacula/src/filed/win32/Makefile.in +++ b/bacula/src/filed/win32/Makefile.in @@ -1,7 +1,10 @@ # # makefile to build Windows specific pieces of the Bacula File daemon # +# Version $Id$ +# CFLAGS=@CFLAGS@ +WCFLAGS=@WCFLAGS@ CC = @CC@ CXX = @CXX@ RANLIB = @RANLIB@ @@ -47,13 +50,7 @@ winres.res: winres.rc bacula.ico winres.h idle.ico running.ico error.ico windres $< -O coff -o $@ winmain.o: winmain.cpp winbacula.h - $(CC) -c $(CFLAGS) $< - -email.o: email.c - $(CC) -c ${CFLAGS} $< - -email.exe: email.o libmymapi32.a - $(CC) ${CFLAGS} -L. -o email email.o -luser32 -lgdi32 -lmymapi32 + $(CC) -c $(WCFLAGS) $(CFLAGS) $< libmymapi32.a: mymapi32.def dlltool --as=as -k --output-lib $@ --def $< @@ -118,7 +115,7 @@ binary-release: dummy: .c.o: - $(CC) -c $(CFLAGS) $< + $(CC) -c $(WCFLAGS) $(CFLAGS) $< .cpp.o: - $(CXX) -c $(CFLAGS) $< + $(CXX) -c $(WCFLAGS) $(CFLAGS) $< diff --git a/bacula/src/findlib/Makefile.in b/bacula/src/findlib/Makefile.in index 2c0e853809..56e9307fd2 100644 --- a/bacula/src/findlib/Makefile.in +++ b/bacula/src/findlib/Makefile.in @@ -31,7 +31,7 @@ LIBOBJS = find.o match.o find_one.o attribs.o create_file.o \ # inference rules .c.o: - $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< #------------------------------------------------------------------------- all: Makefile libfind.a ../lib/libbac.a @echo "==== Make of findlib is good ====" diff --git a/bacula/src/lib/Makefile.in b/bacula/src/lib/Makefile.in index 1c6f6f15a6..140fad3a9a 100644 --- a/bacula/src/lib/Makefile.in +++ b/bacula/src/lib/Makefile.in @@ -62,10 +62,10 @@ EXTRAOBJS = @OBJLIST@ # inference rules .c.o: - $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< .cc.o: - $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< .w.c: $(CTANGLE) $< diff --git a/bacula/src/stored/Makefile.in b/bacula/src/stored/Makefile.in index d8b371927b..8cbc821fba 100644 --- a/bacula/src/stored/Makefile.in +++ b/bacula/src/stored/Makefile.in @@ -71,7 +71,7 @@ FDLIBS=@FDLIBS@ # inference rules .c.o: - $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< #------------------------------------------------------------------------- all: Makefile bacula-sd @STATIC_SD@ bls bextract bscan btape bcopy @@ -79,24 +79,39 @@ all: Makefile bacula-sd @STATIC_SD@ bls bextract bscan btape bcopy @echo " " bacula-sd: $(SVROBJS) ../lib/libbac.a - $(CXX) $(LDFLAGS) -L../lib -o $@ $(SVROBJS) $(FDLIBS) -lbac -lm $(LIBS) $(DLIB) + $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SVROBJS) $(FDLIBS) -lbac -lm $(LIBS) $(DLIB) static-bacula-sd: $(SVROBJS) ../lib/libbac.a - $(CXX) $(LDFLAGS) -static -L../lib -o $@ $(SVROBJS) $(FDLIBS) -lbac -lm $(LIBS) $(DLIB) + $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -o $@ $(SVROBJS) $(FDLIBS) -lbac -lm $(LIBS) $(DLIB) strip $@ +btape.o: btape.c + $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + btape: $(TAPEOBJS) ../lib/libbac.a ../cats/libsql.a $(CXX) $(TTOOL_LDFLSGS) $(LDFLAGS) -L../lib -L../cats -o $@ $(TAPEOBJS) -lsql $(LIBS) $(DLIB) -lbac -lm +bls.o: bls.c + $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + bls: ../findlib/libfind.a $(BLSOBJS) ../lib/libbac.a $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(LIBS) $(DLIB) -lfind -lbac -lm +bextract.o: bextract.c + $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + bextract: ../findlib/libfind.a $(BEXTOBJS) ../lib/libbac.a $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(LIBS) $(DLIB) $(FDLIBS) -lfind -lbac -lm +bscan.o: bscan.c + $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + bscan: ../findlib/libfind.a $(SCNOBJS) ../cats/libsql.a $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) -lsql $(LIBS) $(DB_LIBS) $(FDLIBS) -lfind -lbac -lm +bcopy.o: bcopy.c + $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + bcopy: $(COPYOBJS) ../findlib/libfind.a ../lib/libbac.a $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(COPYOBJS) $(LIBS) $(DB_LIBS) $(FDLIBS) -lfind -lbac -lm -- 2.39.5