Changeset 788

Timestamp:

Aug 15, 2013, 10:42:52 AM (12 years ago)

Author:

Herwig Bauernfeind

Message:

build.cmd 0.3.13

File:

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

trunk/server/source3/build.cmd

@@ -20 +20 @@
 /* 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) */
+/* version 0.3.13 from 15.08.2013 Herwig (create build_anomalies.log, codepages 
+                                          to ZIP, libc065 switching) */
                                          
 /* load the sysfuncs if not already loaded */
@@ -29 +31 @@
 
 /* init the version string (don't forget to change) */
-version = "0.3.12"
-version_date = "30.11.2012"
-
-/* number of make jobs to execute at the same time */
-jobs = "2"
+version = "0.3.13"
+version_date = "15.08.2013"
 
 '@echo off'
@@ -55 +54 @@
     say "      ALL   - do just everything"
     say "Deprecated options:"
-    say "      064   - link against libc064.dll (default)"
+    say "      065   - link against libc065.dll (default)"
+    say "      064   - link against libc064.dll"
     say "      064x  - link against libc064x.dll"
     say "      063   - link against libc063.dll"
@@ -67 +67 @@
 end
 
-options = 'build.options'
+logFile   = 'build.log'
+options   = 'build.options'
 cacheFile = 'build.cache'
 
 /* defaults */
 make  = ""
+jobs  = "2"  /* number of make jobs to execute at the same time */
 brand = "No"
 conf  = ""
@@ -90 +92 @@
 build_parms = ""
 
-/* delete the following 7 lines to remove libc switching capability */
+/* delete the following 8 lines to remove libc switching capability */
 select 
+    when pos("065", cmdline) > 0 then libc = "065"
     when pos("064", cmdline) > 0 then libc = "064"
-    when pos("064X", cmdline) > 0 then libc = "064X"
-    when pos("063", cmdline) > 0 then  libc = "063"
+    when pos("064X",cmdline) > 0 then libc = "064X"
+    when pos("063", cmdline) > 0 then libc = "063"
     otherwise libc = ""
 end
@@ -156 +159 @@
     end
     else do
-    sEnvVar = EnvGet('UNIXROOT');
-    if sEnvVar <> '' then do
-        sEnvVar = sEnvVar || '/usr'
-        sPythonVersion = PythonVersion(sEnvVar|| '/lib');
-        if sPythonVersion <> '-1' then do
-            call lineout cacheFile, "ac_cv_path_PYTHON_CONFIG='" || sEnvVar || "/lib/" || sPythonVersion || "'";
-            call lineout cacheFile, "ac_cv_path_PYTHON='" || sEnvVar || "/include'";
-        end
-    end
+        sEnvVar = EnvGet('UNIXROOT');
+        if sEnvVar <> '' then do
+            sEnvVar = sEnvVar || '/usr'
+            sPythonVersion = PythonVersion(sEnvVar|| '/lib');
+            if sPythonVersion <> '-1' then do
+                call lineout cacheFile, "ac_cv_path_PYTHON_CONFIG='" || sEnvVar || "/lib/" || sPythonVersion || "'";
+                call lineout cacheFile, "ac_cv_path_PYTHON='" || sEnvVar || "/include'";
+            end
+        end
     end
     ok = stream(cacheFile, 'c', 'close');
@@ -178 +181 @@
 
 if make <> "" then do
-    address cmd 'make -j 'jobs' 2>&1 | tee build.log'
+    address cmd 'make -j 'jobs' 2>&1 | tee 'logFile
 end
 
@@ -189 +192 @@
     'move ..\*.exe >NUL'
     'move ..\*.dll >NUL'
+    'md .\codepage'
+    'copy ..\..\..\codepages\*.dat .\codepage\*'
     'cd ..'
-    'zip -rpo9 samba-'translate(verstring,'-',' ')'.zip .\samba\*.exe .\samba\*.dll'
+    'zip -rpo9 samba-'translate(verstring,'-',' ')'.zip .\samba\*.exe .\samba\*.dll .\samba\codepage\*.dat'
     'cd .\samba'
     'move * .. >NUL'
+    'del .\codepage\*.dat'
+    'rd .\codepage'
     'cd ..'
     'rd .\samba'
+    'cd ..'
     say 'Created ZIP package'
 end
+
+/* Recreate build_anomalies.log */
+ok = SysFileDelete("build_anomalies.log")
+do until lines(logFile) = 0
+    buildlogline = linein(logFile)
+    select
+        when left(buildlogline,11) = "Generating " then iterate
+        when left(buildlogline,10) = "Compiling " then iterate
+        when left(buildlogline,9)  = "Building " then iterate
+        when left(buildlogline,8)  = "Linking " then iterate
+        when left(buildlogline,6)  = "Using " then iterate
+        when left(buildlogline,6)  = "      " then iterate
+        otherwise call lineout "build_anomalies.log", buildlogline
+    end
+end
+
 /* Default exit point */
 reqtime = format(time('E'),,0)
@@ -202 +226 @@
 reqsec = reqtime//60
 say "All done, took "format(reqmin,,0)' min 'format(reqsec,,0)" sec."
+call lineout logFile, "All done, took "format(reqmin,,0)' min 'format(reqsec,,0)" sec."
 exit 0
 
@@ -234 +259 @@
         if left(eCSVer.I,14) = "MAINTAINED_BY=" then do
             parse var eCSver.I . '='maintainedBy
-            maintainedBy = '"Maintained by: ' || strip(maintainedBy,,'"') || '"'
+            maintainedBy = 'Maintained by:    "' || strip(maintainedBy,,'"') || '"'
         end
     end
@@ -272 +297 @@
     ok = SysFileDelete(NewVersion)
     verstring = suffix'-'Major'.'minor'.'release'.'revision'-'vendor'-'date('S')
-    say "Samba branded as: "verstring
+    say 'Samba branded as: "'verstring'"'
     say maintainedBy
     say