Looks good to me, please commit! Maybe make one change, replacing if builder.endswith('win64_scons_vc2012') or builder.endswith('win32_scons_vc2012'): by: if builder.endswith('vc2012'):
On Mon, Jun 17, 2013 at 10:06 PM, Jürgen Herrmann <shadow...@me.com> wrote: > Ok, > > i am tired, postet the wrong version oft he patch :( > > The porper versin is here: > > http://www.pasteall.org/43250 > > I'll go to bed now ^_^ > The build bot is tested locally and can be started as soon as scons is > patched ;) > > -----Ursprüngliche Nachricht----- > Von: bf-committers-boun...@blender.org > [mailto:bf-committers-boun...@blender.org] Im Auftrag von Jürgen Herrmann > Gesendet: Montag, 17. Juni 2013 21:46 > An: 'bf-blender developers' > Betreff: Re: [Bf-committers] Buildbot setup for MSVC 2012 testbuilds > > Alright, this little problem bugged me, so I fixed it! > > I got rid of the second config file and found a way to detect the used MSVC > Version within the config. > > Patch for scons and buildbot attached ;) > > http://www.pasteall.org/43249 > > > > -----Ursprüngliche Nachricht----- > Von: bf-committers-boun...@blender.org > [mailto:bf-committers-boun...@blender.org] Im Auftrag von Jürgen Herrmann > Gesendet: Montag, 17. Juni 2013 20:14 > An: 'bf-blender developers' > Betreff: Re: [Bf-committers] Buildbot setup for MSVC 2012 testbuilds > > Hi again, > > i prepared buildbot and scons fort he buildbot builds. > Now buildbot will create a package named > > blender-VERSION-REVISION-PLATFORM-vc11.zip > > for VC 2012 builds. > Compiling and Packaging works well now, I'll try to start the Buildbot for > x64 as soon as the patch is approved and commited ;) > X86 will follow after that. > > /Jürgen > > -----Ursprüngliche Nachricht----- > Von: bf-committers-boun...@blender.org > [mailto:bf-committers-boun...@blender.org] Im Auftrag von Jürgen Herrmann > Gesendet: Montag, 17. Juni 2013 19:16 > An: 'bf-blender developers' > Betreff: Re: [Bf-committers] Buildbot setup for MSVC 2012 testbuilds > > Hi Brecht, > > I tried that by usingf > if env['MSVC_VERSION'] == '11.0': > > But it seems that "env" is not present in the scope of this config file, it > always fails :( > > The MacOSX config file uses system commands to determine their versions, but > this is quite hard for windows. > > /Jürgen > > -----Ursprüngliche Nachricht----- > Von: bf-committers-boun...@blender.org > [mailto:bf-committers-boun...@blender.org] Im Auftrag von Brecht Van Lommel > Gesendet: Montag, 17. Juni 2013 19:12 > An: bf-blender developers > Betreff: Re: [Bf-committers] Buildbot setup for MSVC 2012 testbuilds > > It looks good to me, except that perhaps we can avoid copying the config > file. Can we add if/else in the win64-vc-config.py based on the MSVS > version? It's only 4 lines or so that are actually different. > > Brecht. > > On Mon, Jun 17, 2013 at 6:43 PM, Jürgen Herrmann <shadow...@me.com> wrote: >> Sorry, my fault ... getting tired ;) >> >> http://www.pasteall.org/43245 >> >> >> >> -----Ursprüngliche Nachricht----- >> Von: bf-committers-boun...@blender.org >> [mailto:bf-committers-boun...@blender.org] Im Auftrag von Thomas >> Dinges >> Gesendet: Montag, 17. Juni 2013 18:39 >> An: bf-blender developers >> Betreff: Re: [Bf-committers] Buildbot setup for MSVC 2012 testbuilds >> >> Hi Jürgen, >> the patch didn't get attached, maybe upload it to pasteall.org. >> >> Thanks, >> Thomas >> >> Am 17.06.2013 18:37, schrieb Jürgen Herrmann: >>> Hi Brecht and Thomas, >>> >>> I attached my patch for SCons. >>> I tested this with VC 2008 and 2012 and MinGW64. >>> I don't have other systems to test right now :/ It works quite well >>> though this is a little hacky because I don't get into the internals >>> of >> SCons that good. >>> I set it to default to MSVC 2008 so >>> - calling "py scons/scons.py" will build with MSVC2008 >>> - calling "py scons\scons.py MSVS_VERSION=11.0" will build with VS >>> 2012 >>> - calling "py scons/scons.py BF_TOOLSET=mingw" builds MinGW as usual. >>> >>> Could you two have a look at this please, I bet you'll have some >>> ideas how >> to make it better. >>> >>> /Jürgen >>> >>> -----Ursprüngliche Nachricht----- >>> Von: bf-committers-boun...@blender.org >>> [mailto:bf-committers-boun...@blender.org] Im Auftrag von Jürgen >>> Herrmann >>> Gesendet: Montag, 17. Juni 2013 14:50 >>> An: bf-blender developers >>> Betreff: Re: [Bf-committers] Buildbot setup for MSVC 2012 testbuilds >>> >>> Thanks Brecht ;) >>> I'll try to get this running this evening. >>> I'll still have to look into scons build. >>> I got it to work by querying env['MSVS_VERSION'] which is >>> automatically >> set to 11.0 when vs2012 is installed. >>> But I'll have to test in another machine without VS2012 and with >>> VS2008 if >> it doesn't break things. >>> And with MinGW... >>> After that test I'll commit the scons changes and set up the buildbot >>> ;) >>> >>> /Jürgen >>> >>> Am 17.06.2013 um 14:23 schrieb Brecht Van Lommel >> <brechtvanlom...@pandora.be>: >>> >>>> I've sent you a mail with all the details. >>>> >>>> On Sun, Jun 16, 2013 at 3:45 PM, Jürgen Herrmann <shadow...@me.com> >> wrote: >>>>> Hi there, >>>>> >>>>> >>>>> >>>>> as I have scons working with MSVC2012 now, I'd like to set up a >>>>> buildbot for testbuilds. >>>>> >>>>> I found the documentation on this in the wiki. >>>>> >>>>> It seems that I need a buildbot name and password, who is willing >>>>> to provide me these? :D >>>>> >>>>> >>>>> >>>>> /Jürgen >>>>> >>>>> _______________________________________________ >>>>> Bf-committers mailing list >>>>> Bf-committers@blender.org >>>>> http://lists.blender.org/mailman/listinfo/bf-committers >>>> _______________________________________________ >>>> Bf-committers mailing list >>>> Bf-committers@blender.org >>>> http://lists.blender.org/mailman/listinfo/bf-committers >>> _______________________________________________ >>> Bf-committers mailing list >>> Bf-committers@blender.org >>> http://lists.blender.org/mailman/listinfo/bf-committers >>> >>> >>> _______________________________________________ >>> Bf-committers mailing list >>> Bf-committers@blender.org >>> http://lists.blender.org/mailman/listinfo/bf-committers >> >> >> -- >> Thomas Dinges >> Blender Developer, Artist and Musician >> >> www.dingto.org >> >> _______________________________________________ >> Bf-committers mailing list >> Bf-committers@blender.org >> http://lists.blender.org/mailman/listinfo/bf-committers >> >> _______________________________________________ >> Bf-committers mailing list >> Bf-committers@blender.org >> http://lists.blender.org/mailman/listinfo/bf-committers >> > _______________________________________________ > Bf-committers mailing list > Bf-committers@blender.org > http://lists.blender.org/mailman/listinfo/bf-committers > > _______________________________________________ > Bf-committers mailing list > Bf-committers@blender.org > http://lists.blender.org/mailman/listinfo/bf-committers > > _______________________________________________ > Bf-committers mailing list > Bf-committers@blender.org > http://lists.blender.org/mailman/listinfo/bf-committers > > _______________________________________________ > Bf-committers mailing list > Bf-committers@blender.org > http://lists.blender.org/mailman/listinfo/bf-committers _______________________________________________ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers