Repository: incubator-freemarker Updated Branches: refs/heads/2.3-gae 19c2b9873 -> 17144edc0
Build: Added GPG signing and checksum file generation Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/17144edc Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/17144edc Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/17144edc Branch: refs/heads/2.3-gae Commit: 17144edc0fb34302fe57c21e3fd32c788653816b Parents: 19c2b98 Author: ddekany <[email protected]> Authored: Sat Jan 2 17:49:07 2016 +0100 Committer: ddekany <[email protected]> Committed: Sat Jan 2 17:49:07 2016 +0100 ---------------------------------------------------------------------- build.properties.sample | 3 +- build.xml | 86 ++++++++++++++++++++++++++++++-------------- 2 files changed, 62 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/17144edc/build.properties.sample ---------------------------------------------------------------------- diff --git a/build.properties.sample b/build.properties.sample index fb1d632..c5dc8ff 100644 --- a/build.properties.sample +++ b/build.properties.sample @@ -19,4 +19,5 @@ # These propeties should point to the rt.jar-s of the respective J2SE versions: boot.classpath.j2se1.5=C:/Program Files (x86)/Java/jdk1.5.0_16/jre/lib/rt.jar boot.classpath.j2se1.6=C:/Program Files/Java/jdk1.6.0_24/jre/lib/rt.jar -mvnCommand=C:/Program Files (x86)/maven3/bin/mvn.bat \ No newline at end of file +mvnCommand=C:/Program Files (x86)/maven3/bin/mvn.bat +gpgCommand=C:/Program Files (x86)/GNU/GnuPG/pub/gpg.exe \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/17144edc/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 1d9769e..ddffba2 100644 --- a/build.xml +++ b/build.xml @@ -602,7 +602,7 @@ <antcall target="clean" /> <!-- To improve the reliability --> <antcall target="_dist" /> </target> - + <target name="_dist" depends="jar, javadoc, manualOffline" > @@ -652,17 +652,10 @@ <fileset dir="build/api" /> </copy> - <!-- Package --> - <property name="bin.tar" value="build/dist/apache-freemarker-gae-${version}-bin.tar" /> - <property name="bin.gzip" value="${bin.tar}.gz" /> - <delete file="${bin.tar}" /> - <tar tarfile="${bin.tar}" basedir="${dist.dir}/bin" /> - <delete file="${bin.gzip}" /> - <gzip zipfile="${bin.gzip}" src="${bin.tar}" /> - <delete file="${bin.tar}" /> - - <!-- Sign and hash: --> - <!-- TODO --> + <u:packageAndSignDist + srcDir="${dist.dir}/bin" + archiveNameWithoutExt="apache-freemarker-gae-${version}-bin" + /> <!-- ..................................... --> <!-- Source distribution --> @@ -702,19 +695,60 @@ </fileset> </copy> - <!-- Package --> - <property name="src.tar" value="build/dist/apache-freemarker-gae-${version}-src.tar" /> - <property name="src.gzip" value="${src.tar}.gz" /> - <delete file="${src.tar}" /> - <tar tarfile="${src.tar}" basedir="${dist.dir}/src" /> - <delete file="${src.gzip}" /> - <gzip zipfile="${src.gzip}" src="${src.tar}" /> - <delete file="${src.tar}" /> - - <!-- Sign and hash: --> - <!-- TODO --> + <u:packageAndSignDist + srcDir="${dist.dir}/src" + archiveNameWithoutExt="apache-freemarker-gae-${version}-src" + /> </target> + <macrodef name="packageAndSignDist" uri="http://freemarker.org/util";> + <attribute name="srcDir" /> + <attribute name="archiveNameWithoutExt" /> + <sequential> + <local name="archive.tar"/> + <property name="archive.tar" value="build/dist/@{archiveNameWithoutExt}.tar" /> + <local name="archive.gzip"/> + <property name="archive.gzip" value="${archive.tar}.gz" /> + <delete file="${archive.tar}" /> + <tar tarfile="${archive.tar}" basedir="@{srcDir}" /> + <delete file="${archive.gzip}" /> + <gzip zipfile="${archive.gzip}" src="${archive.tar}" /> + <delete file="${archive.tar}" /> + + <echo>Signing "${archive.gzip}"...</echo> + <!-- gpg may hang if it exists: --> + <delete file="${archive.gzip}.asc" /> + <exec executable="${gpgCommand}" failonerror="true"> + <arg value="--armor" /> + <arg value="--output" /> + <arg value="${archive.gzip}.asc" /> + <arg value="--detach-sig" /> + <arg value="${archive.gzip}" /> + </exec> + + <echo>*** Signature verification: ***</echo> + <exec executable="${gpgCommand}" failonerror="true"> + <arg value="--verify" /> + <arg value="${archive.gzip}.asc" /> + <arg value="${archive.gzip}" /> + </exec> + <local name="signatureGood" /> + <local name="signatureGood.y" /> + <input + validargs="y,n" + addproperty="signatureGood" + >Is the above signer the intended one for Apache releases?</input> + <condition property="signatureGood.y"> + <equals arg1="y" arg2="${signatureGood}"/> + </condition> + <fail unless="signatureGood.y" message="Task aborted by user." /> + + <echo>Creating checksum files for "${archive.gzip}"...</echo> + <checksum file="${archive.gzip}" fileext=".md5" algorithm="MD5" forceOverwrite="yes" /> + <checksum file="${archive.gzip}" fileext=".sha512" algorithm="SHA-512" forceOverwrite="yes" /> + </sequential> + </macrodef> + <target name="maven-pom"> <echo file="build/pom.xml"><