You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by km...@apache.org on 2013/10/01 21:23:19 UTC

git commit: Changes to simplify release processes.

Updated Branches:
  refs/heads/v0.3.0 06fcd12c7 -> 8d3819cb7


Changes to simplify release processes.


Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/8d3819cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/8d3819cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/8d3819cb

Branch: refs/heads/v0.3.0
Commit: 8d3819cb73d152d3455077528683d757bb8e22be
Parents: 06fcd12
Author: Kevin Minder <ke...@hortonworks.com>
Authored: Tue Oct 1 15:23:07 2013 -0400
Committer: Kevin Minder <ke...@hortonworks.com>
Committed: Tue Oct 1 15:23:07 2013 -0400

----------------------------------------------------------------------
 .gitignore |  1 +
 build.xml  | 49 ++++++++++++++++++++++++++++++++++++++++++-------
 pom.xml    |  1 +
 3 files changed, 44 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/8d3819cb/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index df91feb..71b032b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ atlassian-ide-plugin.xml
 target
 install
 patch
+release
 org.apache.hadoop.gateway.security.EmbeddedApacheDirectoryServer/
 velocity.log
 *.pyc

http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/8d3819cb/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index f9504cb..22833a5 100644
--- a/build.xml
+++ b/build.xml
@@ -29,6 +29,8 @@
 
     <property name="gateway-home" value="${gateway-artifact}-${gateway-version}"/>
 
+    <property name="build-url" value="https://builds.apache.org/job/Knox-${gateway-version}/ws/target/${gateway-version}"/>
+
     <property name="svn.release.path" value="https://dist.apache.org/repos/dist/release/incubator/${gateway-project}" />
     <property name="svn.staging.path" value="https://dist.apache.org/repos/dist/dev/incubator/${gateway-project}" />
 
@@ -60,6 +62,7 @@
     <target name="clean" depends="init" description="Clean up any build artifacts.">
         <delete file="target"/>
         <delete file="install"/>
+        <delete file="release"/>
     </target>
 
     <target name="build" depends="init" description="Build the product.">
@@ -91,6 +94,12 @@
         </exec>
     </target>
 
+    <target name="post-build" depends="init,_rpm,_changes"/>
+
+    <target name="_changes" depends="init">
+        <copy file="gateway-release/home/CHANGES" todir="target/${gateway-version}"/>
+    </target>
+
     <target name="set-rpm-builder-privs" if="isUnix">
         <chmod file="${rpm-builder}" perm="700"/>	     
     </target>
@@ -107,24 +116,50 @@
         <checksum file="target/${gateway-version}/${gateway-artifact}-${gateway-version}.rpm" algorithm="SHA1" fileext=".sha" forceOverwrite="yes"/>
     </target>
 
-    <target name="sign" depends="init" description="Sign a previously created release.">
-        <exec executable="gpg" dir="target/${gateway-version}">
+    <target name="download-build">
+        <mkdir dir="release"/>
+        <get dest="release">
+            <url url="${build-url}/knox-incubating-${gateway-version}.zip"/>
+            <url url="${build-url}/knox-incubating-${gateway-version}.zip.md5"/>
+            <url url="${build-url}/knox-incubating-${gateway-version}.zip.sha"/>
+            <url url="${build-url}/knox-incubating-${gateway-version}-src.zip"/>
+            <url url="${build-url}/knox-incubating-${gateway-version}-src.zip.md5"/>
+            <url url="${build-url}/knox-incubating-${gateway-version}-src.zip.sha"/>
+            <url url="${build-url}/knox-incubating-${gateway-version}.tar.gz"/>
+            <url url="${build-url}/knox-incubating-${gateway-version}.tar.gz.md5"/>
+            <url url="${build-url}/knox-incubating-${gateway-version}.tar.gz.sha"/>
+            <url url="${build-url}/knox-incubating-${gateway-version}.rpm"/>
+            <url url="${build-url}/knox-incubating-${gateway-version}.rpm.md5"/>
+            <url url="${build-url}/knox-incubating-${gateway-version}.rpm.sha"/>
+            <url url="${build-url}/CHANGES"/>
+        </get>
+    </target>
+
+    <target name="sign-release" depends="init" description="Sign a previously created release.">
+        <exec executable="gpg" dir="release">
             <arg value="--armor"/>
             <arg value="--detach-sig"/>
             <arg value="${gateway-artifact}-${gateway-version}.rpm"/>
         </exec>
-        <exec executable="gpg" dir="target/${gateway-version}">
+        <exec executable="gpg" dir="release">
             <arg value="--armor"/>
             <arg value="--detach-sig"/>
             <arg value="${gateway-artifact}-${gateway-version}.zip"/>
         </exec>
+        <exec executable="gpg" dir="release">
+            <arg value="--armor"/>
+            <arg value="--detach-sig"/>
+            <arg value="${gateway-artifact}-${gateway-version}.tar.gz"/>
+        </exec>
+        <!--
         <checksum file="target/${gateway-version}/${gateway-artifact}-${gateway-version}-src.zip" algorithm="SHA1" property="checksum"/>
-        <exec executable="gpg" dir="target/${gateway-version}">
+        -->
+        <exec executable="gpg" dir="release">
             <arg value="--armor"/>
             <arg value="--detach-sig"/>
             <arg value="${gateway-artifact}-${gateway-version}-src.zip"/>
         </exec>
-        <exec executable="gpg" dir="target/${gateway-version}">
+        <exec executable="gpg" dir="release">
             <arg value="--export"/>
             <arg value="--armor"/>
             <arg value="--output"/>
@@ -143,12 +178,12 @@
         <echo message="${stage-message}"/>
     </target>
 
-    <target name="release" depends="package,rpm,sign" description="Build release artifacts including RPM and sign."/>
+    <target name="release" depends="package,rpm" description="Build release artifacts including RPM and sign."/>
 
     <target name="stage-release" description="Stage release artifacts.">
         <exec executable="svn">
             <arg value="import" />
-            <arg value="target/${gateway-version}"/>
+            <arg value="release"/>
             <arg value="${svn.staging.path}/${gateway-artifact}-${gateway-version}/"/>
             <arg value="-m"/>
             <arg value="Staging Apache Knox Gateway version ${gateway-version}."/>

http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/8d3819cb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dcda358..6eef310 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,6 +161,7 @@
                         <exclude>**/*.iml</exclude>
                         <exclude>**/target/**</exclude>
                         <exclude>**/install/**</exclude>
+                        <exclude>**/release/**</exclude>
                         <exclude>**/patch/**</exclude>
                         <exclude>**/patchprocess/**</exclude>
                         <exclude>**/test/resources/**</exclude>