extras-buildsys/common ArchUtils.py, 1.1, 1.2 HTTPServer.py, 1.5, 1.6 Makefile, 1.7, 1.8

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3976/common

Modified Files:
	ArchUtils.py HTTPServer.py Makefile 
Log Message:
2005-08-25  Dan Williams <dcbw at redhat.com>

    * Initial commit of reworked stuff:
        - Each target gets separate config files on builder
            and server
        - Builders now run multiple jobs per builder instance
        - Config files now ConfigParser based
        - Target specifications are richer and require distro,
            target, and repo names
        - Builder's supported arches are autodetermined
        - Various database fields renamed and/or removed

    IT DOESN'T WORK YET




Index: ArchUtils.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/ArchUtils.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ArchUtils.py	18 Jul 2005 23:40:31 -0000	1.1
+++ ArchUtils.py	25 Aug 2005 18:15:13 -0000	1.2
@@ -18,13 +18,67 @@
 
 # Associate sub-architectures with their "master" architecture.
 sub_arches = {
-               'athlon'    : 'i386',
-               'i686'      : 'i386',
-               'i586'      : 'i386',
-               'i486'      : 'i386',
-               'amd64'     : 'x86_64',
-               'ia32e'     : 'x86_64',
-               'ppc32'     : 'ppc',
-               'sparcv8'   : 'sparc',
-               'sparcv9'   : 'sparc'
-               }
+                'athlon'    : 'i386',
+                'i686'      : 'i386',
+                'i586'      : 'i386',
+                'i486'      : 'i386',
+                'i386'      : 'i386',
+                'amd64'     : 'x86_64',
+                'ia32e'     : 'x86_64',
+                'x86_64'    : 'x86_64',
+                'ppc32'     : 'ppc',
+                'ppc'       : 'ppc',
+                'ppc64'     : 'ppc64',
+                'sparcv8'   : 'sparc',
+                'sparcv9'   : 'sparc',
+                'sparc'     : 'sparc',
+                'sparc64'   : 'sparc'
+             }
+
+
+# Given a particular architecture, what can the machine build for?
+#
+# FIXME: we ignore the fact that i586 couldn't run i686 binaries
+# built during a package's build process, like OpenOffice.org does
+# for example
+
+# x86 variants
+sa_i386 = ['i386', 'i486', 'i586', 'i686', 'athlon']
+sa_i486 = sa_i386
+sa_i586 = sa_i386
+sa_i686 = sa_i386
+sa_athlon = sa_i386
+
+# x86_64 variants
+sa_x86_64 = sa_i386 + ['x86_64', 'amd64', 'ia32e']
+sa_amd64 = sa_x86_64
+sa_ia32e = sa_x86_64
+
+# PPC variants
+sa_ppc = ['ppc', 'ppc32']
+sa_ppc32 = sa_ppc
+sa_ppc64 = sa_ppc + ['ppc64']
+
+# SPARC variants
+sa_sparc = ['sparc', 'sparcv8', 'sparcv9']
+sa_sparcv8 = sa_sparc
+sa_sparcv9 = sa_sparc
+sa_sparc64 = sa_sparc + ['sparc64']
+
+supported_arches = {
+                'athlon'    : sa_athlon,
+                'i686'      : sa_i686,
+                'i586'      : sa_i586,
+                'i486'      : sa_i486,
+                'i386'      : sa_i386,
+                'amd64'     : sa_amd64,
+                'ia32e'     : sa_ia32e,
+                'x86_64'    : sa_x86_64,
+                'ppc32'     : sa_ppc32,
+                'ppc'       : sa_ppc,
+                'ppc64'     : sa_ppc64,
+                'sparcv8'   : sa_sparcv8,
+                'sparcv9'   : sa_sparcv9,
+                'sparc'     : sa_sparc,
+                'sparc64'   : sa_sparc64
+                   }


Index: HTTPServer.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/HTTPServer.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HTTPServer.py	11 Jul 2005 03:42:06 -0000	1.5
+++ HTTPServer.py	25 Aug 2005 18:15:13 -0000	1.6
@@ -96,14 +96,20 @@
         else:
             self._server = PlgHTTPServer(addr, http_dir)
         self._stop = False
+        self._stopped = False
         threading.Thread.__init__(self)
 
     def run(self):
         while not self._stop:
             self._server.handle_request()
+        self._stopped = True
 
     def stop(self):
         self._stop = True
+        t = time.time()
+        while not self._stopped:
+            if time.time() > t + 2:
+                break
 
 
 ###########################################################


Index: Makefile
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile	18 Jul 2005 21:26:30 -0000	1.7
+++ Makefile	25 Aug 2005 18:15:13 -0000	1.8
@@ -9,6 +9,7 @@
 
 FILES = \
 	ArchUtils.py \
+    BaseConfig.py \
 	CommonErrors.py \
 	FileDownloader.py \
 	HTTPSURLopener.py \