[Swift-devel] branching for stabilization of release .95

[Sarah Kenny]

still getting some complaints from the compiler on the merged files:

compile:
     [echo] [swift]: COMPILE
    [javac] Compiling 374 source files to
/home/skenny/builds/cog/modules/swift/build
    [javac]
/home/skenny/builds/cog/modules/swift/src/org/griphyn/vdl/mapping/AbstractDataNode.java:557:
closeArraySizes() is already defined in
org.griphyn.vdl.mapping.AbstractDataNode
    [javac]     public void closeArraySizes() {
    [javac]                 ^
    [javac] Note: Some input files use unchecked or unsafe operations.
    [javac] Note: Recompile with -Xlint:unchecked for details.
    [javac] 1 error

BUILD FAILED


On Mon, Jan 3, 2011 at 1:37 PM, Mihael Hategan <hategan at mcs.anl.gov> wrote:

> Should be fixed in cog trunk/2990.
>
> On Mon, 2011-01-03 at 04:35 -0600, Mihael Hategan wrote:
> > I'll fix that tomorrow. Actually that's later today.
> >
> > Mihael
> >
> > On Sun, 2011-01-02 at 20:23 -0800, Sarah Kenny wrote:
> > > sorry, forgot where we landed on the naming...as long as it's
> > > somewhere btwn .91 and 1.0 we should be all right :) but yeah, i can
> > > branch the release as .92. however, i just checked out trunk and am
> > > getting some errors compiling:
> > >
> > > compile:
> > >      [echo] [provider-coaster]: COMPILE
> > >     [javac] Compiling 124 source files
> > > to /home/skenny/builds/cog/modules/provider-coaster/build
> > >
> > > [javac]
> /home/skenny/builds/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/Cpu.java:242:
> illegal start of type
> > >     [javac]             if (shutdown) {
> > >     [javac]             ^
> > >
> > > [javac]
> /home/skenny/builds/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/Cpu.java:242:
> ';' expected
> > >     [javac]             if (shutdown) {
> > >     [javac]               ^
> > >
> > > [javac]
> /home/skenny/builds/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/Cpu.java:242:
> not a statement
> > >     [javac]             if (shutdown) {
> > >     [javac]                 ^
> > >
> > > [javac]
> /home/skenny/builds/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/Cpu.java:242:
> ';' expected
> > >     [javac]             if (shutdown) {
> > >     [javac]                         ^
> > >     [javac] 4 errors
> > >
> > >
> > > p.s. happy new year to you too!
> > >
> > >
> > >
> > > On Sun, Jan 2, 2011 at 5:20 PM, Michael Wilde <wilde at mcs.anl.gov>
> > > wrote:
> > >         Indeed - that was the "great" part :)
> > >         I was just asking so we that we get the release number right
> > >         when we create the release branch.
> > >
> > >         - Mike
> > >
> > >
> > >
> > >         ----- Original Message -----
> > >         > On Sun, 2011-01-02 at 16:46 -0600, Michael Wilde wrote:
> > >         > > Happy New Year, All!
> > >         >
> > >         > And to you, too!
> > >         > >
> > >         > > This sounds great, but wasn't the plan to call the current
> > >         stable
> > >         > > branch 0.91 and the current trunk 0.92?
> > >         >
> > >         > Irrespective of that, bug fixes from the branch should be
> > >         merged to
> > >         > trunk. And better to do so before trunk is branched into
> > >         another
> > >         > release
> > >         > branch.
> > >         >
> > >         > Mihael
> > >
> > >
> > >
> > >         --
> > >         Michael Wilde
> > >         Computation Institute, University of Chicago
> > >         Mathematics and Computer Science Division
> > >         Argonne National Laboratory
> > >
> > >
> > >
> >
> >
> > _______________________________________________
> > Swift-devel mailing list
> > Swift-devel at ci.uchicago.edu
> > http://mail.ci.uchicago.edu/mailman/listinfo/swift-devel
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/swift-devel/attachments/20110103/d5c28339/attachment.html>