Changeset 901 for trunk/server/source3

Timestamp:

Apr 1, 2016, 5:22:52 PM (9 years ago)

Author:

Silvan Scherrer

Message:

samba server: remove -Zbin-files, open needed files as O_BINARY, fix version string in build.cmd

Location:

trunk/server/source3

Files:

• build.cmd (modified) (7 diffs)
• version.os2_ (modified) (1 diff)

trunk/server/source3/build.cmd

@@ -79 +79 @@
  *   - added lxlite and emxomfstripe
  *   - rename some variables eCS vs OS/2
+ *
+ * version 1.1.1 from 01.04.2016 Silvan
+ *   - remove -Zbin-files switch
 */
 
@@ -89 +92 @@
 
 /* init the version string (don't forget to change) */
-version      = "1.1.0"
-version_date = "24.03.2016"
+version      = "1.1.1"
+version_date = "01.04.2016"
 
 '@echo off'
@@ -281 +284 @@
             parse var OS2Ver.I . '='vendor_suffix
             vendor_suffix = strip(vendor_suffix,,'"')
-            parse var vendor_suffix vendor suffix
         end
         if left(OS2Ver.I,14) = "MAINTAINED_BY=" then do
             parse var OS2Ver.I . '='maintainedBy
             maintainedBy = '"Maintained by: ' || strip(maintainedBy,,'"') || '"'
+        end
+        if left(OS2Ver.I,15) = "VENDOR_VERSION=" then do
+            parse var OS2Ver.I . '='vendorVersion
+            vendorVersion = strip(vendorVersion,,'"')
         end
     end
@@ -295 +301 @@
     OS2Ver.0 = I
 
+    if vendorVersion <> "" then do
+        vendor_suffix = '"' || vendor_suffix || ' v' || vendorVersion || '"'
+    end
+
     do until lines(VERSION) = 0
         verline = linein(VERSION)
@@ -310 +320 @@
             parse var OS2Ver.I tag'='strvalue
             parse var verline stag'=' .
+            if tag = 'SAMBA_VERSION_VENDOR_SUFFIX' then do
+                strvalue = vendor_suffix
+            end
             if stag = tag then do
                 verline = tag'='strvalue
@@ -321 +334 @@
     ok = stream(newVersion,'c','close')
     address cmd "sh ./script/mkversion.sh "newVersion" >NUL"
-    verstring = suffix'-'Major'.'minor'.'release'.'revision'-'vendor'-'date('S')
+    verstring = vendorVersion'-'Major'.'minor'.'release'.'revision'-OS2-'date('S')
     say 'Samba branded as: '
     say '"'verstring'"'
@@ -338 +351 @@
     call lineout scriptfile, "CXXFLAGS='-O2 -g -march=pentium'";
     call lineout scriptfile, "export CXXFLAGS";
-    call lineout scriptfile, "LDFLAGS=' -Zhigh-mem -Zomf -Zargs-wild -Zargs-resp -Zbin-files'";
+    call lineout scriptfile, "LDFLAGS=' -Zhigh-mem -Zomf -Zargs-wild -Zargs-resp'";
     call lineout scriptfile, "export LDFLAGS";
     call lineout scriptfile, "LIBS='-lmmap -lintl'";

trunk/server/source3/version.os2_

@@ -1 @@
-SAMBA_VERSION_VENDOR_SUFFIX="OS/2 and OS/2-based systems v1.3.0"
+SAMBA_VERSION_VENDOR_SUFFIX="OS/2 and OS/2-based systems"
+VENDOR_VERSION="1.3.0"
 MAINTAINED_BY="unknown"