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 22:57:42 UTC
git commit: Continue to review release steps. Fix RPM arch issue.
(cherry picked from commit 7a6c9341208d1036d3957d05debc43a4622b32d5)
Updated Branches:
refs/heads/master 6dc462f3d -> 8424e5150
Continue to review release steps. Fix RPM arch issue.
(cherry picked from commit 7a6c9341208d1036d3957d05debc43a4622b32d5)
Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/8424e515
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/8424e515
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/8424e515
Branch: refs/heads/master
Commit: 8424e515098d85dc3334e65cb96baa82d192b8da
Parents: 6dc462f
Author: Kevin Minder <ke...@hortonworks.com>
Authored: Tue Oct 1 16:47:58 2013 -0400
Committer: Kevin Minder <ke...@hortonworks.com>
Committed: Tue Oct 1 16:56:05 2013 -0400
----------------------------------------------------------------------
.gitignore | 2 +-
build.xml | 25 +++++++++++++------------
gateway-rpm/build_knox_rpm.sh | 2 +-
pom.xml | 2 +-
4 files changed, 16 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/8424e515/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 71b032b..35f4d01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,7 +30,7 @@ atlassian-ide-plugin.xml
target
install
patch
-release
+candidate
org.apache.hadoop.gateway.security.EmbeddedApacheDirectoryServer/
velocity.log
*.pyc
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/8424e515/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 58d51db..b917c04 100644
--- a/build.xml
+++ b/build.xml
@@ -30,6 +30,7 @@
<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="candidate.path" value="candidate"/>
<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}" />
@@ -62,7 +63,7 @@
<target name="clean" depends="init" description="Clean up any build artifacts.">
<delete file="target"/>
<delete file="install"/>
- <delete file="release"/>
+ <delete file="${candidate.path}"/>
</target>
<target name="build" depends="init" description="Build the product.">
@@ -117,8 +118,8 @@
</target>
<target name="download-build">
- <mkdir dir="release"/>
- <get dest="release">
+ <mkdir dir="${candidate.path}"/>
+ <get dest="${candidate.path}">
<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"/>
@@ -135,18 +136,18 @@
</get>
</target>
- <target name="sign-release" depends="init" description="Sign a previously created release.">
- <exec executable="gpg" dir="release">
+ <target name="sign-candidate" depends="init" description="Sign a previously created release.">
+ <exec executable="gpg" dir="${candidate.path}">
<arg value="--armor"/>
<arg value="--detach-sig"/>
<arg value="${gateway-artifact}-${gateway-version}.rpm"/>
</exec>
- <exec executable="gpg" dir="release">
+ <exec executable="gpg" dir="${candidate.path}">
<arg value="--armor"/>
<arg value="--detach-sig"/>
<arg value="${gateway-artifact}-${gateway-version}.zip"/>
</exec>
- <exec executable="gpg" dir="release">
+ <exec executable="gpg" dir="${candidate.path}">
<arg value="--armor"/>
<arg value="--detach-sig"/>
<arg value="${gateway-artifact}-${gateway-version}.tar.gz"/>
@@ -154,12 +155,12 @@
<!--
<checksum file="target/${gateway-version}/${gateway-artifact}-${gateway-version}-src.zip" algorithm="SHA1" property="checksum"/>
-->
- <exec executable="gpg" dir="release">
+ <exec executable="gpg" dir="${candidate.path}">
<arg value="--armor"/>
<arg value="--detach-sig"/>
<arg value="${gateway-artifact}-${gateway-version}-src.zip"/>
</exec>
- <exec executable="gpg" dir="release">
+ <exec executable="gpg" dir="${candidate.path}">
<arg value="--export"/>
<arg value="--armor"/>
<arg value="--output"/>
@@ -180,17 +181,17 @@
<target name="release" depends="package,rpm" description="Build release artifacts including RPM and sign."/>
- <target name="stage-release" description="Stage release artifacts.">
+ <target name="stage-candidate" depends="unstage-candidate" description="Stage release artifacts.">
<exec executable="svn">
<arg value="import" />
- <arg value="release"/>
+ <arg value="${candidate.path}"/>
<arg value="${svn.staging.path}/${gateway-artifact}-${gateway-version}/"/>
<arg value="-m"/>
<arg value="Staging Apache Knox Gateway version ${gateway-version}."/>
</exec>
</target>
- <target name="unstage-release" description="Delete staged release artifacts.">
+ <target name="unstage-candidate" description="Delete staged release artifacts.">
<exec executable="svn">
<arg value="delete" />
<arg value="${svn.staging.path}/${gateway-artifact}-${gateway-version}/"/>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/8424e515/gateway-rpm/build_knox_rpm.sh
----------------------------------------------------------------------
diff --git a/gateway-rpm/build_knox_rpm.sh b/gateway-rpm/build_knox_rpm.sh
index 7fbd189..651cfec 100755
--- a/gateway-rpm/build_knox_rpm.sh
+++ b/gateway-rpm/build_knox_rpm.sh
@@ -26,7 +26,7 @@ KNOX_VER=$3
# target/RPM base directory
KNOX_TOPDIR="$(pwd)"/$KNOX_PACKAGE_TARGET/RPM
# Hardware platform
-KNOX_BUILD_ARCH="$(arch)"
+KNOX_BUILD_ARCH="noarch"
#RPM name
KNOX_RPMFILENAME="$KNOX_NAME-$KNOX_VER.rpm"
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/8424e515/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 603e8ab..c945dcb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,7 +161,7 @@
<exclude>**/*.iml</exclude>
<exclude>**/target/**</exclude>
<exclude>**/install/**</exclude>
- <exclude>**/release/**</exclude>
+ <exclude>**/candidate/**</exclude>
<exclude>**/patch/**</exclude>
<exclude>**/patchprocess/**</exclude>
<exclude>**/test/resources/**</exclude>