Doc updates + fix Win32 build

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1944 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/.cvsignore b/bacula/.cvsignore
index 02bb60a03e3587cbfe05374832cb53c37325ff23..1dbf598cbf10c61b15602d754fe3c7c2756489ea 100644 (file)
--- a/bacula/.cvsignore
+++ b/bacula/.cvsignore
@@ -52,3 +52,9 @@ run_clean
 run_two_broken
 run_two
 run_clean_tape
+newdb
+kerns-nopython-conf
+newtape
+time.py
+time.pyc
+test.out

diff --git a/bacula/examples/python/.cvsignore b/bacula/examples/python/.cvsignore
index c294236e0e5d42c150996bf30386d3903bbb5e2c..83c0bbc9b085984284ce5c1f283916f8a18ad204 100644 (file)
--- a/bacula/examples/python/.cvsignore
+++ b/bacula/examples/python/.cvsignore
@@ -1,3 +1,3 @@
-EndJob.pyc
-NewVolume.pyc
-StartJob.pyc
+DirStartUp.pyc
+FDStartUp.pyc
+SDStartUp.pyc

diff --git a/bacula/examples/python/EndJob.py b/bacula/examples/python/EndJob.py
deleted file mode 100644 (file)
index f32df1f..0000000
--- a/bacula/examples/python/EndJob.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import bacula
-
-def EndJob(jcr):
-     jobid = jcr.get("JobId")
-     client = jcr.get("Client") 
-     jcr.set(JobReport="Python EndJob output: JobId=%d Client=%s.\n" % (jobid, client))
-     if (jobid < 2) :
-        startid = bacula.run("run kernsave")
-        print "Python started new Job: jobid=", startid
-
-     return 1

diff --git a/bacula/examples/python/NewVolume.py b/bacula/examples/python/NewVolume.py
deleted file mode 100644 (file)
index 963fcfd..0000000
--- a/bacula/examples/python/NewVolume.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import bacula
-
-def NewVolume(jcr):
-    jobid = jcr.get("JobId")
-    print "JobId=", jobid
-    client = jcr.get("Client") 
-    print "Client=" + client
-    numvol = jcr.get("NumVols");
-    print "NumVols=", numvol
-    jcr.set(JobReport="Python New Volume set for Job.\n") 
-    jcr.set(VolumeName="TestA-001")
-    return 1

diff --git a/bacula/examples/python/StartJob.py b/bacula/examples/python/StartJob.py
deleted file mode 100644 (file)
index 89559bf..0000000
--- a/bacula/examples/python/StartJob.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import bacula
-
-def StartJob(jcr):
-    jobid = jcr.get("JobId")
-    client = jcr.get("Client")
-    numvols = jcr.get("NumVols") 
-    jcr.set(JobReport="Python StartJob: JobId=%d Client=%s NumVols=%d\n" % (jobid,client,numvols))
-    return 1

diff --git a/bacula/src/version.h b/bacula/src/version.h
index f6bdf3001f9ce2bcb768e99ee18260733adba83c..5eba91a939b796b293a63a09a80d93765a191080 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #undef  VERSION
-#define VERSION "1.37.13"
-#define BDATE   "19 April 2005"
-#define LSMDATE "19Apr05"
+#define VERSION "1.37.14"
+#define BDATE   "20 April 2005"
+#define LSMDATE "20Apr05"
 
 /* Debug flags */
 #undef  DEBUG

diff --git a/bacula/src/win32/baculafd/baculafd.mak b/bacula/src/win32/baculafd/baculafd.mak
index 0ebf4ca2f185a0dac72842fe406ed46cb9edf430..4c5c989a3bf9e18e24c9c7835412cb4a7bc55b8b 100644 (file)
--- a/bacula/src/win32/baculafd/baculafd.mak
+++ b/bacula/src/win32/baculafd/baculafd.mak
@@ -88,8 +88,10 @@ CLEAN :
         -@erase "$(INTDIR)\message.obj"
         -@erase "$(INTDIR)\parse_conf.obj"
         -@erase "$(INTDIR)\print.obj"
+        -@erase "$(INTDIR)\pythonlib.obj"
         -@erase "$(INTDIR)\queue.obj"
         -@erase "$(INTDIR)\restore.obj"
+        -@erase "$(INTDIR)\res.obj"
         -@erase "$(INTDIR)\rwlock.obj"
         -@erase "$(INTDIR)\save-cwd.obj"
         -@erase "$(INTDIR)\scan.obj"
@@ -178,8 +180,10 @@ LINK32_OBJS= \
         "$(INTDIR)\message.obj" \
         "$(INTDIR)\parse_conf.obj" \
         "$(INTDIR)\print.obj" \
+        "$(INTDIR)\pythonlib.obj" \
         "$(INTDIR)\queue.obj" \
         "$(INTDIR)\restore.obj" \
+        "$(INTDIR)\res.obj" \
         "$(INTDIR)\rwlock.obj" \
         "$(INTDIR)\save-cwd.obj" \
         "$(INTDIR)\scan.obj" \
@@ -319,10 +323,14 @@ CLEAN :
         -@erase "$(INTDIR)\parse_conf.sbr"
         -@erase "$(INTDIR)\print.obj"
         -@erase "$(INTDIR)\print.sbr"
+        -@erase "$(INTDIR)\pythonlib.obj"
+        -@erase "$(INTDIR)\pythonlib.sbr"
         -@erase "$(INTDIR)\queue.obj"
         -@erase "$(INTDIR)\queue.sbr"
         -@erase "$(INTDIR)\restore.obj"
         -@erase "$(INTDIR)\restore.sbr"
+        -@erase "$(INTDIR)\res.obj"
+        -@erase "$(INTDIR)\res.sbr"
         -@erase "$(INTDIR)\rwlock.obj"
         -@erase "$(INTDIR)\rwlock.sbr"
         -@erase "$(INTDIR)\save-cwd.obj"
@@ -433,8 +441,10 @@ BSC32_SBRS= \
         "$(INTDIR)\message.sbr" \
         "$(INTDIR)\parse_conf.sbr" \
         "$(INTDIR)\print.sbr" \
+        "$(INTDIR)\pythonlib.sbr" \
         "$(INTDIR)\queue.sbr" \
         "$(INTDIR)\restore.sbr" \
+        "$(INTDIR)\res.sbr" \
         "$(INTDIR)\rwlock.sbr" \
         "$(INTDIR)\save-cwd.sbr" \
         "$(INTDIR)\scan.sbr" \
@@ -516,8 +526,10 @@ LINK32_OBJS= \
         "$(INTDIR)\message.obj" \
         "$(INTDIR)\parse_conf.obj" \
         "$(INTDIR)\print.obj" \
+        "$(INTDIR)\pythonlib.obj" \
         "$(INTDIR)\queue.obj" \
         "$(INTDIR)\restore.obj" \
+        "$(INTDIR)\res.obj" \
         "$(INTDIR)\rwlock.obj" \
         "$(INTDIR)\save-cwd.obj" \
         "$(INTDIR)\scan.obj" \
@@ -1462,6 +1474,25 @@ SOURCE=..\compat\print.cpp
 
 !ENDIF 
 
+SOURCE=..\lib\pythonlib.cpp
+
+!IF  "$(CFG)" == "baculafd - Win32 Release"
+
+
+"$(INTDIR)\pythonlib.obj" : $(SOURCE) "$(INTDIR)"
+        $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "baculafd - Win32 Debug"
+
+
+"$(INTDIR)\pythonlib.obj"   "$(INTDIR)\pythonlib.sbr" : $(SOURCE) "$(INTDIR)"
+        $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+
 SOURCE=..\lib\queue.cpp
 
 !IF  "$(CFG)" == "baculafd - Win32 Release"
@@ -1498,6 +1529,25 @@ SOURCE=..\filed\restore.cpp
 
 !ENDIF 
 
+SOURCE=..\lib\res.cpp
+
+!IF  "$(CFG)" == "baculafd - Win32 Release"
+
+
+"$(INTDIR)\res.obj" : $(SOURCE) "$(INTDIR)"
+        $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "baculafd - Win32 Debug"
+
+
+"$(INTDIR)\res.obj" "$(INTDIR)\res.sbr" : $(SOURCE) "$(INTDIR)"
+        $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+
 SOURCE=..\lib\rwlock.cpp
 
 !IF  "$(CFG)" == "baculafd - Win32 Release"

diff --git a/bacula/src/win32/compat/compat.cpp b/bacula/src/win32/compat/compat.cpp
index 402d57bdf57d17357aa03477d3fc0f2bc682a21a..71a1a1368ff159215f3d498a6749c2d89656945a 100644 (file)
--- a/bacula/src/win32/compat/compat.cpp
+++ b/bacula/src/win32/compat/compat.cpp
@@ -118,10 +118,12 @@ int lchown(const char *k, uid_t, gid_t)
    return 0;
 }
 
+#ifdef needed
 bool fstype(const char *fname, char *fs, int fslen)
 {
    return true;                       /* accept anything */
 }
+#endif
 
 
 long int

diff --git a/bacula/src/win32/console/console.mak b/bacula/src/win32/console/console.mak
index d9715ff19bf946e2e22ab6f07f90b9d3465a3a4f..d258ba19d7f3424651c5c19b8f8c16acad180f94 100644 (file)
--- a/bacula/src/win32/console/console.mak
+++ b/bacula/src/win32/console/console.mak
@@ -68,6 +68,7 @@ CLEAN :
         -@erase "$(INTDIR)\print.obj"
         -@erase "$(INTDIR)\queue.obj"
         -@erase "$(INTDIR)\rwlock.obj"
+        -@erase "$(INTDIR)\res.obj"
         -@erase "$(INTDIR)\scan.obj"
         -@erase "$(INTDIR)\serial.obj"
         -@erase "$(INTDIR)\sha1.obj"
@@ -117,6 +118,7 @@ LINK32_OBJS= \
         "$(INTDIR)\print.obj" \
         "$(INTDIR)\queue.obj" \
         "$(INTDIR)\rwlock.obj" \
+        "$(INTDIR)\res.obj" \
         "$(INTDIR)\scan.obj" \
         "$(INTDIR)\serial.obj" \
         "$(INTDIR)\sha1.obj" \
@@ -171,6 +173,7 @@ CLEAN :
         -@erase "$(INTDIR)\print.obj"
         -@erase "$(INTDIR)\queue.obj"
         -@erase "$(INTDIR)\rwlock.obj"
+        -@erase "$(INTDIR)\res.obj"
         -@erase "$(INTDIR)\scan.obj"
         -@erase "$(INTDIR)\serial.obj"
         -@erase "$(INTDIR)\sha1.obj"
@@ -221,6 +224,7 @@ LINK32_OBJS= \
         "$(INTDIR)\print.obj" \
         "$(INTDIR)\queue.obj" \
         "$(INTDIR)\rwlock.obj" \
+        "$(INTDIR)\res.obj" \
         "$(INTDIR)\scan.obj" \
         "$(INTDIR)\serial.obj" \
         "$(INTDIR)\sha1.obj" \
@@ -437,6 +441,12 @@ SOURCE=..\lib\rwlock.cpp
 "$(INTDIR)\rwlock.obj" : $(SOURCE) "$(INTDIR)"
         $(CPP) $(CPP_PROJ) $(SOURCE)
 
+SOURCE=..\lib\res.cpp
+
+"$(INTDIR)\res.obj" : $(SOURCE) "$(INTDIR)"
+        $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 
 SOURCE=..\lib\scan.cpp
 

diff --git a/bacula/src/win32/lib/pythonlib.cpp b/bacula/src/win32/lib/pythonlib.cpp
new file mode 100644 (file)
index 0000000..9c99af0
--- /dev/null
+++ b/bacula/src/win32/lib/pythonlib.cpp
@@ -0,0 +1 @@
+#include "../../lib/pythonlib.c"

diff --git a/bacula/src/win32/lib/res.cpp b/bacula/src/win32/lib/res.cpp
new file mode 100644 (file)
index 0000000..758d8c6
--- /dev/null
+++ b/bacula/src/win32/lib/res.cpp
@@ -0,0 +1 @@
+#include "../../lib/res.c"

diff --git a/bacula/src/win32/wx-console/filelist b/bacula/src/win32/wx-console/filelist
index 82362c37ba1a9f0461b640e22562c847d546dba7..cf977900ec72da0cc9ab0582b4a6cce2b9c87cc0 100644 (file)
--- a/bacula/src/win32/wx-console/filelist
+++ b/bacula/src/win32/wx-console/filelist
@@ -27,6 +27,7 @@
 ..\lib\message
 ..\lib\parse_conf
 ..\lib\queue
+..\lib\res
 ..\lib\rwlock
 ..\lib\scan
 ..\lib\semlock