This is an automated email from the ASF dual-hosted git repository.
yzhao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mnemonic.git
The following commit(s) were added to refs/heads/master by this push:
new d2f742e MNEMONIC-591: Rename bin folder to tools
d2f742e is described below
commit d2f742eb6a225ac21d5b095ba0a06487e8bb4600
Author: Xiaojin Jiao <[email protected]>
AuthorDate: Sat Jan 23 17:56:21 2021 -0800
MNEMONIC-591: Rename bin folder to tools
Signed-off-by: Xiaojin Jiao <[email protected]>
---
.circleci/config.yml | 2 +-
docker/docker-CentOS/Dockerfile | 2 +-
docker/docker-Ubuntu/Dockerfile | 2 +-
mnemonic-benches/mnemonic-spark-kmeans-bench/README.md | 2 +-
pom.xml | 16 ++++++++--------
{bin => tools}/bundle.sh | 0
{bin => tools}/find-mnemonic-home.sh | 0
{bin => tools}/mnemonic-checkstyle.xml | 0
{bin => tools}/release.sh | 2 +-
{bin => tools}/runTestCases.py | 3 +--
{bin => tools}/runall.sh | 2 +-
{bin => tools}/source-assembly.xml | 2 +-
{bin => tools}/suppressions.xml | 0
{bin => tools}/test.conf | 0
14 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 724ccd9..7adc203 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -37,4 +37,4 @@ jobs:
git clean -xdf
mvn clean install
# the runall cannot be fulfilled using free plan since it needs more
resource to run.
-# bin/runall.sh
\ No newline at end of file
+# tools/runall.sh
diff --git a/docker/docker-CentOS/Dockerfile b/docker/docker-CentOS/Dockerfile
index 85b8a1f..3336361 100644
--- a/docker/docker-CentOS/Dockerfile
+++ b/docker/docker-CentOS/Dockerfile
@@ -39,6 +39,6 @@ RUN git clone https://github.com/apache/mnemonic.git && \
ENV MNEMONIC_HOME /ws/mnemonic
-#RUN cd /ws/mnemonic && bin/runall.sh -y
+#RUN cd /ws/mnemonic && tools/runall.sh -y
CMD ["bash"]
diff --git a/docker/docker-Ubuntu/Dockerfile b/docker/docker-Ubuntu/Dockerfile
index ee7423e..4bb7e0e 100644
--- a/docker/docker-Ubuntu/Dockerfile
+++ b/docker/docker-Ubuntu/Dockerfile
@@ -38,6 +38,6 @@ RUN git clone https://github.com/apache/mnemonic.git && \
ENV MNEMONIC_HOME /ws/mnemonic
-#RUN cd /ws/mnemonic && bin/runall.sh -y
+#RUN cd /ws/mnemonic && tools/runall.sh -y
CMD ["bash"]
diff --git a/mnemonic-benches/mnemonic-spark-kmeans-bench/README.md
b/mnemonic-benches/mnemonic-spark-kmeans-bench/README.md
index 2fc16c6..a953388 100644
--- a/mnemonic-benches/mnemonic-spark-kmeans-bench/README.md
+++ b/mnemonic-benches/mnemonic-spark-kmeans-bench/README.md
@@ -2,7 +2,7 @@
```bash
- $ bin/gen_data.py <the number of dimensions> <the number of vectors> [-s
seed]
+ $ tools/gen_data.py <the number of dimensions> <the number of vectors> [-s
seed]
```
diff --git a/pom.xml b/pom.xml
index 25ee644..4e6b9b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
<memory.service.dist.dir>${root.dir}/mnemonic-memory-services/service-dist</memory.service.dist.dir>
<computing.service.dist.dir>${root.dir}/mnemonic-computing-services/service-dist</computing.service.dist.dir>
<github.global.server>github</github.global.server>
- <buildtools.dir>${basedir}/bin</buildtools.dir>
+ <buildtools.dir>${basedir}/tools</buildtools.dir>
<gpg.keyname>apache.org</gpg.keyname>
<slf4j.version>1.7.21</slf4j.version>
<log4j.version>1.2.17</log4j.version>
@@ -296,8 +296,8 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.0.0</version>
<configuration>
- <configLocation>bin/mnemonic-checkstyle.xml</configLocation>
- <suppressionsLocation>bin/suppressions.xml</suppressionsLocation>
+ <configLocation>tools/mnemonic-checkstyle.xml</configLocation>
+ <suppressionsLocation>tools/suppressions.xml</suppressionsLocation>
<suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<encoding>UTF-8</encoding>
@@ -475,22 +475,22 @@
<id>activate-buildtools-in-module</id>
<activation>
<file>
- <exists>${basedir}/../bin/mnemonic-checkstyle.xml</exists>
+ <exists>${basedir}/../tools/mnemonic-checkstyle.xml</exists>
</file>
</activation>
<properties>
- <buildtools.dir>${basedir}/../bin</buildtools.dir>
+ <buildtools.dir>${basedir}/../tools</buildtools.dir>
</properties>
</profile>
<profile>
<id>activate-buildtools-in-submodule</id>
<activation>
<file>
- <exists>${basedir}/../../bin/mnemonic-checkstyle.xml</exists>
+ <exists>${basedir}/../../tools/mnemonic-checkstyle.xml</exists>
</file>
</activation>
<properties>
- <buildtools.dir>${basedir}/../../bin</buildtools.dir>
+ <buildtools.dir>${basedir}/../../tools</buildtools.dir>
</properties>
</profile>
@@ -513,7 +513,7 @@
<configuration>
<finalName>apache-mnemonic-${project.version}</finalName>
<descriptors>
- <descriptor>bin/source-assembly.xml</descriptor>
+ <descriptor>tools/source-assembly.xml</descriptor>
</descriptors>
</configuration>
</plugin>
diff --git a/bin/bundle.sh b/tools/bundle.sh
similarity index 100%
rename from bin/bundle.sh
rename to tools/bundle.sh
diff --git a/bin/find-mnemonic-home.sh b/tools/find-mnemonic-home.sh
similarity index 100%
rename from bin/find-mnemonic-home.sh
rename to tools/find-mnemonic-home.sh
diff --git a/bin/mnemonic-checkstyle.xml b/tools/mnemonic-checkstyle.xml
similarity index 100%
rename from bin/mnemonic-checkstyle.xml
rename to tools/mnemonic-checkstyle.xml
diff --git a/bin/release.sh b/tools/release.sh
similarity index 98%
rename from bin/release.sh
rename to tools/release.sh
index 3c000c6..b38628f 100755
--- a/bin/release.sh
+++ b/tools/release.sh
@@ -84,7 +84,7 @@ build_candidate_branch() {
pushd ${RELEASEBASENAME} || { echo "Unpacked source directory does not
exist"; exit 90; }
mvn clean install || { echo "Failed to compile the packaged source
artifact"; exit 100; }
if [ "${SKIP_TEST_RUN}" == "no" ]; then
- python bin/runTestCases.py || { echo "Failed to verify the packaged
source artifact"; exit 110; }
+ python tools/runTestCases.py || { echo "Failed to verify the packaged
source artifact"; exit 110; }
fi
popd
rm -rf ${RELEASEBASENAME}/
diff --git a/bin/runTestCases.py b/tools/runTestCases.py
similarity index 98%
rename from bin/runTestCases.py
rename to tools/runTestCases.py
index 1fe64a8..c4c1692 100755
--- a/bin/runTestCases.py
+++ b/tools/runTestCases.py
@@ -28,7 +28,7 @@ if not os.path.exists(testLogDir):
os.makedirs(testLogDir)
cleanupCmd = r'find mnemonic-* -type f \( -name "*.mne" -o -name "*.dat" \)
-exec rm {} \;'
-testCmdFile = 'bin/test.conf'
+testCmdFile = 'tools/test.conf'
tcCmdReg = re.compile('^mvn\s.*$')
tcNameReg = re.compile('-D(?:test|suites)=(.+?)\s')
tcModuleReg = re.compile('-pl\s(.+?)\s')
@@ -51,4 +51,3 @@ with open(testCmdFile) as fp:
else:
print("[WARN] JAR file not found in " +
tcNameReg.findall(line)[0] + " test case for \"" + tcModuleReg.findall(line)[0]
+ "\".")
print("[DONE] All test cases are completed! Log files are available under
folder testlog.")
-
diff --git a/bin/runall.sh b/tools/runall.sh
similarity index 97%
rename from bin/runall.sh
rename to tools/runall.sh
index 3318346..fd79a43 100755
--- a/bin/runall.sh
+++ b/tools/runall.sh
@@ -81,6 +81,6 @@ then
fi
echo [SUCCESS] Mnemonic example is completed!
-python bin/runTestCases.py || { echo "Test failed"; exit 33; }
+python tools/runTestCases.py || { echo "Test failed"; exit 33; }
popd
diff --git a/bin/source-assembly.xml b/tools/source-assembly.xml
similarity index 99%
rename from bin/source-assembly.xml
rename to tools/source-assembly.xml
index f94b8c2..7a58c45 100644
--- a/bin/source-assembly.xml
+++ b/tools/source-assembly.xml
@@ -276,7 +276,7 @@
<include>DISCLAIMER*</include>
<include>KEYS</include>
<include>pom.xml</include>
- <include>bin/**</include>
+ <include>tools/**</include>
<include>docker/**</include>
<include>gradle/**</include>
<include>settings.gradle</include>
diff --git a/bin/suppressions.xml b/tools/suppressions.xml
similarity index 100%
rename from bin/suppressions.xml
rename to tools/suppressions.xml
diff --git a/bin/test.conf b/tools/test.conf
similarity index 100%
rename from bin/test.conf
rename to tools/test.conf
