Hello David,
Actually no, that wouldn't fit the model we are aiming for. In make/src
we put source for build tools, that are only used during the build to
generate things for the product. In make/data we put data files that are
input to build tools. We leave template java files in the main source
tree. It's not always clear if a file should be classified as mainly
"data" or mainly "java src", but if it looks like a java file, I think
it makes more sense to have it close to the rest of the source, from a
developer perspective. From the build perspective, it's just important
to be able to tell java template files apart from actual java files.
/Erik
On 2014-02-17 02:22, David Holmes wrote:
Maybe too late but ...
On 12/02/2014 7:55 PM, Erik Joelsson wrote:
New webrev: http://cr.openjdk.java.net/~erikj/8034179/webrev.jdk.02/
* Moved into fs and ch subdirectories.
* Cleaned up the logic in GensrcMisc.gmk
Given you've moved stuff from src to make/src wouldn't it also make
sense to cleanup:
src/closed/solaris/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java.template)
- src/closed -> make/closed )(or actually $CUSTOM_MAKE_DIR)
- solaris/classes/sun/nio/ch -> ? src/genconstants/ch ?
David
-----
/Erik
On 2014-02-11 14:53, Alan Bateman wrote:
On 11/02/2014 11:31, Erik Joelsson wrote:
Here is a second patch for cleaning up gensrc tools source. This time
it's nio related.
* Move genUnixConstants.c, genSolarisConstants.c and
genSocketOptionRegistry.c to make/src/native/...
* Rename pregenerated versions of these generated files to
*.java.template to avoid having to exclude them when compiling java
code.
* Move the output of the executable binaries to
$(JDK_OUTPUTDIR)/btnative away from the gensrc dir where we expect to
find java sources.
Bug: https://bugs.openjdk.java.net/browse/JDK-8034179
Webrev: http://cr.openjdk.java.net/~erikj/8034179/webrev.jdk.01/
This looks okay but I just wonder if it would be better to keep the ch
(channels) and fs (file system) sub-directories so that it is clear
which areas they are for.
-Alan.
