You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mnemonic.apache.org by ga...@apache.org on 2017/04/27 23:26:03 UTC
[1/3] incubator-mnemonic git commit: MNEMONIC-251: Pause to show
caution for runall.sh
Repository: incubator-mnemonic
Updated Branches:
refs/heads/master 5631b75b6 -> b1c96dbe1
MNEMONIC-251: Pause to show caution for runall.sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/commit/f83c3a6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/tree/f83c3a6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/diff/f83c3a6c
Branch: refs/heads/master
Commit: f83c3a6c1bb5a8afe85124418d2e8a02349d380b
Parents: 5631b75
Author: Wang, Gang(Gary) <ga...@intel.com>
Authored: Thu Apr 27 15:37:09 2017 -0700
Committer: Wang, Gang(Gary) <ga...@intel.com>
Committed: Thu Apr 27 15:37:09 2017 -0700
----------------------------------------------------------------------
build-tools/runall.sh | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/f83c3a6c/build-tools/runall.sh
----------------------------------------------------------------------
diff --git a/build-tools/runall.sh b/build-tools/runall.sh
index 782d9f1..ad445e6 100755
--- a/build-tools/runall.sh
+++ b/build-tools/runall.sh
@@ -17,13 +17,25 @@
# limitations under the License.
#
+continueprompt() {
+ while true; do
+ read -p "$1 Do you wish to continue [y/n] ? " yn
+ case $yn in
+ [Yy]* ) break;;
+ [Nn]* ) exit 2;;
+ * ) echo "Please answer yes or no.";;
+ esac
+ done
+ return 0
+}
+
if [ -z "${MNEMONIC_HOME}" ]; then
source "$(dirname "$0")/find-mnemonic-home.sh" || { echo "Not found find-mnemonic-home.sh script."; exit 10; }
fi
pushd "$MNEMONIC_HOME" || { echo "the environment variable \$MNEMONIC_HOME contains invalid home directory of Mnemonic project."; exit 11; }
echo [INFO] Cleaning up and re-building...
-git ls-files --error-unmatch pom.xml > /dev/null 2>&1 && git clean -xdf > /dev/null
+git ls-files --error-unmatch pom.xml > /dev/null 2>&1 && continueprompt "Please make sure all source codes have already been checked in or backed up otherwise un-checked files would be purged" && git clean -xdf > /dev/null
if [ ! -d "testlog" ]
then
[3/3] incubator-mnemonic git commit: MNEMONIC-253: Fix prompt
information for release.sh
Posted by ga...@apache.org.
MNEMONIC-253: Fix prompt information for release.sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/commit/b1c96dbe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/tree/b1c96dbe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/diff/b1c96dbe
Branch: refs/heads/master
Commit: b1c96dbe130642dd92e9cbc571254c527becffd9
Parents: f7eaea8
Author: Wang, Gang(Gary) <ga...@intel.com>
Authored: Thu Apr 27 16:25:10 2017 -0700
Committer: Wang, Gang(Gary) <ga...@intel.com>
Committed: Thu Apr 27 16:25:10 2017 -0700
----------------------------------------------------------------------
build-tools/release.sh | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/b1c96dbe/build-tools/release.sh
----------------------------------------------------------------------
diff --git a/build-tools/release.sh b/build-tools/release.sh
index 116497c..07c3984 100755
--- a/build-tools/release.sh
+++ b/build-tools/release.sh
@@ -48,7 +48,7 @@ pushd "$MNEMONIC_HOME" || { echo "the environment variable \$MNEMONIC_HOME conta
RELEASE_VERSION="$1"
NEXT_RELEASE_VERSION="$2"
RELEASE_CANDIDATE_ID="$3"
-NEXT_VER_COMMIT_PREFIX="Bump version"
+IS_SAME_VERSION=false
echo "You have specified:"
echo "RELEASE_VERSION = ${RELEASE_VERSION}"
@@ -60,7 +60,8 @@ continueprompt
git checkout master
if [ "${RELEASE_VERSION}" == "${NEXT_RELEASE_VERSION}" ]; then
- echo "You are trying to prepare a same version candidate so going to clean up existing branch <branch-${RELEASE_VERSION}> and tag <v${RELEASE_VERSION}-incubating> if any"
+ IS_SAME_VERSION=true
+ echo "You are trying to prepare a same version candidate so going to clean up existing branch <branch-${RELEASE_VERSION}> and tag <v${RELEASE_VERSION}-incubating> if exists"
continueprompt
git branch -d branch-${RELEASE_VERSION}
if [ $? -ne 0 ]; then
@@ -71,7 +72,6 @@ if [ "${RELEASE_VERSION}" == "${NEXT_RELEASE_VERSION}" ]; then
git push upstream --delete branch-${RELEASE_VERSION}
git tag -d v${RELEASE_VERSION}-incubating
git push upstream --delete v${RELEASE_VERSION}-incubating
- NEXT_VER_COMMIT_PREFIX="Stay version"
fi
echo "Preparing to create a branch branch-${RELEASE_VERSION} for release"
@@ -82,7 +82,7 @@ git checkout -b branch-${RELEASE_VERSION} || { echo "Create branch failed"; exit
mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${RELEASE_VERSION}-incubating
git commit . -m "Prepare for releasing ${RELEASE_VERSION}-incubating ${RELEASE_CANDIDATE_ID}"
-git tag -s v${RELEASE_VERSION}-incubating -m "Releasing ${RELEASE_VERSION}-incubating ${RELEASE_CANDIDATE_ID}"
+git tag -s v${RELEASE_VERSION}-incubating -m "Release ${RELEASE_VERSION}-incubating ${RELEASE_CANDIDATE_ID}"
rm -rf target/
git clean -xdf
@@ -129,8 +129,16 @@ continueprompt
git checkout master
git merge --no-ff branch-${RELEASE_VERSION}
-mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${NEXT_RELEASE_VERSION}-incubating-SNAPSHOT
-git commit . -m "${NEXT_VER_COMMIT_PREFIX} to ${NEXT_RELEASE_VERSION}-incubating-SNAPSHOT"
+
+if [ "$IS_SAME_VERSION" = true ]; then
+ NEXT_RELEASE_VERSION_POM="${RELEASE_VERSION}-incubating-SNAPSHOT"
+ NEXT_RELEASE_VERSION_COMMIT="Version ${RELEASE_VERSION}-incubating ${RELEASE_CANDIDATE_ID}"
+else
+ NEXT_RELEASE_VERSION_POM="${NEXT_RELEASE_VERSION}-incubating-SNAPSHOT"
+ NEXT_RELEASE_VERSION_COMMIT="Bump version to ${NEXT_RELEASE_VERSION}-incubating-SNAPSHOT"
+fi
+mvn versions:set -DgenerateBackupPoms=false -DnewVersion="${NEXT_RELEASE_VERSION_POM}"
+git commit . -m "${NEXT_RELEASE_VERSION_COMMIT}"
echo "Push release merge and new version to upstream."
continueprompt
[2/3] incubator-mnemonic git commit: MNEMONIC-252: Add mnemonic-spark
module to source-assembly.xml
Posted by ga...@apache.org.
MNEMONIC-252: Add mnemonic-spark module to source-assembly.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/commit/f7eaea8d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/tree/f7eaea8d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/diff/f7eaea8d
Branch: refs/heads/master
Commit: f7eaea8dfb6399f1d6a7bb3e7ce42f5384bf666e
Parents: f83c3a6
Author: Wang, Gang(Gary) <ga...@intel.com>
Authored: Thu Apr 27 15:42:59 2017 -0700
Committer: Wang, Gang(Gary) <ga...@intel.com>
Committed: Thu Apr 27 15:42:59 2017 -0700
----------------------------------------------------------------------
build-tools/source-assembly.xml | 41 ++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/f7eaea8d/build-tools/source-assembly.xml
----------------------------------------------------------------------
diff --git a/build-tools/source-assembly.xml b/build-tools/source-assembly.xml
index 6608e05..276e975 100644
--- a/build-tools/source-assembly.xml
+++ b/build-tools/source-assembly.xml
@@ -218,6 +218,47 @@
<outputDirectoryMapping>mnemonic-hadoop/${module.artifactId}</outputDirectoryMapping>
</sources>
</moduleSet>
+ <moduleSet>
+ <includes>
+ <include>org.apache.mnemonic:mnemonic-spark</include>
+ </includes>
+ <sources>
+ <fileSets>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>.</outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>dependency-reduced-pom.xml</exclude>
+ <exclude>**/*.dat</exclude>
+ <exclude>**/*.mne</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+ </sources>
+ </moduleSet>
+ <moduleSet>
+ <includes>
+ <include>org.apache.mnemonic:mnemonic-spark-core</include>
+ </includes>
+ <sources>
+ <fileSets>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>.</outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>dependency-reduced-pom.xml</exclude>
+ <exclude>**/*.dat</exclude>
+ <exclude>**/*.mne</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+ <outputDirectoryMapping>mnemonic-spark/${module.artifactId}</outputDirectoryMapping>
+ </sources>
+ </moduleSet>
</moduleSets>
<fileSets>
<fileSet>