Hi, I've rebased gradle branch on top of the current master, and it includes all the changes so far.
As of now, Gradle-based build generates license file (see src/licenses), and it builds source/binary artifacts based on .gitattributes and .gitignore files. Even though it is a major improvement, the diff itself was very small. I assume everybody has already tried Gradle-based build, and I'm about to merge https://github.com/apache/jmeter/pull/469 soon. Overall diff is 150 files changed, 4803 insertions(+), 10014 deletions(-) (diff command is: git diff -M30% -l0 --stat -p -G. origin/master ) Vladimir 2019-07-17 18:07 GMT+03:00, Vladimir Sitnikov <[email protected]>: > Felix>PS I hope to find time to look at the gradle work when the build is > Felix>running again. > > Note: Gradle-based build is running, so you could try it just fine. > My gradle branch is lagging behind, however the difference is minimal. > > > As of now, I'm working on two items: > > 1) Generate license files (it is almost complete). > 2) "Use .gitattributes" to infer CRLF/LF for binary and source artifacts > > A nice outcome of #2 would be that "source artifacts" would be coded as > follows (+ something regarding shell scripts). > It would automatically include text files as CRLF when building zip, and LF > when building tgz. > > val baseFolder = "apache-jmeter-${rootProject.version}" > > fun CrLfSpec.sourceLayout() = copySpec { > duplicatesStrategy = DuplicatesStrategy.EXCLUDE > into(baseFolder) { > // Apply common gitattributes to license files > gitattributes(this, gitProps) > // Note: license content is taken from "/build/..", so > gitignore should not be used > // Note: this is a "license + third-party licenses", not just > Apache-2.0 > with(licenseNotice(licenseType = "source")) > } > into(baseFolder) { > // Ignore files ignored by Git > gitignore(gitProps) > gitattributes(this, gitProps) > // Include all the source files > from(rootDir) > } > } > > Vladimir > -- Regards, Vladimir Sitnikov
