diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-03-14 10:31:47 -0700 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-03-14 10:31:47 -0700 |
| commit | 992b58f2fffd49c6a7ff56a3106f3a4fcb0b02c9 (patch) | |
| tree | b07c7b34bb0666336ae2c66077eb6c2e76a37544 | |
| parent | fa33395a25c87115c910e8d4a4124aee6134062b (diff) | |
| download | scala-992b58f2fffd49c6a7ff56a3106f3a4fcb0b02c9.tar.gz scala-992b58f2fffd49c6a7ff56a3106f3a4fcb0b02c9.tar.bz2 scala-992b58f2fffd49c6a7ff56a3106f3a4fcb0b02c9.zip | |
Clarifications to src/asm/README
| -rw-r--r-- | src/asm/README | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/asm/README b/src/asm/README index 3ceac88098..e70911e17c 100644 --- a/src/asm/README +++ b/src/asm/README @@ -6,11 +6,16 @@ Git SVN repo: https://github.com/lrytz/asm 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 + - org/objectweb/asm/commons, but keep CodeSizeEvaluator.java - org/objectweb/asm/optimizer - org/objectweb/asm/xml @@ -27,4 +32,6 @@ Re-packaging and cosmetic changes: - remove trailing whitespace find src/asm/scala/tools/asm -name '*.java' | xargs sed -i '' -e 's/[ ]*$//' -Actual changes: check the git log for [asm-cherry-pick] after the previous upgrade. +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] |