Details

    • Number of attachments :
      2

      Description

      This is fairly trivial except RVM-443, that hasn't been taken on by Classpath yet, fails to cleanly apply its associated patch in 2 places.

      1. classpath-from-git.patch
        975 kB
        Andreas Sewe
      2. upgrade-to-classpath-0.99.patch
        1.00 MB
        Andreas Sewe

        Issue Links

          Activity

          Hide
          David Grove added a comment -

          (1) we should go ahead and hg rm obsolete patches
          (2) Makes sense. components/classpath-git or something like that?
          (3) Yep. Once RVM-781 gets solved it makes sense to move to the newer version.

          Show
          David Grove added a comment - (1) we should go ahead and hg rm obsolete patches (2) Makes sense. components/classpath-git or something like that? (3) Yep. Once RVM-781 gets solved it makes sense to move to the newer version.
          Hide
          Andreas Sewe added a comment -

          OK, I've addressed issues (1) and (2); obsolete patches have been removed and the head is now kept in components/classpath/HEADp${classpath.patchlevel}.

          You can review the changes I made on Bitbucket: https://bitbucket.org/sewe/jikesrvm/changesets/tip/..bookmark%28%22rvm-773%22%29. To retrieve and merge the changes, simply pull from https://bitbucket.org/sewe/jikesrvm.

          Show
          Andreas Sewe added a comment - OK, I've addressed issues (1) and (2); obsolete patches have been removed and the head is now kept in components/classpath/HEADp${classpath.patchlevel }. You can review the changes I made on Bitbucket: https://bitbucket.org/sewe/jikesrvm/changesets/tip/..bookmark%28%22rvm-773%22%29 . To retrieve and merge the changes, simply pull from https://bitbucket.org/sewe/jikesrvm .
          Hide
          David Grove added a comment -

          I pulled changeset 7f209dcb71a0 into the main repository. The other two changesets (c5ec6e31d8e2 and 47362bbbdcf8) caused problems for me. "c5" caused the patches to not all apply cleanly (some of them are built on top of others I think) and "47" caused classpath to be rebuilt from scratch everytime I built jikesrvm (something went wrong with the check to see if classpath was already built). I didn't look into either failure very deeply, so they might be not that hard to fix.

          Show
          David Grove added a comment - I pulled changeset 7f209dcb71a0 into the main repository. The other two changesets (c5ec6e31d8e2 and 47362bbbdcf8) caused problems for me. "c5" caused the patches to not all apply cleanly (some of them are built on top of others I think) and "47" caused classpath to be rebuilt from scratch everytime I built jikesrvm (something went wrong with the check to see if classpath was already built). I didn't look into either failure very deeply, so they might be not that hard to fix.
          Hide
          Andreas Sewe added a comment -

          Hm, c5ec6e31d8e2 not applying the patches cleanly is odd; it works on my machine (both with -Dclasspath.from-web=true and -Dclasspath.from-git=true, albeit in a few cases only with adjusting offsets and/or fuzz:

              [patch] patching file java/lang/reflect/Constructor.java
              [patch] patching file java/lang/reflect/Field.java
              [patch] Hunk #9 succeeded at 416 (offset 1 line).
              [patch] patching file java/lang/reflect/Method.java
              [patch] patching file vm/reference/java/lang/reflect/VMConstructor.java
              [patch] patching file vm/reference/java/lang/reflect/VMField.java
              [patch] patching file vm/reference/java/lang/reflect/VMMethod.java
              [patch] patching file java/util/ArrayList.java
              [patch] patching file java/util/Vector.java
              [patch] Hunk #1 succeeded at 903 (offset -6 lines).
              [patch] Hunk #2 succeeded at 918 (offset -6 lines).
              [patch] patching file gnu/xml/transform/ParameterNode.java
              [patch] patching file gnu/xml/transform/Stylesheet.java
              [patch] patching file gnu/xml/transform/Template.java
              [patch] patching file gnu/xml/transform/TemplatesImpl.java
              [patch] patching file gnu/xml/transform/CallTemplateNode.java
              [patch] patching file gnu/xml/transform/Stylesheet.java
              [patch] Hunk #1 succeeded at 1690 (offset 10 lines).
              [patch] patching file gnu/xml/transform/ForEachNode.java
              [patch] patching file gnu/xml/transform/SortKey.java
              [patch] patching file gnu/xml/transform/Stylesheet.java
              [patch] Hunk #1 succeeded at 1654 with fuzz 1 (offset 10 lines).
              [patch] patching file gnu/xml/transform/TemplateNode.java
              [patch] patching file gnu/xml/dom/DomAttr.java
              [patch] patching file gnu/xml/dom/DomDocument.java
              [patch] patching file gnu/xml/dom/DomElement.java
              [patch] patching file gnu/xml/dom/DomNsNode.java
              [patch] patching file gnu/xml/dom/ls/DomLSParser.java
              [patch] patching file gnu/xml/dom/ls/SAXEventSink.java
              [patch] patching file gnu/xml/transform/XSLURIResolver.java
          

          Maybe your patch (using GNU patch 2.6 here) is more strict about these things.

          Please test with changeset ad12193c405e at https://bitbucket.org/sewe/jikesrvm/changeset/ad12193c405e; I tweaked the patches such that the apply without fuzz now.

          Show
          Andreas Sewe added a comment - Hm, c5ec6e31d8e2 not applying the patches cleanly is odd; it works on my machine (both with -Dclasspath.from-web=true and -Dclasspath.from-git=true , albeit in a few cases only with adjusting offsets and/or fuzz: [patch] patching file java/lang/reflect/Constructor.java [patch] patching file java/lang/reflect/Field.java [patch] Hunk #9 succeeded at 416 (offset 1 line). [patch] patching file java/lang/reflect/Method.java [patch] patching file vm/reference/java/lang/reflect/VMConstructor.java [patch] patching file vm/reference/java/lang/reflect/VMField.java [patch] patching file vm/reference/java/lang/reflect/VMMethod.java [patch] patching file java/util/ArrayList.java [patch] patching file java/util/Vector.java [patch] Hunk #1 succeeded at 903 (offset -6 lines). [patch] Hunk #2 succeeded at 918 (offset -6 lines). [patch] patching file gnu/xml/transform/ParameterNode.java [patch] patching file gnu/xml/transform/Stylesheet.java [patch] patching file gnu/xml/transform/Template.java [patch] patching file gnu/xml/transform/TemplatesImpl.java [patch] patching file gnu/xml/transform/CallTemplateNode.java [patch] patching file gnu/xml/transform/Stylesheet.java [patch] Hunk #1 succeeded at 1690 (offset 10 lines). [patch] patching file gnu/xml/transform/ForEachNode.java [patch] patching file gnu/xml/transform/SortKey.java [patch] patching file gnu/xml/transform/Stylesheet.java [patch] Hunk #1 succeeded at 1654 with fuzz 1 (offset 10 lines). [patch] patching file gnu/xml/transform/TemplateNode.java [patch] patching file gnu/xml/dom/DomAttr.java [patch] patching file gnu/xml/dom/DomDocument.java [patch] patching file gnu/xml/dom/DomElement.java [patch] patching file gnu/xml/dom/DomNsNode.java [patch] patching file gnu/xml/dom/ls/DomLSParser.java [patch] patching file gnu/xml/dom/ls/SAXEventSink.java [patch] patching file gnu/xml/transform/XSLURIResolver.java Maybe your patch (using GNU patch 2.6 here) is more strict about these things. Please test with changeset ad12193c405e at https://bitbucket.org/sewe/jikesrvm/changeset/ad12193c405e ; I tweaked the patches such that the apply without fuzz now.
          Hide
          David Grove added a comment -

          bulk defer to 3.1.4

          Show
          David Grove added a comment - bulk defer to 3.1.4

            People

            • Assignee:
              Unassigned
              Reporter:
              Ian Rogers
            • Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

              • Created:
                Updated: