You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/03/12 15:29:50 UTC
[1/2] incubator-tinkerpop git commit: worked on TODOs in
publish-docs.sh
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 723b88e77 -> 4fda334ea
worked on TODOs in publish-docs.sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/41a62404
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/41a62404
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/41a62404
Branch: refs/heads/master
Commit: 41a6240414262643f93e5438e27603fb22c43ead
Parents: 723b88e
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Mar 12 15:05:00 2015 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Mar 12 15:05:00 2015 +0100
----------------------------------------------------------------------
bin/publish-docs.sh | 48 ++++++++++++++++++++++++++++--------------------
1 file changed, 28 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/41a62404/bin/publish-docs.sh
----------------------------------------------------------------------
diff --git a/bin/publish-docs.sh b/bin/publish-docs.sh
index d1900bc..e6d4271 100755
--- a/bin/publish-docs.sh
+++ b/bin/publish-docs.sh
@@ -19,32 +19,40 @@
# under the License.
#
-# TODO: i guess this script should take arguments for svn username/password. svn commands should probably run with --non-interactive option
-USERNAME=XXX
+USERNAME=$1
+PASSWORD=$2
+
+if [ "${USERNAME}" == "" -o "${PASSWORD}" == "" ]; then
+ echo "Please provide a SVN username and password."
+ echo -e "\nUsage:\n\t$0 <username> <password>\n"
+ exit 1
+fi
+
+SVN_CMD="svn --no-auth-cache --non-interactive --username=${USERNAME} --password=${password}"
+VERSION=$(cat pom.xml | grep -a1 '<artifactId>tinkerpop</artifactId>' | grep '<version>' | grep -Po '(?<=>).*(?=<)')
+
rm -rf target
mkdir -p target/svn
-svn --no-auth-cache --username=$USERNAME co https://svn.apache.org/repos/asf/incubator/tinkerpop/site/ target/svn
+${SVN_CMD} co https://svn.apache.org/repos/asf/incubator/tinkerpop/site/ target/svn
-# TODO: how do we get the version number from the pom into this guy?
-# TODO: maybe this should be smart about checking for if directories exist before removing
-cd target/svn
-svn --no-auth-cache --username=$USERNAME rm site/docs/3.0.0-SNAPSHOT
-svn --no-auth-cache --username=$USERNAME rm site/javadocs/3.0.0-SNAPSHOT
-svn --no-auth-cache --username=$USERNAME commit . -m "Docs for TinkerPop 3.0.0-SNAPSHOT are being replaced."
-cd ../..
+pushd target/svn
+${SVN_CMD} rm "site/docs/${VERSION}"
+${SVN_CMD} rm "site/javadocs/${VERSION}"
+${SVN_CMD} commit . -m "Docs for TinkerPop ${VERSION} are being replaced."
+popd
docs/preprocessor/preprocess.sh && mvn process-resources -Dasciidoc
mvn process-resources -Djavadoc
-mkdir -p target/svn/site/docs/3.0.0-SNAPSHOT
-mkdir -p target/svn/site/javadocs/3.0.0-SNAPSHOT/core
-mkdir -p target/svn/site/javadocs/3.0.0-SNAPSHOT/full
+mkdir -p "target/svn/site/docs/${VERSION}"
+mkdir -p "target/svn/site/javadocs/${VERSION}/core"
+mkdir -p "target/svn/site/javadocs/${VERSION}/full"
-cp -R target/docs/htmlsingle/. target/svn/site/docs/3.0.0-SNAPSHOT
-cp -R target/site/apidocs/core/. target/svn/site/javadocs/3.0.0-SNAPSHOT/core
-cp -R target/site/apidocs/full/. target/svn/site/javadocs/3.0.0-SNAPSHOT/full
+cp -R target/docs/htmlsingle/. "target/svn/site/docs/${VERSION}"
+cp -R target/site/apidocs/core/. "target/svn/site/javadocs/${VERSION}/core"
+cp -R target/site/apidocs/full/. "target/svn/site/javadocs/${VERSION}/full"
-cd target/svn
-svn --no-auth-cache --username=$USERNAME add * --force
-svn --no-auth-cache --username=$USERNAME commit -m "Deploy docs for TinkerPop 3.0.0-SNAPSHOT"
-cd ../..
\ No newline at end of file
+pushd target/svn
+${SVN_CMD} add * --force
+${SVN_CMD} commit -m "Deploy docs for TinkerPop ${VERSION}"
+popd
[2/2] incubator-tinkerpop git commit: Removed password requirement
for publish-docs.sh and returned to interactive mode.
Posted by sp...@apache.org.
Removed password requirement for publish-docs.sh and returned to interactive mode.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/4fda334e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/4fda334e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/4fda334e
Branch: refs/heads/master
Commit: 4fda334eaab7dac3ebe07829109e1ec642073b37
Parents: 41a6240
Author: Stephen Mallette <sp...@apache.org>
Authored: Thu Mar 12 10:29:25 2015 -0400
Committer: Stephen Mallette <sp...@apache.org>
Committed: Thu Mar 12 10:29:25 2015 -0400
----------------------------------------------------------------------
README.asciidoc | 2 +-
bin/publish-docs.sh | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4fda334e/README.asciidoc
----------------------------------------------------------------------
diff --git a/README.asciidoc b/README.asciidoc
index 8b3f933..5bd183b 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -37,7 +37,7 @@ Building and Testing
* Build AsciiDocs: `docs/preprocessor/preprocess.sh && mvn process-resources -Dasciidoc`
* Build JavaDocs: `mvn process-resources -Djavadoc`
* Check for Apache License headers: `mvn apache-rat:check`
-* Deploy JavaDocs/AsciiDocs: `bin/publish-docs.sh username password`
+* Deploy JavaDocs/AsciiDocs: `bin/publish-docs.sh svn-username`
* Deploy Zip Archives: `mvn deploy -Darchives`
* Integration Tests: `mvn verify -DskipIntegrationTests=false`
* Performance Tests: `mvn verify -DskipPerformanceTests=false`
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4fda334e/bin/publish-docs.sh
----------------------------------------------------------------------
diff --git a/bin/publish-docs.sh b/bin/publish-docs.sh
index e6d4271..e56927d 100755
--- a/bin/publish-docs.sh
+++ b/bin/publish-docs.sh
@@ -20,15 +20,14 @@
#
USERNAME=$1
-PASSWORD=$2
-if [ "${USERNAME}" == "" -o "${PASSWORD}" == "" ]; then
- echo "Please provide a SVN username and password."
- echo -e "\nUsage:\n\t$0 <username> <password>\n"
+if [ "${USERNAME}" == "" ]; then
+ echo "Please provide a SVN username."
+ echo -e "\nUsage:\n\t$0 <username>\n"
exit 1
fi
-SVN_CMD="svn --no-auth-cache --non-interactive --username=${USERNAME} --password=${password}"
+SVN_CMD="svn --no-auth-cache --username=${USERNAME}"
VERSION=$(cat pom.xml | grep -a1 '<artifactId>tinkerpop</artifactId>' | grep '<version>' | grep -Po '(?<=>).*(?=<)')
rm -rf target