Changeset 867

Timestamp:

Jun 11, 2014, 7:04:17 PM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.6: eliminate the need of a config.site file

File:

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

trunk/server/source3/build.cmd ¶

@@ -27 +27 @@
 /* version 1.0.2 from 18.02.2014 Silvan (create xqs files for exceptq) */
 /* version 1.0.3 from 13.05.2014 Silvan (adjust python include) */
+/* version 1.0.4 from 11.06.2014 Silvan (remove the need of a config.site file */
                                          
 /* load the sysfuncs if not already loaded */
@@ -35 +36 @@
 
 /* init the version string (don't forget to change) */
-version      = "1.0.3"
-version_date = "13.05.2014"
+version      = "1.0.4"
+version_date = "11.06.2014"
 
 '@echo off'
@@ -66 +67 @@
 end
 
-logFile   = 'build.log'
-options   = 'build.options'
-cacheFile = 'build.cache'
-
 /* defaults */
 make  = ""
@@ -76 +73 @@
 conf  = ""
 verstring = 'x.x.x-3.x.x.xxx-eCS-'date('S')  /* for packaging if branding is disabled */
+
+logFile   = 'build.log'
+options   = 'build.options'
+scriptfile = 'build_script'
 
 /* Read profile */
@@ -135 +136 @@
     address cmd 'SETLOCAL'
 
-/* we need to delete the cache file and redo it afterwards */
-    ok = SysFileDelete(cacheFile);
-
-/* add the compile and link flags to the cache file */
+/* we need to recreate the script file, so delete it first */
+    ok = SysFileDelete(scriptFile);
+
+/* set the compile, link and pathflags flags */
     call SetCLFlags
 
@@ -144 +145 @@
     sEnvVar = EnvGet('CUPS');
     if sEnvVar <> '' then do
-        call lineout cacheFile, "ac_cv_path_CUPS_CONFIG='" || sEnvVar || "'";
+        call lineout scriptfile, "ac_cv_path_CUPS_CONFIG='" || sEnvVar || "'";
+        call lineout scriptfile, "export ac_cv_path_CUPS_CONFIG";
     end
 
 /* our libc provides a correct getpass(), so no need to replace */
-    call lineout cacheFile, "libreplace_cv_REPLACE_GETPASS=no";
+    call lineout scriptfile, "libreplace_cv_REPLACE_GETPASS='no'";
+    call lineout scriptfile, "export libreplace_cv_REPLACE_GETPASS";
 
 /* is python env set */
@@ -155 +158 @@
         sPythonVersion = PythonVersion(sEnvVar);
         if sPythonVersion <> '-1' then do
-            call lineout cacheFile, "ac_cv_path_PYTHON_CONFIG='" || sEnvVar || "/config/" || sPythonVersion || "'";
-            call lineout cacheFile, "ac_cv_path_PYTHON='" || sEnvVar || "'";
+            call lineout scriptfile, "ac_cv_path_PYTHON_CONFIG='" || sEnvVar || "/config/" || sPythonVersion || "'";
+            call lineout scriptfile, "export ac_cv_path_PYTHON_CONFIG";
+            call lineout scriptfile, "ac_cv_path_PYTHON='" || sEnvVar "'";
+            call lineout scriptfile, "export ac_cv_path_PYTHON";
         end
     end
@@ -165 +170 @@
             sPythonVersion = PythonVersion(sEnvVar|| '/lib');
             if sPythonVersion <> '-1' then do
-                call lineout cacheFile, "ac_cv_path_PYTHON_CONFIG='" || sPythonVersion || "_dll'";
-                call lineout cacheFile, "ac_cv_path_PYTHON='" || sEnvVar || "/include/" || sPythonVersion || "'";
+                call lineout scriptfile, "ac_cv_path_PYTHON_CONFIG='" || sPythonVersion || "_dll" || "'";
+                call lineout scriptfile, "export ac_cv_path_PYTHON_CONFIG";
+                call lineout scriptfile, "ac_cv_path_PYTHON='" || sEnvVar || "/include/" || sPythonVersion || "'";
+                call lineout scriptfile, "export ac_cv_path_PYTHON";
             end
         end
     end
-    ok = stream(cacheFile, 'c', 'close');
 
 /* run configure */
-    address cmd 'sh ./configure --enable-pie=no --prefix=/samba --disable-shared --with-acl-support --cache-file=build.cache 2>&1 | tee configure.log'
+    call lineout scriptfile, "./configure --enable-pie=no --prefix=/samba --disable-shared --with-acl-support"
+    ok = stream(scriptFile, 'c', 'close');
+    address cmd 'sh ' || scriptfile || ' 2>&1 | tee configure.log'
     address cmd 'ENDLOCAL'
 end
@@ -352 +360 @@
 
 /**
- * set the compile and link flags
+ * set the compile, link and path flags
  */
-SetCLFlags: procedure expose cacheFile
-
-    call lineout cacheFile, "CFLAGS='-D__EMX__ -DOS2  -D__OS2__ -D__ST_MT_ERRNO__ -O2 -march=pentium -mtune=pentium4'";
-    call lineout cacheFile, "CXXFLAGS='-D__EMX__ -DOS2 -D__OS2__ -D__ST_MT_ERRNO__ -O2 -march=pentium -mtune=pentium4'";
-    call lineout cacheFile, "LDFLAGS='-Zmap -Zargs-wild -Zbin-files -Zhigh-mem -D__ST_MT_ERRNO__ -s'";
-/*  address cmd 'SET AR=emxomfar'
-    address cmd 'SET LIBS=-lsocket -lsyslog' */
+SetCLFlags: procedure expose scriptfile
+
+    call lineout scriptfile, "CFLAGS='-D__EMX__ -DOS2 -D__OS2__ -D__ST_MT_ERRNO__ -O2 -march=pentium -mtune=pentium4'";
+    call lineout scriptfile, "export CFLAGS";
+    call lineout scriptfile, "CXXFLAGS='-D__EMX__ -DOS2 -D__OS2__ -D__ST_MT_ERRNO__ -O2 -march=pentium -mtune=pentium4'";
+    call lineout scriptfile, "export CXXFLAGS";
+    call lineout scriptfile, "LDFLAGS='-Zmap -Zargs-wild -Zbin-files -Zhigh-mem -D__ST_MT_ERRNO__ -s'";
+    call lineout scriptfile, "export LDFLAGS";
+    call lineout scriptfile, "PATH='" || translate(EnvGet('PATH'), '/', '\') || "'";
+    call lineout scriptfile, "export PATH";
+    call lineout scriptfile, "PATH_SEPARATOR=';'";
+    call lineout scriptfile, "export PATH_SEPARATOR";
+    call lineout scriptfile, "ac_executable_extensions='.exe'";
+    call lineout scriptfile, "export ac_executable_extensions";
     return