From: <wda...@us...> - 2010-10-14 19:49:47
|
Revision: 6297 http://oorexx.svn.sourceforge.net/oorexx/?rev=6297&view=rev Author: wdashley Date: 2010-10-14 19:49:40 +0000 (Thu, 14 Oct 2010) Log Message: ----------- Some build machine website updates. Modified Paths: -------------- websites/build/trunk/docroot/build.html websites/build/trunk/docroot/builds/scripts/orxbuilddeb.rex websites/build/trunk/docroot/builds/scripts/orxbuildrpm.rex websites/build/trunk/docroot/downloads/index.html websites/build/trunk/docroot/index.html Modified: websites/build/trunk/docroot/build.html =================================================================== --- websites/build/trunk/docroot/build.html 2010-10-14 17:40:32 UTC (rev 6296) +++ websites/build/trunk/docroot/build.html 2010-10-14 19:49:40 UTC (rev 6297) @@ -95,15 +95,14 @@ <h2>Nightly ooRexx Builds</h2> <p>Builds of ooRexx and its associated components are performed nightly. They are available <a href="/downloads">here</a>.</p> - <p>Builds are only performed when the SourceForge Subversion repository changes from one - day to the next. If there have been no changes to the repository since the previous day - then the build will be skipped for that day.</p> <p>Currently ooRexx and its components are built on a variety of machine architectures and operating systems. Some of these machines are Linux KVM virtual machines and some are real machines. The real machines exist in a variety of locations and in most cases are only loaned to the ooRexx Project, thus they may come and go over time.</p> <p>Nightly builds are always performed from the SourceForge Subversion repository trunk for a - component (interpreter, docs, etc.). Beta and release builds are performed by hand by + component (interpreter, docs, etc.). When a major branch of the code is performed then + builds for that branch are also performed nightly. + Beta and release builds are performed by hand by the ooRexx Team members.</p> <br /> <br /> Modified: websites/build/trunk/docroot/builds/scripts/orxbuilddeb.rex =================================================================== --- websites/build/trunk/docroot/builds/scripts/orxbuilddeb.rex 2010-10-14 17:40:32 UTC (rev 6296) +++ websites/build/trunk/docroot/builds/scripts/orxbuilddeb.rex 2010-10-14 19:49:40 UTC (rev 6297) @@ -42,18 +42,8 @@ -- Initialization -build = .build~new() -build~homedir = '/home/'userid() -- always do first! -call localize build, build~homedir()'/orxbuildlocal.txt' -build~builddir = build~homedir'/buildorx' -build~targetdir = '/pub/www/build/docroot/builds/interpreter-main' -build~builddate = date('S') || '-' || changestr(':', time(), '') -build~statusfile = build~homedir() || '/' || build~builddate() || '-' || build~osname -build~lockfile = '/tmp/ooRexxBuild.lock' +build= .build~new('./orxbuild.local.properties', arg(1)~strip()) --- get the command line arguments -call parse_cmd_line arg(1)~strip(), build - -- Set our home directory call directory build~homedir @@ -76,8 +66,6 @@ /*----------------------------------------------------------------------------*/ ::class build public -::method init -return /*----------------------------------------------------------------------------*/ /* Attributes: */ @@ -109,12 +97,15 @@ savedir = directory() buildrpt = self~osname()'.'self~location()'.buildrpt.txt' -- create temp dir and checkout the source +'rm -rf' self~builddir() -- make sure the subdir is erased 'mkdir' self~builddir() +'svn co' self~src() self~builddir() call directory self~builddir() -'svn co' self~src() self~builddir svnver = self~getsvnrevision() -if \datatype(svnver, 'W') then do +if svnver = 'unknown' then do self~log('Subversion checkout failed.') + 'rm -rf' self~builddir() + 'rm' self~lockfile return end newdir = self~targetdir'/'svnver'/'self~osname @@ -137,22 +128,6 @@ return /*----------------------------------------------------------------------------*/ -/* Method: targetexist */ -/*----------------------------------------------------------------------------*/ - -::method targetexists -use strict arg userid, host, target -tempf = '/tmp/orxbuild.tmp' -'ssh' userid'@'host '"ls -l' target'" >' tempf -strm = .stream~new(tempf) -strm~open('read') -arr = strm~arrayin() -strm~close() -if arr~items() = 0 then return .false -if arr[1]~pos('cannot access') > 0 then return .false -return .true - -/*----------------------------------------------------------------------------*/ /* Method: log */ /*----------------------------------------------------------------------------*/ @@ -207,41 +182,35 @@ return /*----------------------------------------------------------------------------*/ -/* Routine: parse_cmd_line */ +/* Method: init */ /*----------------------------------------------------------------------------*/ -::routine parse_cmd_line -use strict arg cmdline, build +::method init +use strict arg propfile, cmdline +-- get the saved properties/attributes +prop = .properties~load(propfile) +self~osname = prop['osname'] +self~homedir = prop['homedir'] +self~builddir = prop['builddir'] +self~targetdir = prop['targetdir'] +self~lockfile = prop['lockfile'] +-- get the unsaves attributes +self~builddate = date('S') || '-' || changestr(':', time(), '') +self~statusfile = self~homedir() || '/' || self~builddate() || '-' || self~osname +-- get the comman line options argc = cmdline~words() -if argc > 0 then build~location = cmdline~word(1) -else build~location = 'trunk' +if argc > 0 then self~location = cmdline~word(1) +else self~location = 'trunk' select - when build~location = 'branch' then do - build~src = 'http://oorexx.svn.sourceforge.net/svnroot/oorexx/main/branches/4.1.0/trunk/' - build~location = 'branch4.1.0' + when self~location = 'branch' then do + self~src = prop['branchsrc'] + self~location = 'branch4.1.0' end otherwise do - build~src = 'http://oorexx.svn.sourceforge.net/svnroot/oorexx/main/trunk/' + self~src = prop['trunksrc'] end end -if argc > 1 then build~email = cmdline~word(2) -else build~email = '' --- just ignore everything else on the cmdline +if argc > 1 then self~email = cmdline~word(2) +else self~email = '' return -/*----------------------------------------------------------------------------*/ -/* Routine: localize */ -/*----------------------------------------------------------------------------*/ - -::routine localize --- set the osname and possibly other build object attributes -use strict arg build, ifile -strm = .stream~new(ifile) -strm~open('read') -arr = strm~arrayin() -strm~close() -do line over arr - interpret line - end -return - Modified: websites/build/trunk/docroot/builds/scripts/orxbuildrpm.rex =================================================================== --- websites/build/trunk/docroot/builds/scripts/orxbuildrpm.rex 2010-10-14 17:40:32 UTC (rev 6296) +++ websites/build/trunk/docroot/builds/scripts/orxbuildrpm.rex 2010-10-14 19:49:40 UTC (rev 6297) @@ -42,21 +42,8 @@ -- Initialization -build = .build~new() -build~homedir = '/home/'userid() -- always do first! -call localize build, build~homedir()'/orxbuildlocal.txt' +build = .build~new('./orxbuild.local.properties', arg(1)~strip()) -build~builddir = build~homedir'/buildorx' --- build~builddir = '/data/buildorx' -- value for oorexx.osdl.marist.edu - -build~targetdir = '/pub/www/build/docroot/builds/interpreter-main' -build~builddate = date('S') || '-' || changestr(':', time(), '') -build~statusfile = build~homedir() || '/' || build~builddate() || '-' || build~osname -build~lockfile = '/tmp/ooRexxBuild.lock' - --- get the command line arguments -call parse_cmd_line arg(1)~strip(), build - -- Move to our home directory call directory build~homedir @@ -78,8 +65,6 @@ /*----------------------------------------------------------------------------*/ ::class build public -::method init -return /*----------------------------------------------------------------------------*/ /* Attributes: */ @@ -110,14 +95,15 @@ buildrpt = self~osname()'.'self~location()'.buildrpt.txt' savedir = directory() -- create temp dir and checkout the source -'rm -rf' self~builddir -- make sure the subdir is erased -'mkdir' self~builddir -'svn co' self~src() self~builddir -call directory self~builddir --- see if we have already built this revision +'rm -rf' self~builddir() -- make sure the subdir is erased +'mkdir' self~builddir() +'svn co' self~src() self~builddir() +call directory self~builddir() svnver = self~getsvnrevision() -if \datatype(svnver, 'W') then do +if svnver = 'unknown' then do self~log('Subversion checkout failed.') + 'rm -rf' self~builddir + 'rm' self~lockfile return end newdir = self~targetdir'/'svnver'/'self~osname @@ -147,29 +133,11 @@ self~log('The build is located at http://build.oorexx.org/builds/interpreter-main/'svnver'/'self~osname) -- remove everything call directory savedir -'rm -rf' self~builddir self~log('Finished build.') 'rm' self~lockfile return - /*----------------------------------------------------------------------------*/ -/* Method: targetexist */ -/*----------------------------------------------------------------------------*/ - -::method targetexists -use strict arg userid, host, target -tempf = '/tmp/orxbuild.tmp' -'ssh' userid'@'host '"ls -l' target'" >' tempf -strm = .stream~new(tempf) -strm~open('read') -arr = strm~arrayin() -strm~close() -if arr~items() = 0 then return .false -if arr[1]~pos('cannot access') > 0 then return .false -return .true - -/*----------------------------------------------------------------------------*/ /* Method: log */ /*----------------------------------------------------------------------------*/ @@ -224,41 +192,35 @@ return /*----------------------------------------------------------------------------*/ -/* Routine: parse_cmd_line */ +/* Method: init */ /*----------------------------------------------------------------------------*/ -::routine parse_cmd_line -use strict arg cmdline, build +::method init +use strict arg propfile, cmdline +-- get the saved properties/attributes +prop = .properties~load(propfile) +self~osname = prop['osname'] +self~homedir = prop['homedir'] +self~builddir = prop['builddir'] +self~targetdir = prop['targetdir'] +self~lockfile = prop['lockfile'] +-- get the unsaves attributes +self~builddate = date('S') || '-' || changestr(':', time(), '') +self~statusfile = self~homedir() || '/' || self~builddate() || '-' || self~osname +-- get the comman line options argc = cmdline~words() -if argc > 0 then build~location = cmdline~word(1) -else build~location = 'trunk' +if argc > 0 then self~location = cmdline~word(1) +else self~location = 'trunk' select - when build~location = 'branch' then do - build~src = 'http://oorexx.svn.sourceforge.net/svnroot/oorexx/main/branches/4.1.0/trunk/' - build~location = 'branch4.1.0' + when self~location = 'branch' then do + self~src = prop['branchsrc'] + self~location = 'branch4.1.0' end otherwise do - build~src = 'http://oorexx.svn.sourceforge.net/svnroot/oorexx/main/trunk/' + self~src = prop['trunksrc'] end end -if argc > 1 then build~email = cmdline~word(2) -else build~email = '' --- just ignore everything else on the cmdline +if argc > 1 then self~email = cmdline~word(2) +else self~email = '' return -/*----------------------------------------------------------------------------*/ -/* Routine: localize */ -/*----------------------------------------------------------------------------*/ - -::routine localize --- set the osname and possibly other build object attributes -use strict arg build, ifile -strm = .stream~new(ifile) -strm~open('read') -arr = strm~arrayin() -strm~close() -do line over arr - interpret line - end -return - Modified: websites/build/trunk/docroot/downloads/index.html =================================================================== --- websites/build/trunk/docroot/downloads/index.html 2010-10-14 17:40:32 UTC (rev 6296) +++ websites/build/trunk/docroot/downloads/index.html 2010-10-14 19:49:40 UTC (rev 6297) @@ -91,39 +91,33 @@ </div> <h2>Welcome</h2> - <p>Files available on the Build Machine fall into one of several categories. - They are:</p> + <p>Builds can be fount here.</p> + <p><a href="/builds/">ooRexx build outputs</a></p> + <p>When an automated build of ooRexx is performed on this server the + outputs from that build are placed in the following output structure:</p> <dl> - <dt><a href="/builds/">ooRexx build outputs</a></dt> - <dd><p>When an automated build of ooRexx is performed on this server the - outputs from that build are placed here. - The outputs subdirectory has the following structure:</p> - <dl> - <dt>docs/</dt> - <dd><p>The documentation builds are stored here. They are indexed by - the Subversion revision number.</p></dd> - <dt>interpreter-main/</dt> - <dd><p>The install file builds are stored here. They are indexed by - the Subversion revision number.</p></dd> - <dt>release_candidates/</dt> - <dd><p>The release candidates for the next major version of ooRexx - are stored here. Most of the time this subdirectory is empty.</p></dd> - <dt>scripts/</dt> - <dd><p>The build scripts for each platform are stored here. This is just - a place to store them for easy access by each platform.</p></dd> - <dt>status/</dt> - <dd><p>The status reports for each build are placed here. The status - report name reflects the date and platform.</p></dd> - </dl> - </dd> - <dt><a href="./support.html">Support files</a></dt> - <dd>Support files for accessing this server.</dd> + <dt>docs/</dt> + <dd><p>The documentation builds are stored here. They are indexed by + the Subversion revision number.</p></dd> + <dt>interpreter-main/</dt> + <dd><p>The install file builds are stored here. They are indexed by + the Subversion revision number.</p></dd> + <dt>release_candidates/</dt> + <dd><p>The release candidates for the next major version of ooRexx + are stored here. Most of the time this subdirectory is empty.</p></dd> + <dt>scripts/</dt> + <dd><p>The build scripts for each platform are stored here. This is just + a place to store them for easy access by each platform.</p></dd> + <dt>status/</dt> + <dd><p>The status reports for each build are placed here. The status + report name reflects the timestamp and platform of the build.</p></dd> </dl> <br /> <br /> <br /> <br /> <br /> + <br /> </div> <!--column-middle--> <!-- ###### body content end ###### --> Modified: websites/build/trunk/docroot/index.html =================================================================== --- websites/build/trunk/docroot/index.html 2010-10-14 17:40:32 UTC (rev 6296) +++ websites/build/trunk/docroot/index.html 2010-10-14 19:49:40 UTC (rev 6297) @@ -92,9 +92,9 @@ <h2>Welcome</h2> <p>Welcome to the <a href="http://www.oorexx.org/">Open Object Rexx Project</a> - build machine. This machine will allow you to build the current Subversion + build machine. This machine hosts the nightly Subversion Revision of ooRexx using an automated system hosted on this web site.</p> - <p>The Build Machine is hosted using Fedora 12 with Linux KVM running a number of + <p>The Build Machine is hosted using Fedora with Linux KVM running a number of virtual machine guest operating systems which will be used to perform the actual builds.</p> <p>The button to the left labeled <b>Build ooRexx</b> will take you to This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wda...@us...> - 2010-10-14 20:05:19
|
Revision: 6298 http://oorexx.svn.sourceforge.net/oorexx/?rev=6298&view=rev Author: wdashley Date: 2010-10-14 20:05:13 +0000 (Thu, 14 Oct 2010) Log Message: ----------- More updates to the build machine web pages. Modified Paths: -------------- websites/build/trunk/docroot/build.html websites/build/trunk/docroot/downloads/index.html websites/build/trunk/docroot/downloads/support.html websites/build/trunk/docroot/index.html Modified: websites/build/trunk/docroot/build.html =================================================================== --- websites/build/trunk/docroot/build.html 2010-10-14 19:49:40 UTC (rev 6297) +++ websites/build/trunk/docroot/build.html 2010-10-14 20:05:13 UTC (rev 6298) @@ -59,7 +59,7 @@ </div> <div style="padding:10px 0px 0px 0px;line-height:22px;"> <a href="/downloads/"><b>.</b></b> Downloads</a> - <a href="/build.html"><b>.</b></b> Build ooRexx</a> + <a href="/build.html"><b>.</b></b>ooRexx Build Info</a> </div> <br /> <div class="centered"> Modified: websites/build/trunk/docroot/downloads/index.html =================================================================== --- websites/build/trunk/docroot/downloads/index.html 2010-10-14 19:49:40 UTC (rev 6297) +++ websites/build/trunk/docroot/downloads/index.html 2010-10-14 20:05:13 UTC (rev 6298) @@ -57,7 +57,7 @@ </div> <div style="padding:10px 0px 0px 0px;line-height:22px;"> <a href="/downloads/"><b>.</b></b> Downloads</a> - <a href="/build.html"><b>.</b></b> Build ooRexx</a> + <a href="/build.html"><b>.</b></b>ooRexx Build Info</a> </div> <br /> <div class="centered"> @@ -91,7 +91,7 @@ </div> <h2>Welcome</h2> - <p>Builds can be fount here.</p> + <p>Builds can be found here.</p> <p><a href="/builds/">ooRexx build outputs</a></p> <p>When an automated build of ooRexx is performed on this server the outputs from that build are placed in the following output structure:</p> @@ -101,7 +101,8 @@ the Subversion revision number.</p></dd> <dt>interpreter-main/</dt> <dd><p>The install file builds are stored here. They are indexed by - the Subversion revision number.</p></dd> + the Subversion revision number. Both trunk and possibly branch builds + are both placed here with different version numbers.</p></dd> <dt>release_candidates/</dt> <dd><p>The release candidates for the next major version of ooRexx are stored here. Most of the time this subdirectory is empty.</p></dd> Modified: websites/build/trunk/docroot/downloads/support.html =================================================================== --- websites/build/trunk/docroot/downloads/support.html 2010-10-14 19:49:40 UTC (rev 6297) +++ websites/build/trunk/docroot/downloads/support.html 2010-10-14 20:05:13 UTC (rev 6298) @@ -57,7 +57,7 @@ </div> <div style="padding:10px 0px 0px 0px;line-height:22px;"> <a href="/downloads/"><b>.</b></b> Downloads</a> - <a href="/build.html"><b>.</b></b> Build ooRexx</a> + <a href="/build.html"><b>.</b></b>ooRexx Build Info</a> </div> <br /> <div class="centered"> Modified: websites/build/trunk/docroot/index.html =================================================================== --- websites/build/trunk/docroot/index.html 2010-10-14 19:49:40 UTC (rev 6297) +++ websites/build/trunk/docroot/index.html 2010-10-14 20:05:13 UTC (rev 6298) @@ -56,8 +56,8 @@ project links </div> <div style="padding:10px 0px 0px 0px;line-height:22px;"> - <a href="/downloads/"><b>.</b></b> Downloads</a> - <a href="/build.html"><b>.</b></b> Build ooRexx</a> + <a href="/downloads/"><b>.</b></b>Downloads</a> + <a href="/build.html"><b>.</b></b>ooRexx Build Info</a> </div> <br /> <div class="centered"> @@ -93,12 +93,12 @@ <h2>Welcome</h2> <p>Welcome to the <a href="http://www.oorexx.org/">Open Object Rexx Project</a> build machine. This machine hosts the nightly Subversion - Revision of ooRexx using an automated system hosted on this web site.</p> + Revision builds of ooRexx using an automated system hosted on this web site.</p> <p>The Build Machine is hosted using Fedora with Linux KVM running a number of - virtual machine guest operating systems which will be used to perform + virtual machine guest operating systems which are used to perform the actual builds.</p> - <p>The button to the left labeled <b>Build ooRexx</b> will take you to - the selection page for building the ooRexx packages.</p> + <p>The button to the left labeled <b>Downloads</b> will take you to + the selection page for obtaining all the available ooRexx packages.</p> <br /> <br /> <br /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |