Skip to content
This repository has been archived by the owner on May 13, 2020. It is now read-only.

Commit

Permalink
checkpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
Adam Groszer committed Jun 13, 2010
1 parent 9546ff7 commit 96ca679
Show file tree
Hide file tree
Showing 4 changed files with 126 additions and 25 deletions.
89 changes: 89 additions & 0 deletions rackspace.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
[build]
compilers = py24_32 py25_32 py26_32 py26_64

[py24_32]
command = set PATH=%PATH%;c:\mingw32\bin
c:\Python24_32\python setup.py build_ext --compiler mingw32 bdist_egg upload
fileEnding = py2.4-win32.egg

[py25_32]
command = set PATH=%PATH%;c:\mingw32\bin
c:\Python25_32\python setup.py build_ext --compiler mingw32 bdist_egg upload
fileEnding = py2.5-win32.egg

[py26_32]
command = call c:\program files\msvc\msvcvars.bat
c:\Python26_32\python setup.py build_ext --compiler msvc bdist_egg upload
fileEnding = py2.6-win32.egg

[py26_64]
command = call c:\program files\msvc\msvcvars.bat
c:\Python26_64\python setup.py build_ext --compiler msvc bdist_egg upload
fileEnding = py2.6-win-amd64.egg


[ZODB3]
package = ZODB3
minVersion =
maxVersion =
targets = py24_32 py25_32

[ZODB3_26]
package = ZODB3
minVersion = 3.9.0
maxVersion =
targets = py26_32 py26_64

[zope.container]
package = zope.container
minVersion =
maxVersion =
targets = py24_32 py25_32

[zope.container_26]
package = zope.container
minVersion = 3.7.0
maxVersion =
targets = py26_32 py26_64

[zope.hookable]
package = zope.hookable
minVersion =
maxVersion =
targets = py24_32 py25_32 py26_32 py26_64

[zope.i18nmessageid]
package = zope.i18nmessageid
minVersion =
maxVersion =
targets = py24_32 py25_32 py26_32 py26_64

[zope.index]
package = zope.index
minVersion =
maxVersion =
targets = py24_32 py25_32

[zope.index_26]
package = zope.index
minVersion = 3.6.0
maxVersion =
targets = py26_32 py26_64

[zope.interface]
package = zope.interface
minVersion =
maxVersion =
targets = py24_32 py25_32 py26_32 py26_64

[zope.proxy]
package = zope.proxy
minVersion =
maxVersion =
targets = py24_32 py25_32 py26_32 py26_64

[zope.security]
package = zope.security
minVersion =
maxVersion =
targets = py24_32 py25_32 py26_32 py26_64
15 changes: 14 additions & 1 deletion server-setup.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
- restart, repeat
- kill off all c:\windows\$NtUninstall*, $hf_mig too
- automatic windows update is OFF! (I hate when it f..s up the system)
- download:
- download: (all downloaded stuf goes into c:\install)
- firefox
- freecommander (my personal stuff)
- programmers notepad (my personal stuff)
Expand All @@ -45,3 +45,16 @@
- install mingw32 to C:\MinGW
- collabnet svn client to C:\svn
- MSVC
- check that build_ext works only with --compiler:
- mingw32 fails because it's not on path
- MSVC fails because ENV vars are missing

- create buildbot user
- create own user/other devs
- setup .buildout
- c:\Documents and Settings\<username>\.buildout\default.cfg:

[buildout]
eggs-directory=c:\eggs

everyone, please SHARE c:\eggs, the disk is small
8 changes: 4 additions & 4 deletions src/zope/wineggbuilder/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,10 @@ Let's see:
build\temp.win32-2.5\Release\src\zope\proxy\_zope_proxy_proxy.o:_zope_proxy_proxy.c:(.text+0x3af): undefined reference to `_imp__PyUnicode_Type'
collect2: ld returned 1 exit status
error: command 'gcc' failed with exit status 1
DEBUG - Checking if build required for zope.proxy 3.4.2 py25_32
DEBUG - Build not required for zope.proxy 3.4.2 py25_32
DEBUG - Checking if build required for zope.proxy 3.4.2 py26_32
DEBUG - Build not required for zope.proxy 3.4.2 py26_32
DEBUG - Checking if build required for [zope.proxy_34_to_35] zope.proxy 3.4.2 py25_32
DEBUG - Build not required for [zope.proxy_34_to_35] zope.proxy 3.4.2 py25_32
DEBUG - Checking if build required for [zope.proxy_34_to_35] zope.proxy 3.4.2 py26_32
DEBUG - Build not required for [zope.proxy_34_to_35] zope.proxy 3.4.2 py26_32
INFO - Done.

Let's see what was executed on mocks:
Expand Down
39 changes: 19 additions & 20 deletions src/zope/wineggbuilder/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ def read(self, config):

def checkBuild(self, package, version, files):
"""check whether build is required"""
LOGGER.debug('Checking if build required for %s %s %s',
package.name, version, self.name)
LOGGER.debug('Checking if build required for [%s] %s %s %s',
package.sectionName, package.name, version, self.name)
needBuild = True
fe = self.fileEnding.lower()
for file in files:
Expand All @@ -57,34 +57,33 @@ def checkBuild(self, package, version, files):
break

if needBuild:
LOGGER.debug('Build required for %s %s %s',
package.name, version, self.name)
LOGGER.debug('Build required for [%s] %s %s %s',
package.sectionName, package.name, version, self.name)
else:
LOGGER.debug('Build not required for %s %s %s',
package.name, version, self.name)
LOGGER.debug('Build not required for [%s] %s %s %s',
package.sectionName, package.name, version, self.name)
return needBuild

def build(self, package, version, files, sourceFolder):
LOGGER.info('Starting build for %s %s %s',
package.name, version, self.name)
LOGGER.info('Starting build for [%s] %s %s %s',
package.sectionName, package.name, version, self.name)
#we really need to build
#we have the source in sourceFolder
cmd = self.commandKlass(cwd=sourceFolder, exitOnError=False)
command = self.command

if len(self.command.splitlines()) > 1:
if self.options.dryrun:
LOGGER.info("Dry run, no upload")
command = command.replace('upload', '')

LOGGER.debug('Running: %s\nIn: %s', command, sourceFolder)

if len(command.splitlines()) > 1:
#in case there are more lines we got to do .bat file
tmpfile = tempfile.NamedTemporaryFile(suffix='.bat')
command = tmpfile.name
tmpfile.write(self.command)
tmpfile.write(command)
tmpfile.file.flush()
else:
command = self.command

LOGGER.debug('Running: %s\nIn: %s', self.command, sourceFolder)

if self.options.dryrun:
LOGGER.info("Dry run, no compile and upload")
return
command = tmpfile.name

try:
#this ought to build and upload the egg
Expand Down Expand Up @@ -117,7 +116,7 @@ class Package(object):
svnKlass = base.SVN

def __init__(self, sectionName, config, options, compilers):
self.sectionNameName = sectionName
self.sectionName = sectionName
self.options = options
self.read(sectionName, config, compilers)

Expand Down

0 comments on commit 96ca679

Please sign in to comment.