|
Applied the part of the patch that fixed the enum name use.
Had trouble applying all the portions of the patch related to the build.xml files. Managed to patch most of the build.xml files, but then my build seemed to fail because, derby.compile.source and derby.compile.target were not set. Might need to ensure these are set by default otherwise applying this patch will break everyone's build. Maybe I just missed something obvious? Sending java\engine\org\apache\derby\iapi\store\access\RowUtil.java Sending java\engine\org\apache\derby\impl\sql\catalog\DataDictionaryImpl.java Sending java\engine\org\apache\derby\impl\sql\compile\FromBaseTable.java Sending java\engine\org\apache\derby\impl\sql\compile\FromList.java Sending java\engine\org\apache\derby\impl\sql\compile\FromTable.java Sending java\engine\org\apache\derby\impl\sql\depend\BasicDependencyManager.java Sending java\engine\org\apache\derby\impl\sql\execute\InternalTriggerExecutionContext.java Sending java\engine\org\apache\derby\impl\sql\execute\rts\RealBasicNoPutResultSetStatistics.java Sending java\engine\org\apache\derby\jdbc\EmbedPooledConnection.java Sending java\tools\org\apache\derby\impl\tools\ij\AttributeHolder.java Sending java\tools\org\apache\derby\impl\tools\ij\ConnectionEnv.java Sending java\tools\org\apache\derby\tools\URLCheck.java Transmitting file data ............ Committed revision 122617. I was originally concerned about defaulting the code version levels and thought it would be better set in ~/ant.propeties.
Attached is a patch that sets the versions in modern.properties and reapplies the build.xml changes. I am not able to test with Jikes. JavaCC version 3.2 changes the variable name from "enum" to "e". It's The javacc.jar in tools/java should be upgraded.
JavaCC 3.2 has an issue with lookahead that causes a failure in the test lang/db2compatibility.sql.
However, I have tried the recently released JavaCC 4.0, and it fixes that issue and all tests passed cleanly, so at some point we will likely upgrade to that version. Patch with necessary changes for building with JavaCC 4.0. OPTIMIZE_TOKEN_MANAGER is no longer a supported option, and the generated code for mtGrammar includes a catch block for RuntimeException which uses a new method in RuntimeException introduced in JDK 1.4, so it became necessary to move the compilation of mtGrammar.java into the impl_tools_jdk14 target.
FYI, I've attached a patch to
Fixed by changes to
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
These can be specified in ${user.home}/ant.properties
Changes the name of "enum" variables to "e"