Changeset 757

Timestamp:

Nov 30, 2012, 6:12:57 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.6: add a maintained message

Location:

trunk/server/source3

Files:

• build.cmd (modified) (6 diffs)
• lib/version.c (modified) (1 diff)
• nmbd/nmbd.c (modified) (1 diff)
• script/mkversion.sh (modified) (2 diffs)
• smbd/server.c (modified) (1 diff)
• version.ec_ (modified) (1 diff)
• winbindd/winbindd.c (modified) (1 diff)

trunk/server/source3/build.cmd

@@ -19 +19 @@
 /* version 0.3.10 from 15.11.2012 Silvan (python also in unixroot) */
 /* version 0.3.11 from 15.11.2012 Herwig (make libc switching really optional) */
+/* version 0.3.12 from 30.11.2012 Silvan (maintained by) */
                                          
 /* load the sysfuncs if not already loaded */
@@ -28 +29 @@
 
 /* init the version string (don't forget to change) */
-version = "0.3.11"
-version_date = "15.11.2012"
+version = "0.3.12"
+version_date = "30.11.2012"
 
 /* number of make jobs to execute at the same time */
@@ -208 +209 @@
     /* eComStation Version file */
     VerFile = "VERSION.ECS"
+    maintainedBy = "unknown"
 
     /* is the file available */
@@ -230 +232 @@
             parse var vendor_suffix vendor suffix
         end
+        if left(eCSVer.I,14) = "MAINTAINED_BY=" then do
+            parse var eCSver.I . '='maintainedBy
+            maintainedBy = '"Maintained by: ' || strip(maintainedBy,,'"') || '"'
+        end
     end
     ok = stream(VerFile, 'c', 'close')
@@ -259 +265 @@
         if Verline <> "=" then call lineout NewVersion, verline
     end
+    if maintainedBy <> "" then call lineout NewVersion, "MAINTAINED_BY="maintainedBy
 
     ok = stream(Version,'c','close')
@@ -266 +273 @@
     verstring = suffix'-'Major'.'minor'.'release'.'revision'-'vendor'-'date('S')
     say "Samba branded as: "verstring
+    say maintainedBy
     say
 return

trunk/server/source3/lib/version.c

@@ -26 +26 @@
         return SAMBA_VERSION_STRING;
 }
+#ifdef __OS2__
+const char *maintained_by_string(void)
+{
+        return MAINTAINED_BY;
+}
+#endif

trunk/server/source3/nmbd/nmbd.c

@@ -879 +879 @@
         DEBUG(0,("nmbd version %s started.\n", samba_version_string()));
         DEBUGADD(0,("%s\n", COPYRIGHT_STARTUP_MESSAGE));
+#ifdef __OS2__
+        DEBUGADD(0,("%s\n", maintained_by_string()));
+#endif
 
         if (!lp_load_initial_only(get_dyn_CONFIGFILE())) {

trunk/server/source3/script/mkversion.sh

@@ -32 +32 @@
 
 SAMBA_VERSION_VENDOR_FUNCTION=`sed -n 's/^SAMBA_VERSION_VENDOR_FUNCTION=//p' $SOURCE_DIR$VERSION_FILE`
+MAINTAINED_BY=`sed -n 's/^MAINTAINED_BY=//p' $SOURCE_DIR$VERSION_FILE`
 
 echo "/* Autogenerated by script/mkversion.sh */" > $OUTPUT_FILE
@@ -38 +39 @@
 echo "#define SAMBA_VERSION_MINOR ${SAMBA_VERSION_MINOR}" >> $OUTPUT_FILE
 echo "#define SAMBA_VERSION_RELEASE ${SAMBA_VERSION_RELEASE}" >> $OUTPUT_FILE
+echo "#define MAINTAINED_BY ${MAINTAINED_BY}" >> $OUTPUT_FILE
 
 

trunk/server/source3/smbd/server.c

@@ -1037 +1037 @@
         DEBUG(0,("smbd version %s started.\n", samba_version_string()));
         DEBUGADD(0,("%s\n", COPYRIGHT_STARTUP_MESSAGE));
+#ifdef __OS2__
+        DEBUGADD(0,("%s\n", maintained_by_string()));
+#endif
 
         DEBUG(2,("uid=%d gid=%d euid=%d egid=%d\n",

trunk/server/source3/version.ec_

@@ -1 +1 @@
 SAMBA_VERSION_VENDOR_SUFFIX="eCS 1.3.0"
-SAMBA_VERSION_VENDOR_PATCH=432
+MAINTAINED_BY="unknown"

trunk/server/source3/winbindd/winbindd.c

@@ -1348 +1348 @@
         DEBUG(0,("winbindd version %s started.\n", samba_version_string()));
         DEBUGADD(0,("%s\n", COPYRIGHT_STARTUP_MESSAGE));
+#ifdef __OS2__
+        DEBUGADD(0,("%s\n", maintained_by_string()));
+#endif
 
         if (!lp_load_initial_only(get_dyn_CONFIGFILE())) {