[ https://issues.apache.org/jira/browse/DERBY-6945?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16368577#comment-16368577 ]
Rick Hillegas commented on DERBY-6945: -------------------------------------- Attaching derby-6945-21-aa-simplifyBuildScripts.diff. This patch eliminates most of the build scripts. Tests passed cleanly for me. With this patch, each artifact now has a single master script (located in the base directory of its source branch). A single javac command compiles all of the files in each branch. This should make it easy to compile each artifact along with its module descriptor. The master artifact scripts are: {noformat} engine/build.xml run/build.xml client/build.xml drda/build.xml optional/build.xml shared/build.xml tools/build.xml {noformat} Touches the following files: {noformat} -------------------------------------------------- M build.xml M java/client/build.xml M java/drda/build.xml M java/engine/build.xml M java/shared/build.xml M java/tools/build.xml Adjust these scripts so that each one compiles its whole directory tree all at once, rather than calling build scripts lower down in the tree. Most of the other tasks performed by the lower scripts have been moved up into the top scripts. Those tasks include the copying of resource files and the generation of the parsers. I left engine/org/apache/derby/loc/build.xml untouched, however. That is because that script does so much work that I thought it deserved its own script for reasons of clarity. Note that that engine/org/apache/derby/loc/build.xml does not compile any java sources. It merely re-arranges the message localizations. -------------------------------------------------- D java/drda/org/apache/derby/drda/build.xml D java/drda/org/apache/derby/impl/drda/build.xml D java/drda/org/apache/derby/loc/drda/build.xml D java/engine/org/apache/derby/agg/build.xml D java/engine/org/apache/derby/authentication/build.xml D java/engine/org/apache/derby/catalog/build.xml D java/engine/org/apache/derby/database/build.xml D java/engine/org/apache/derby/diag/build.xml D java/engine/org/apache/derby/iapi/build.xml D java/engine/org/apache/derby/iapi/db/build.xml D java/engine/org/apache/derby/iapi/jdbc/build.xml D java/engine/org/apache/derby/iapi/services/build.xml D java/engine/org/apache/derby/iapi/services/crypto/build.xml D java/engine/org/apache/derby/iapi/services/io/build.xml D java/engine/org/apache/derby/iapi/sql/build.xml D java/engine/org/apache/derby/iapi/store/build.xml D java/engine/org/apache/derby/iapi/types/build.xml D java/engine/org/apache/derby/iapi/util/build.xml D java/engine/org/apache/derby/impl/build.xml D java/engine/org/apache/derby/impl/db/build.xml D java/engine/org/apache/derby/impl/io/build.xml D java/engine/org/apache/derby/impl/jdbc/build.xml D java/engine/org/apache/derby/impl/load/build.xml D java/engine/org/apache/derby/impl/services/build.xml D java/engine/org/apache/derby/impl/sql/build.xml D java/engine/org/apache/derby/impl/store/build.xml D java/engine/org/apache/derby/io/build.xml D java/engine/org/apache/derby/mbeans/build.xml D java/engine/org/apache/derby/osgi/build.xml D java/engine/org/apache/derby/security/build.xml D java/engine/org/apache/derby/vti/build.xml D java/tools/org/apache/derby/iapi/tools/build.xml D java/tools/org/apache/derby/impl/tools/build.xml D java/tools/org/apache/derby/jdbc/build.xml D java/tools/org/apache/derby/loc/build.xml D java/tools/org/apache/derby/tools/build.xml Delete all of these obsolete scripts. {noformat} > Re-package Derby as a collection of jigsaw modules > -------------------------------------------------- > > Key: DERBY-6945 > URL: https://issues.apache.org/jira/browse/DERBY-6945 > Project: Derby > Issue Type: Improvement > Affects Versions: 10.13.1.2 > Reporter: Rick Hillegas > Priority: Major > Attachments: derby-6945-01-aa-remove_derbyPreBuild_dep.diff, > derby-6945-02-ab-newDerbySharedJar.diff, > derby-6945-02-ac-newDerbySharedJar.diff, derby-6945-03-aa-partitionTest.diff, > derby-6945-04-aa-moveRunClass.diff, > derby-6945-05-aa-removeRedundant_Attribute_SQLState.diff, > derby-6945-06-aa-removeOtherSharedDuplicates.diff, > derby-6945-07-aa-net_client_overlap.diff, > derby-6945-08-aa-move_shared_iapi_under_shared.diff, > derby-6945-08-ab-move_shared_iapi_under_shared.diff, > derby-6945-08-ad-move_shared_iapi_under_shared.diff, > derby-6945-09-ab-moveInternalDriver.diff, derby-6945-10-aa-moveDriver42.diff, > derby-6945-11-ab-moveAutoloadedDriver.diff, > derby-6945-12-ab-moveClientDataSourceInterface.diff, > derby-6945-13-aa-create-ClientAutoloadedDriver.diff, > derby-6945-14-aa-moveMoreEmbeddedClassesOutOfPublicAPI.diff, > derby-6945-15-aa-moveMoreClientClassesOutOfPublicAPI.diff, > derby-6945-16-aa-consolidatePublicAPI.diff, > derby-6945-17-aa-resealPackagesIn-derbyshared.diff, > derby-6945-18-aa-resealLocalizationPackage.diff, > derby-6945-19-ad-movePublicAPIintoToolsJar.diff, > derby-6945-20-aa-removeClasslister.diff, > derby-6945-21-aa-simplifyBuildScripts.diff, > derby-6945-XX-moveDataSourceFactories, jdeps.out.tar > > > Once we commit to building with Java 9 (see DERBY-6856), we should consider > re-packaging Derby as a set of jigsaw modules. This would result in a > different set of release artifacts. This might be a good opportunity to > address the Tomcat artifactory issues raised by issue DERBY-6944. -- This message was sent by Atlassian JIRA (v7.6.3#76005)