Changeset 489

Timestamp:

Aug 20, 2010, 4:14:38 PM (15 years ago)

Author:

Herwig Bauernfeind

Message:

Samba Server 3.5: Enabled more modules

File:

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

trunk/server/source3/build.cmd ¶

@@ -108 +108 @@
 
 if conf = "YES" then do
-        address cmd 'SETLOCAL'
-/*      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'
-        address cmd 'SET AR=emxomfar'
-        address cmd 'SET LIBS=-lsocket -lsyslog' */
+    address cmd 'SETLOCAL'
+/*    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'
+    address cmd 'SET AR=emxomfar'
+    address cmd 'SET LIBS=-lsocket -lsyslog' */
     /* disabled options:
-         --enable-developer --enable-socket-wrapper
+         --enable-developer --enable-socket-wrapper
      */
 
 /* we need to delete the cache file and redo it afterwards */
-        ok = SysFileDelete(cacheFile);
+    ok = SysFileDelete(cacheFile);
 
 /* is cups env set */
-        sEnvVar = EnvGet('CUPS');
-        if sEnvVar <> '' then do
-        call lineout cacheFile, "ac_cv_path_CUPS_CONFIG='" || sEnvVar || "'";
-        end
+        sEnvVar = EnvGet('CUPS');
+    if sEnvVar <> '' then do
+    call lineout cacheFile, "ac_cv_path_CUPS_CONFIG='" || sEnvVar || "'";
+    end
 
 /* is python env set */
-        sEnvVar = EnvGet('PYTHONHOME');
-        if sEnvVar <> '' then do
-        sPythonVersion = PythonVersion(sEnvVar);
-        end
-        if sPythonVersion <> '-1' then do
-        call lineout cacheFile, "ac_cv_path_PYTHON_CONFIG='" || sEnvVar || "/config/" || sPythonVersion || "'";
-        call lineout cacheFile, "ac_cv_path_PYTHON='" || sEnvVar || "'";
-        end
-
-        ok = stream(cacheFile, 'c', 'close');
+        sEnvVar = EnvGet('PYTHONHOME');
+    if sEnvVar <> '' then do
+    sPythonVersion = PythonVersion(sEnvVar);
+    end
+    if sPythonVersion <> '-1' then do
+    call lineout cacheFile, "ac_cv_path_PYTHON_CONFIG='" || sEnvVar || "/config/" || sPythonVersion || "'";
+    call lineout cacheFile, "ac_cv_path_PYTHON='" || sEnvVar || "'";
+    end
+
+    ok = stream(cacheFile, 'c', 'close');
 
 /* run configure */
     address cmd 'ksh ./configure --enable-pie=no --prefix=/samba --disable-shared --with-acl-support --cache-file=build.cache 2>&1 | tee configure.log'
-        address cmd 'ENDLOCAL'
+    address cmd 'ENDLOCAL'
 end
 
@@ -147 +147 @@
     address cmd "make clean"
 end
-           
+       
 if brand = "YES" then do
     svninfo = ".\svninfo"
@@ -190 +190 @@
     ok = stream(VerFile, 'c', 'QUERY EXISTS')
     if ok = "" then do
-        say "Please create a " || VerFile || " based on VERSION.EC_"
-        exit 0
+        say "Please create a " || VerFile || " based on VERSION.EC_"
+        exit 0
     end
 
@@ -204 +204 @@
         eCSVer.I = linein(VerFile)
         if left(eCSVer.I,28) = "SAMBA_VERSION_VENDOR_SUFFIX=" then do
-                    parse var eCSver.I . '='vendor_suffix
-                    vendor_suffix = strip(vendor_suffix,,'"')
-                    parse var vendor_suffix vendor suffix
+            parse var eCSver.I . '='vendor_suffix
+            vendor_suffix = strip(vendor_suffix,,'"')
+            parse var vendor_suffix vendor suffix
         end
     end
@@ -263 +263 @@
 
     ok = SysFileTree(pdir||"\python*.dll",pydll.,"FO")
-
+    rc = -1
     if pydll.0 = 1 then do
-       dllpur = filespec("N",pydll.1)
-       parse var dllpur 'python' ver '.dll'
-       if datatype(ver) <> "NUM" then do
-               say "no valid python dll found!"
-               return -1
-           end
-       else do
-           major = left(ver,1)
-           minor = substr(ver,2,)
-           verstring = "python"||major||"."||minor
-           return verstring
-       end
-        
+        dllpur = filespec("N",pydll.1)
+        parse var dllpur 'python' ver '.dll'
+        if datatype(ver) <> "NUM" then do
+            say "no valid python dll found!"
+        end
+        else do
+            major = left(ver,1)
+            minor = substr(ver,2,)
+            verstring = "python"||major||"."||minor
+            rc = verstring
+        end
     end
     else do
         say "no dll found!"
-        return -1
-        end
+    end
+return rc