Changeset 838 for trunk/server/source3

Timestamp:

Jan 13, 2014, 5:36:09 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.6: always brand when svn rev changes

File:

• trunk/server/source3/build.cmd (modified) (3 diffs)

trunk/server/source3/build.cmd

@@ -109 +109 @@
 
 if pos("BRAND", cmdline) > 0 then do
-    Brand = "YES"
+    brand = "YES"
     build_parms = build_parms||' BRAND'    
 end
 if pos("CONF", cmdline) > 0 then do
-    Conf = "YES"
+    conf = "YES"
     build_parms = build_parms||' CONF'    
 end
+
+/* test to see, if we need to brand */
+call NeedBranding
 
 say "Building with: " || build_parms
@@ -122 +125 @@
 
 if (versionh.0 = 0) | (conf = "YES") | (brand = "YES") then do
-    svninfo = ".\svninfo"
-    address cmd 'svn status -q -u | grep "^Status against revision:" | sed -e "s/Status against revision: *//">'svninfo
-    revision = strip(translate(linein(svninfo)))
-    ok = stream(svninfo,'c','close')
     call brand revision
 end
@@ -353 +352 @@
     address cmd 'SET LIBS=-lsocket -lsyslog' */
     return
+
+/**
+ * see if we need to brand again
+ */
+NeedBranding: procedure expose revision brand build_parms
+    svninfo = "svninfo"
+    svninfo_tmp = "svninfo_tmp"
+    address cmd 'svn status -q -u | grep "^Status against revision:" | sed -e "s/Status against revision: *//">'svninfo_tmp
+    revision = strip(translate(linein(svninfo_tmp)))
+    ok = stream(svninfo_tmp,'c','close')
+    revision_old = strip(translate(linein(svninfo)))
+    ok = stream(svninfo,'c','close')
+    if revision_old \= revision then do
+        if brand \= "YES" then do
+            build_parms = build_parms ||' BRAND'
+            brand = "YES"
+        end
+        ok = SysFileDelete(svninfo)
+        'ren ' || svninfo_tmp || ' ' || svninfo
+    end
+    else do
+        ok = SysFileDelete(svninfo_tmp)
+    end
+
+    return