Changeset 666 for trunk/server/source3

Timestamp:

Nov 23, 2011, 4:48:12 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba Server 3.5: build.cmd 0.3.4

File:

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

trunk/server/source3/build.cmd

@@ -8 +8 @@
 /* version 0.3.2 from 08.07.2011 Silvan (pythonhome may be not set) */
 /* version 0.3.3 from 05.11.2011 Herwig (add support for libc064) */
+/* version 0.3.4 from 23.11.2011 Herwig (simplify libc switching) */
 
 /* load the sysfuncs if not already loaded */
@@ -17 +18 @@
 
 /* init the version string (don't forget to change) */
-version = "0.3.3"
-version_date = "05.11.2011"
+version = "0.3.4"
+version_date = "23.11.2011"
 
 '@echo off'
@@ -30 +31 @@
     say "Valid commands are:"
     say "      HELP  - this page"
-    say "      064   - link against libc064.dll (default)"
-    say "      064x  - link against libc064x.dll"
-    say "      063   - link against libc063.dll"
     say "      CONF  - run configure"
     say "      CLEAN - clean up and recompile everything"
@@ -41 +39 @@
     say "      ZIP   - create ZIP archive"
     say "      ALL   - do just everything"
+    say "Deprecated options:"
+    say "      064   - link against libc064.dll (default)"
+    say "      064x  - link against libc064x.dll"
+    say "      063   - link against libc063.dll"
     say 
     exit 255
@@ -55 +57 @@
 /* defaults */
 make  = ""
-libc  = "064"
 brand = "No"
 conf  = ""
@@ -74 +75 @@
 build_parms = ""
 
+/* delete the following 7 lines to remove libc switching capability */
+select 
+    when pos("064X", cmdline) > 0 then libc = "064X"
+    when pos("063", cmdline) > 0 then  libc = "063"
+    otherwise libc = "064"
+end
+address cmd "call "libc".cmd"
+
 if pos("MAKE", cmdline) > 0 then do
     make = "MAKE"
@@ -83 +92 @@
     build_parms = build_parms||' 'make
 end
-select 
-    when pos("064X", cmdline) > 0 then do
-        libc = "064X"
-        build_parms = build_parms||' 'libc    
-    end
-    when pos("063", cmdline) > 0 then do
-        libc = "063"
-        build_parms = build_parms||' 'libc    
-    end
-    otherwise do
-        libc = "064"
-        build_parms = build_parms||' 'libc    
-    end
-end
+
 if pos("BRAND", cmdline) > 0 then do
     Brand = "YES"
@@ -107 +103 @@
 
 /* start working */
-select
-    when libc = "064X" then address cmd "call 064x.cmd"
-    when libc = "063" then address cmd "call 063.cmd"
-    otherwise address cmd "call 064.cmd"
-end
-
 if conf = "YES" then do
     address cmd 'SETLOCAL'
-/*    address cmd 'SET CFLAGS=-g -Zomf -O1 -march=pentium -mtune=pentium4'
+/*  address cmd 'SET CFLAGS=-g -Zomf -O1 -march=pentium -mtune=pentium4'
     address cmd 'SET CXXFLAGS=-g -Zomf -O1 -march=pentium -mtune=pentium4'
     address cmd 'SET LDFLAGS=-s -Zsym -Zmap -Zbin-files -Zomf -Zexe -Zargs-wild -Zargs-resp'