andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed build issues

Browse Source 
* Replaced the buildnumber plugin with antrun exec tag to generate the build number correctly.
* Fixed a problem where MANIFEST.MF is lost
This commit is contained in:
Trustin Lee 2011-01-11 18:17:45 +09:00
parent 1f1b8d8325
commit c5a29f00a4
1 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
pom.xml
View File

@ -202,24 +202,6 @@
<showDeprecations>true</showDeprecations> <showDeprecations>true</showDeprecations>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.0-beta-4</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>create</goal>
</goals>
</execution>
</executions>
<configuration>
<doCheck>false</doCheck>
<doUpdate>true</doUpdate>
<revisionOnScmFailure>-1</revisionOnScmFailure>
</configuration>
</plugin>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.4.2</version> <version>2.4.2</version>
@ -269,7 +251,6 @@
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>
<SCM-Revision>${buildNumber}</SCM-Revision>
<Bundle-SymbolicName>${project.groupId}</Bundle-SymbolicName> <Bundle-SymbolicName>${project.groupId}</Bundle-SymbolicName>
<Bundle-DocURL>${project.url}</Bundle-DocURL> <Bundle-DocURL>${project.url}</Bundle-DocURL>
<Bundle-Activator> <Bundle-Activator>
@ -318,9 +299,14 @@
</goals> </goals>
<configuration> <configuration>
<tasks> <tasks>
<exec executable="git" outputproperty="buildNumber">
<arg value="log"/>
<arg value="-1"/>
<arg value="--format=format:%h"/>
</exec>
<mkdir dir="${project.build.directory}" /> <mkdir dir="${project.build.directory}" />
<echo message="${project.version}, r${buildNumber}" file="${project.build.directory}/version.txt" /> <echo message="${project.version}" file="${project.build.directory}/version.txt" />
<echo message="// DO NOT MODIFY - WILL BE OVERWRITTEN DURING THE BUILD PROCESS${line.separator}package org.jboss.netty.util;${line.separator}/**${line.separator} * Provides the version information of Netty.${line.separator} * @apiviz.landmark${line.separator} */${line.separator}public final class Version {${line.separator} /** The version identifier. */${line.separator} public static final String ID = &quot;${project.version}-r${buildNumber}&quot;;${line.separator} /** Prints out the version identifier to stdout. */${line.separator} public static void main(String[] args) { System.out.println(ID); }${line.separator} private Version() { super(); }${line.separator}}${line.separator}" file="${basedir}/src/main/java/org/jboss/netty/util/Version.java" /> <echo message="// DO NOT MODIFY - WILL BE OVERWRITTEN DURING THE BUILD PROCESS${line.separator}package org.jboss.netty.util;${line.separator}/**${line.separator} * Provides the version information of Netty.${line.separator} * @apiviz.landmark${line.separator} */${line.separator}public final class Version {${line.separator} /** The version identifier. */${line.separator} public static final String ID = &quot;${project.version}-${buildNumber}&quot;;${line.separator} /** Prints out the version identifier to stdout. */${line.separator} public static void main(String[] args) { System.out.println(ID); }${line.separator} private Version() { super(); }${line.separator}}${line.separator}" file="${basedir}/src/main/java/org/jboss/netty/util/Version.java" />
</tasks> </tasks>
</configuration> </configuration>
</execution> </execution>
@ -340,20 +326,28 @@
</or> </or>
<then> <then>
<move file="${project.build.directory}/${project.build.finalName}.jar" tofile="${project.build.directory}/${project.build.finalName}.orig.jar" /> <move file="${project.build.directory}/${project.build.finalName}.jar" tofile="${project.build.directory}/${project.build.finalName}.orig.jar" />
<jar destfile="${project.build.directory}/${project.build.finalName}.jar"> <zip destfile="${project.build.directory}/${project.build.finalName}.jar">
<zipfileset filemode="644" src="${project.build.directory}/${project.build.finalName}.orig.jar" dirmode="755"> <zipfileset filemode="644" src="${project.build.directory}/${project.build.finalName}.orig.jar" dirmode="755">
<include name="META-INF/MANIFEST.MF" />
</zipfileset>
<zipfileset filemode="644" src="${project.build.directory}/${project.build.finalName}.orig.jar" dirmode="755">
<exclude name="META-INF/MANIFEST.MF" />
<exclude name="*/*/*/example/**" /> <exclude name="*/*/*/example/**" />
</zipfileset> </zipfileset>
</jar> </zip>
<delete file="${project.build.directory}/${project.build.finalName}.orig.jar" /> <delete file="${project.build.directory}/${project.build.finalName}.orig.jar" />
<checksum file="${project.build.directory}/${project.build.finalName}.jar" algorithm="md5" forceoverwrite="yes" /> <checksum file="${project.build.directory}/${project.build.finalName}.jar" algorithm="md5" forceoverwrite="yes" />
<checksum file="${project.build.directory}/${project.build.finalName}.jar" algorithm="sha1" forceoverwrite="yes" /> <checksum file="${project.build.directory}/${project.build.finalName}.jar" algorithm="sha1" forceoverwrite="yes" />
<move file="${project.build.directory}/${project.build.finalName}-sources.jar" tofile="${project.build.directory}/${project.build.finalName}-sources.orig.jar" /> <move file="${project.build.directory}/${project.build.finalName}-sources.jar" tofile="${project.build.directory}/${project.build.finalName}-sources.orig.jar" />
<jar destfile="${project.build.directory}/${project.build.finalName}-sources.jar"> <zip destfile="${project.build.directory}/${project.build.finalName}-sources.jar">
<zipfileset filemode="644" src="${project.build.directory}/${project.build.finalName}-sources.orig.jar" dirmode="755"> <zipfileset filemode="644" src="${project.build.directory}/${project.build.finalName}-sources.orig.jar" dirmode="755">
<include name="META-INF/MANIFEST.MF" />
</zipfileset>
<zipfileset filemode="644" src="${project.build.directory}/${project.build.finalName}-sources.orig.jar" dirmode="755">
<exclude name="META-INF/MANIFEST.MF" />
<exclude name="*/*/*/example/**" /> <exclude name="*/*/*/example/**" />
</zipfileset> </zipfileset>
</jar> </zip>
<delete file="${project.build.directory}/${project.build.finalName}-sources.orig.jar" /> <delete file="${project.build.directory}/${project.build.finalName}-sources.orig.jar" />
<checksum file="${project.build.directory}/${project.build.finalName}-sources.jar" algorithm="md5" forceoverwrite="yes" /> <checksum file="${project.build.directory}/${project.build.finalName}-sources.jar" algorithm="md5" forceoverwrite="yes" />
<checksum file="${project.build.directory}/${project.build.finalName}-sources.jar" algorithm="sha1" forceoverwrite="yes" /> <checksum file="${project.build.directory}/${project.build.finalName}-sources.jar" algorithm="sha1" forceoverwrite="yes" />
@ -421,8 +415,8 @@
<author>true</author> <author>true</author>
<keywords>true</keywords> <keywords>true</keywords>
<overview>${basedir}/src/javadoc/overview.html</overview> <overview>${basedir}/src/javadoc/overview.html</overview>
<doctitle>${project.name} API Reference (${project.version}, r${buildNumber})</doctitle> <doctitle>${project.name} API Reference (${project.version})</doctitle>
<windowtitle>${project.name} API Reference (${project.version}, r${buildNumber})</windowtitle> <windowtitle>${project.name} API Reference (${project.version})</windowtitle>
<additionalparam> <additionalparam>
-link http://java.sun.com/javase/6/docs/api/ -link http://java.sun.com/javase/6/docs/api/
-link http://code.google.com/apis/protocolbuffers/docs/reference/java/ -link http://code.google.com/apis/protocolbuffers/docs/reference/java/
@ -465,8 +459,8 @@
<destDir>${project.build.directory}/xref</destDir> <destDir>${project.build.directory}/xref</destDir>
<javadocDir>${project.build.directory}/api</javadocDir> <javadocDir>${project.build.directory}/api</javadocDir>
<stylesheet>${basedir}/src/xref/stylesheet.css</stylesheet> <stylesheet>${basedir}/src/xref/stylesheet.css</stylesheet>
<docTitle>${project.name} Source Xref (${project.version}, r${buildNumber})</docTitle> <docTitle>${project.name} Source Xref (${project.version})</docTitle>
<windowTitle>${project.name} Source Xref (${project.version}, r${buildNumber})</windowTitle> <windowTitle>${project.name} Source Xref (${project.version})</windowTitle>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>