Changeset 898

Timestamp:

Mar 29, 2016, 3:02:47 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: get rid of configure, adjust build.cmd heavily, rename version files

Location:

trunk/server

Files:

• examples/VFS (modified) (1 prop)
• examples/VFS/configure (deleted)
• lib/replace/getpass.m4 (modified) (1 diff)
• lib/replace/libreplace_cc.m4 (modified) (1 diff)
• source3 (modified) (1 prop)
• source3/build.cmd (modified) (17 diffs)
• source3/configure (deleted)
• source3/configure.in (modified) (1 diff)
• source3/version.os2_ (moved) (moved from trunk/server/source3/version.ec_ ) (1 diff)

trunk/server/lib/replace/getpass.m4

@@ -16 +16 @@
 ],[],libreplace_cv_REPLACE_GETPASS=yes,libreplace_cv_REPLACE_GETPASS=no)
 CPPFLAGS="$SAVE_CPPFLAGS"
+
+# on OS/2 libc getpass is ok, no need to replace
+case "$host_os" in
+        *os2*)
+        libreplace_cv_REPLACE_GETPASS=no
+        ;;
+esac
 ])
+
 if test x"$libreplace_cv_REPLACE_GETPASS" = x"yes"; then
         AC_DEFINE(REPLACE_GETPASS,1,[Whether getpass should be replaced])

trunk/server/lib/replace/libreplace_cc.m4

@@ -56 +56 @@
 case "$host_os" in
         *irix6*) AC_ADD_INCLUDE(<standards.h>)
+                ;;
+        *os2*)
+                # mmap on OS/2 is not complete, so disable is...
+                AC_DEFINE(MMAP_BLACKLIST, 1, [Whether MMAP is broken])
                 ;;
         *hpux*)

trunk/server/source3/build.cmd

@@ -1 @@
-/* Samba build script for eCS (OS/2) */
-
-/* version history */
-/* version 0.1.0 from 09.04.2010 Herwig (first edition) */
-/* version 0.2.2 from 08.09.2009 Herwig (a lot enhancements) */
-/* version 0.3.0 from 17.08.2010 Silvan (redone a lot) */
-/* version 0.3.1 from 20.08.2010 Silvan (added version.ecs check) */
-/* 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) */
-/* version 0.3.5 from 23.11.2011 Herwig (brand before configure, in case
-                                         version.h is missing) */
-/* version 0.3.6 from 06.04.2012 Herwig (support parallel jobs, show build 
-                                         time upon completion) */
-/* version 0.3.7 from 23.04.2012 Silvan (compile and link flags need to be
-                                         set here [happy birthday Jason]) */
-/* version 0.3.8 from 09.11.2012 Silvan (eliminated the 2nd brand function) */
-/* version 0.3.9 from 12.11.2012 Silvan (never use ksh, now using sh) */
-/* version 0.3.10 from 15.11.2012 Silvan (python also in unixroot) */
-/* 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) */
-/* version 1.0.0 from 06.11.2013 Silvan (conf has to create version.h also,
-                                         don't check for env anymore, use sh only) */
-/* version 1.0.1 from 13.01.2014 Silvan (always brand when svn rev changes) */
-/* 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) */
-/* version 1.0.5 from 13.03.2015 Silvan (ticket #249 thx Andy Willis) */
+/* Samba build script for OS/2 and OS/2-based systems
+ *                        
+ * version history
+ * version 0.1.0 from 09.04.2010 Herwig
+ *   - first edition
+ *
+ * version 0.2.2 from 08.09.2009 Herwig
+ *   - a lot enhancements
+ *
+ * version 0.3.0 from 17.08.2010 Silvan
+ *   - reodne a lot
+ *
+ * version 0.3.1 from 20.08.2010 Silvan
+ *   - added version.ecs check
+ *
+ * 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
+ *
+ * version 0.3.5 from 23.11.2011 Herwig 
+ *   - brand before configure, in case version.h is missing
+ *
+ * version 0.3.6 from 06.04.2012 Herwig
+ *   - support parallel jobs
+ *   - show build time upon completion
+ *
+ * version 0.3.7 from 23.04.2012 Silvan
+ *   - compile and link flags need to be set here [happy birthday Jason]
+ *
+ * version 0.3.8 from 09.11.2012 Silvan
+ *   - eliminated the 2nd brand function
+ *
+ * version 0.3.9 from 12.11.2012 Silvan
+ *   - never use ksh, now using sh
+ *
+ * version 0.3.10 from 15.11.2012 Silvan
+ *   - python also in unixroot
+ *
+ * version 0.3.11 from 15.11.2012 Herwig
+ *   - make libc switching really optional
+ *
+ * version 0.3.12 from 30.11.2012 Silvan
+ *   - added maintained by
+ *
+ * version 0.3.13 from 15.08.2013 Herwig
+ *   - create build_anomalies.log
+ *   - codepages to ZIP
+ *   - libc065 switching
+ *
+ * version 1.0.0 from 06.11.2013 Silvan
+ *   - conf has to create version.h also
+ *   - don't check for env anymore, use sh only
+ *
+ * version 1.0.1 from 13.01.2014 Silvan
+ *   - always brand when svn rev changes
+ *
+ * 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
+ *
+ * version 1.0.5 from 13.03.2015 Silvan
+ *   - ticket #249 thx Andy Willis
+ *
+ * version 1.1.0 from 24.03.2016 Silvan
+ *   - remove libc switching
+ *   - generate configure via autogen.sh
+ *   - cups env is not needed anymore, as available as rpm
+ *   - python env removed, as available as rpm
+ *   - added lxlite and emxomfstripe
+ *   - rename some variables eCS vs OS/2
+*/
+
                                          
 /* load the sysfuncs if not already loaded */
@@ -37 +89 @@
 
 /* init the version string (don't forget to change) */
-version      = "1.0.5"
-version_date = "13.03.2015"
+version      = "1.1.0"
+version_date = "24.03.2016"
 
 '@echo off'
@@ -44 +96 @@
 ok = time('R')
 
-say "Samba for eCS (OS/2) build script v"   || version || " from " || version_date
+say "Samba for OS/2 and OS/2-based systems build script v"   || version || " from " || version_date
 
 /* No parameter or HELP -> display usage */
@@ -59 +111 @@
     say "      ZIP   - create ZIP archive"
     say "      ALL   - do just everything"
-    say "Deprecated options:"
-    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"
     say 
     exit 255
@@ -73 +120 @@
 brand = "No"
 conf  = ""
-verstring = 'x.x.x-3.x.x.xxx-eCS-'date('S')  /* for packaging if branding is disabled */
+verstring = 'x.x.x-3.x.x.xxx-OS2-'date('S')  /* for packaging if branding is disabled */
+newVersion = "VERSION.OUT"
 
 logFile   = 'build.log'
@@ -93 +141 @@
 build_parms = ""
 
-/* 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"
-    otherwise libc = ""
-end
-if libc <> "" then address cmd "call "libc".cmd"
-
 if pos("MAKE", cmdline) > 0 then do
     make = "MAKE"
@@ -140 +178 @@
     ok = SysFileDelete(scriptFile);
 
+/* recreate configure first */
+    call lineout scriptfile, "autogen.sh --version-file " || newVersion;
+
 /* set the compile, link and pathflags flags */
     call SetCLFlags
-
-/* is cups env set */
-    sEnvVar = EnvGet('CUPS');
-    if sEnvVar <> '' then do
-        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 scriptfile, "libreplace_cv_REPLACE_GETPASS='no'";
-    call lineout scriptfile, "export libreplace_cv_REPLACE_GETPASS";
-
-/* is python env set */
-    sEnvVar = EnvGet('PYTHONHOME');
-    if sEnvVar <> '' then do
-        sPythonVersion = PythonVersion(sEnvVar);
-        if sPythonVersion <> '-1' then do
-            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
-    else do
-        sEnvVar = EnvGet('UNIXROOT');
-        if sEnvVar <> '' then do
-            sEnvVar = sEnvVar || '/usr'
-            sPythonVersion = PythonVersion(sEnvVar|| '/lib');
-            if sPythonVersion <> '-1' then do
-                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
 
 /* run configure */
@@ -250 +255 @@
 exit 0
 
-brand: procedure expose verstring
+brand: procedure expose verstring newVersion
     parse arg revision
 
-    /* eComStation Version file */
-    VerFile = "VERSION.ECS"
+    /* OS/2 and OS/2-based systems version file */
+    VerFile = "VERSION.OS2"
     maintainedBy = "unknown"
 
@@ -260 +265 @@
     ok = stream(VerFile, 'c', 'QUERY EXISTS')
     if ok = "" then do
-        say "Please create a " || VerFile || " based on VERSION.EC_"
+        say "Please create a " || VerFile || " based on VERSION.OS2_"
         exit 0
     end
@@ -266 +271 @@
     /* Samba Version file */
     Version = "VERSION"
-    NewVersion = "VERSION.TMP"
-
-    eCSVer.0 = 0
+    ok = SysFileDelete(newVersion)
+
+    OS2Ver.0 = 0
     I = 0
     do until lines(VerFile) = 0
         I = I + 1
-        eCSVer.I = linein(VerFile)
-        if left(eCSVer.I,28) = "SAMBA_VERSION_VENDOR_SUFFIX=" then do
-            parse var eCSver.I . '='vendor_suffix
+        OS2Ver.I = linein(VerFile)
+        if left(OS2Ver.I,28) = "SAMBA_VERSION_VENDOR_SUFFIX=" then do
+            parse var OS2Ver.I . '='vendor_suffix
             vendor_suffix = strip(vendor_suffix,,'"')
             parse var vendor_suffix vendor suffix
         end
-        if left(eCSVer.I,14) = "MAINTAINED_BY=" then do
-            parse var eCSver.I . '='maintainedBy
+        if left(OS2Ver.I,14) = "MAINTAINED_BY=" then do
+            parse var OS2Ver.I . '='maintainedBy
             maintainedBy = '"Maintained by: ' || strip(maintainedBy,,'"') || '"'
         end
@@ -286 +291 @@
     if Revision <> "" then do
         I = I + 1
-        eCSVer.I = "SAMBA_VERSION_VENDOR_PATCH="revision
-    end
-    eCSVer.0 = I
+        OS2Ver.I = "SAMBA_VERSION_VENDOR_PATCH="revision
+    end
+    OS2Ver.0 = I
 
     do until lines(VERSION) = 0
@@ -302 +307 @@
         end
         
-        do I = 1 to eCSVer.0
-            parse var eCSVer.I tag'='strvalue
+        do I = 1 to OS2Ver.0
+            parse var OS2Ver.I tag'='strvalue
             parse var verline stag'=' .
             if stag = tag then do
@@ -309 +314 @@
             end
         end
-        if Verline <> "=" then call lineout NewVersion, verline
-    end
-    if maintainedBy <> "" then call lineout NewVersion, "MAINTAINED_BY="maintainedBy
+        if Verline <> "=" then call lineout newVersion, verline
+    end
+    if maintainedBy <> "" then call lineout newVersion, "MAINTAINED_BY="maintainedBy
 
     ok = stream(Version,'c','close')
-    ok = stream(NewVersion,'c','close')
-    address cmd "sh ./script/mkversion.sh "NewVersion" >NUL"
-    ok = SysFileDelete(NewVersion)
+    ok = stream(newVersion,'c','close')
+    address cmd "sh ./script/mkversion.sh "newVersion" >NUL"
     verstring = suffix'-'Major'.'minor'.'release'.'revision'-'vendor'-'date('S')
     say 'Samba branded as: '
@@ -322 +326 @@
     say maintainedBy
     say
-return
-
-
-/**
- * Gets the value of sEnvVar.
- */
-EnvGet: procedure
-    parse arg sEnvVar
-    if ((translate(sEnvVar) = 'BEGINLIBPATH') | (translate(sEnvVar) = 'ENDLIBPATH')) then
-        return SysQueryExtLibPath(substr(sEnvVar, 1, 1));
-return value(sEnvVar,, 'OS2ENVIRONMENT');
-
-/**
- * try to find the pythonversion
- */
-PythonVersion: procedure
-    parse arg pdir
-
-    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!"
-        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!"
-    end
-return rc
+    return
+
 
 /**
@@ -365 +334 @@
 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, "CFLAGS='-O2 -g -march=pentium'";
     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, "CXXFLAGS='-O2 -g -march=pentium'";
     call lineout scriptfile, "export CXXFLAGS";
-    call lineout scriptfile, "LDFLAGS='-Zmap -Zargs-wild -Zbin-files -Zhigh-mem -D__ST_MT_ERRNO__ -s'";
+    call lineout scriptfile, "LDFLAGS=' -Zhigh-mem -Zomf -Zargs-wild -Zargs-resp -Zbin-files'";
     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
 
@@ -419 +382 @@
 
     if what = 'CRT' then do
-       say "Create xqs files for all map files in " || binDir
-       ending = '*.map'
+       say "Create dbg files for all exe files in " || binDir
+       ending = '*.exe'
     end
 
@@ -430 +393 @@
        end
        if what = 'CRT' then do
-          address cmd "mapxqs -o " || substr(files.i, 1, length(files.i)-3) || "xqs " || files.i
+          address cmd "emxomfstripe -D " || substr(files.i, 1, length(files.i)-3) || "dbg " || files.i
+          address cmd "lxlite /ml1 /mf2 /ydd /yxd /b- " || files.i
        end
 

trunk/server/source3/configure.in

@@ -2657 +2657 @@
 fi
 
-ICONV_LOOK_DIRS="/usr /usr/local /sw /opt"
+ICONV_LOOK_DIRS="/@unixroot/usr /usr /usr/local /sw /opt"
 AC_ARG_WITH(libiconv,
 [AS_HELP_STRING([--with-libiconv=BASEDIR], [Use libiconv in BASEDIR/lib and BASEDIR/include (default=auto)])],

trunk/server/source3/version.os2_

@@ -1 @@
-SAMBA_VERSION_VENDOR_SUFFIX="eCS 1.3.0"
+SAMBA_VERSION_VENDOR_SUFFIX="OS/2 and OS/2-based systems v1.3.0"
 MAINTAINED_BY="unknown"