-
Notifications
You must be signed in to change notification settings - Fork 186
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Improve Manifest Information #17
Conversation
ant failed for missing files folders.
this avoids warning when running with jdk 7
This lets you get the version information with getPackage().getImplemenationXXX()
An XML document that shows waffle system setup
this beefs up the manifet and puts the same info in both src and bin
I would like an entry in CHANGELOG though, please, about the new info classes. |
I don't see any downside to implementing manifest changes and java source changes as noted here. |
I'll be back to my office next week and will cherry pick the changes to the JARs. I'd love a separate PR for just that if you have time, but am happy to extract it otherwise. The WaffleInfo I think needs a bit more work. It needs docs (how can someone use it?) and changelog edits. There's a suspicious update to |
Sorry -- I tried to make these trivial issues, but it looks like all the changes I made get added to the same pull request. I thought it would be just the things I did on that branch. The change to tomcat jar was just to get things compiling (also the bits that add empty folders). Currently with a clean checkout of the 1.5 branch there are a bunch of little things that need fixed to make build.cmd all work. I assume this is something that is just mid-development so you can ignore anything like that. Also, my seem to get changed to full file replacements! I made #16 to deal with this individually. Again, you can probably ignore anything in the pull request and just follow the directions at: For this issue, my real request is only to change the build ant task to be <target name="getgitdetails" >
<exec executable="git" outputproperty="git.revision">
<arg value="rev-parse"/>
<arg value="HEAD"/>
</exec>
</target>
<!-- package -->
<target name="jar" depends="getgitdetails">
<delete dir="${waffle.build}" />
<mkdir dir="${waffle.build}" />
<jar jarfile="${common.build}/${project.jar}.jar">
<fileset dir="${waffle.lib}">
<include name="waffle/**/*.class" />
</fileset>
<manifest>
<attribute name="Specification-Title" value="WAFFLE - ${project.jar}" />
<attribute name="Specification-Version" value="${waffle.version}" />
<attribute name="Specification-Vendor" value="${company.name}" />
<attribute name="Implementation-Title" value="WAFFLE - ${project.jar}" />
<attribute name="Implementation-Version" value="${waffle.version} - ${user.name} - ${DSTAMP} ${TSTAMP} - ${git.revision}" />
<attribute name="Implementation-Vendor" value="${company.name}" />
<attribute name="Git-Revision" value="${git.revision}" />
<attribute name="Created-By" value="${waffle.copyright}" />
</manifest>
</jar>
<jar jarfile="${common.build}/${project.jar}-src.zip">
<fileset dir="${waffle.src}">
<include name="waffle/**/*.java" />
</fileset>
<manifest>
<attribute name="Specification-Title" value="WAFFLE - ${project.jar}" />
<attribute name="Specification-Version" value="${waffle.version}" />
<attribute name="Specification-Vendor" value="${company.name}" />
<attribute name="Implementation-Title" value="WAFFLE - ${project.jar}" />
<attribute name="Implementation-Version" value="${waffle.version} - ${user.name} - ${DSTAMP} ${TSTAMP} - ${git.revision}" />
<attribute name="Implementation-Vendor" value="${company.name}" />
<attribute name="Git-Revision" value="${git.revision}" />
<attribute name="Created-By" value="${waffle.copyright}" />
</manifest>
</jar>
</target> The other build related change request is to set the java source level explicitly so it avoids compiler warnings source="${waffle.java.version}" <javac
source="${waffle.java.version}"
target="${waffle.java.version}"
srcdir="${waffle.src}"
destdir="${waffle.lib}"
... Can you try picking out changes for #16 and #17? I'll learn some more about git and clean up #14 with better javadocs etc if you guys like the basic idea |
…tails, such as GIT revision, cherry picked out of #17.
I committed the manifest changes in dbf68c1, thank you. |
spinning out from:
https://github.com/ryantxu/waffle/commit/2a287b17f3de259f175944fda973b72233462f09#-P0
This adds a bunch of information to the .jar manifest info