diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-05-12 17:36:04 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-05-12 17:36:04 +0200 |
commit | d253702f9f23186cbf95f611c2fd1a2d08330ad6 (patch) | |
tree | 9cd6198413ef8ea5e885559e4f3230373821c00c /src/asm/README | |
parent | 819a559173c65ccf80a856ef46bc8f1d5996740a (diff) | |
parent | 297eeb335cbc50be9107d3f49cc7eb0487514ca7 (diff) | |
download | scala-d253702f9f23186cbf95f611c2fd1a2d08330ad6.tar.gz scala-d253702f9f23186cbf95f611c2fd1a2d08330ad6.tar.bz2 scala-d253702f9f23186cbf95f611c2fd1a2d08330ad6.zip |
Merge commit '297eeb3' into merge-2.11-may-12
Diffstat (limited to 'src/asm/README')
-rw-r--r-- | src/asm/README | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/src/asm/README b/src/asm/README deleted file mode 100644 index 58d555acde..0000000000 --- a/src/asm/README +++ /dev/null @@ -1,37 +0,0 @@ -Version 5.0.3, SVN r1748, tags/ASM_5_0_3 - -Git SVN repo: https://github.com/lrytz/asm - - git svn howto: https://github.com/lrytz/asm/issues/1 - -Upgrading ASM -------------- - -Check the commit history of src/asm: https://github.com/scala/scala/commits/2.11.x/src/asm. -Find the previous commit that upgraded ASM and take a look at its commit message. It should -be a squashed version of a pull request that shows the precise procedure how the last upgrade -was made. - -Start by deleting all source files in src/asm/ and copy the ones from the latest ASM release. - -Excluded Files (don't copy): - - package.html files - - org/objectweb/asm/commons, but keep CodeSizeEvaluator.java - - org/objectweb/asm/optimizer - - org/objectweb/asm/xml - -Re-packaging and cosmetic changes: - - convert line endings (there are some CRLF) - find src/asm/scala/tools/asm -name '*.java' | xargs dos2unix - - change package clauses - find src/asm/scala/tools/asm -name '*.java' | xargs sed -i '' -e 's/package org\.objectweb\.asm/package scala.tools.asm/' - - update imports - find src/asm/scala/tools/asm -name '*.java' | xargs sed -i '' -e 's/import org\.objectweb\.asm/import scala.tools.asm/' - - update @links, @associates - find src/asm/scala/tools/asm -name '*.java' | xargs sed -i '' -e 's/@link org\.objectweb\.asm/@link scala.tools.asm/' - find src/asm/scala/tools/asm -name '*.java' | xargs sed -i '' -e 's/@associates org\.objectweb\.asm/@associates scala.tools.asm/' - - remove trailing whitespace - find src/asm/scala/tools/asm -name '*.java' | xargs sed -i '' -e 's/[ ]*$//' - -Include the actual changes that we have in our repostiory - - Include the commits labelled [asm-cherry-pick] in the non-squashed PR of the previous upgrade - - Include the changes that were added to src/asm since the last upgrade and label them [asm-cherry-pick] |