This is an automated email from the ASF dual-hosted git repository.
shuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/unomi.git
The following commit(s) were added to refs/heads/master by this push:
new 8935ec6dd Update scripts to be able to release snapshots of current
documentation
8935ec6dd is described below
commit 8935ec6dd09377bf5fd4b67292039b776f3db37a
Author: Serge Huber <shu...@jahia.com>
AuthorDate: Tue Apr 18 11:17:35 2023 +0200
Update scripts to be able to release snapshots of current documentation
---
generate-site-and-upload.sh | 33 +++++++++++++++++----------------
generate-site.sh | 7 +++++--
2 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/generate-site-and-upload.sh b/generate-site-and-upload.sh
index debe3563e..ec665b047 100755
--- a/generate-site-and-upload.sh
+++ b/generate-site-and-upload.sh
@@ -19,8 +19,9 @@
################################################################################
if [ $# -ne 4 ]
then
- echo "Illegal number of arguments supplied. Syntax should be
generate-site-and-upload.sh X_X_X X.X.X SVNusername SVNpassword "
- echo "Example: ./generate-site-and-upload.sh 2_0_x 2.0.1 user password"
+ echo "Illegal number of arguments supplied. Syntax should be
generate-site-and-upload.sh X_X_X X.X.X SVNusername SVNpassword"
+ echo "Where X_X_X is either the release branch name or master"
+ echo "Example: ./generate-site-and-upload.sh 2_0_x 2.0.1 user password
./generate-site.sh master 2.3.0-SNAPSHOT user password for updating the master
snapshot version"
exit 1
fi
echo Setting up environment...
@@ -45,19 +46,19 @@ echo Committing documentation to Apache SVN...
mvn scm-publish:publish-scm
-Dscmpublish.pubScmUrl=scm:svn:https://svn.apache.org/repos/asf/unomi/website/manual
-Dscmpublish.content=target/staging/manual -Dusername=$SVN_USERNAME
-Dpassword=$SVN_PASSWORD
if [ "$LOCAL_BRANCH_NAME" == "master" ]; then
mvn scm-publish:publish-scm
-Dscmpublish.pubScmUrl=scm:svn:https://svn.apache.org/repos/asf/unomi/website/unomi-api
-Dscmpublish.content=target/staging/unomi-api -Dusername=$SVN_USERNAME
-Dpassword=$SVN_PASSWORD
+else
+ echo "Committing manual to Apache Dist SVN..."
+ pushd manual/target
+ svn co https://dist.apache.org/repos/dist/release/unomi/$VERSION
+ mv unomi-manual-$BRANCH_NAME.pdf $VERSION
+ mv unomi-manual-$BRANCH_NAME.pdf.asc $VERSION
+ mv unomi-manual-$BRANCH_NAME.zip $VERSION
+ mv unomi-manual-$BRANCH_NAME.pdf.sha512 $VERSION
+ mv unomi-manual-$BRANCH_NAME.zip.asc $VERSION
+ mv unomi-manual-$BRANCH_NAME.zip.sha512 $VERSION
+ cd $VERSION
+ svn add unomi-manual*
+ svn commit -m "Update Unomi manual packages for version ${VERSION}"
+ popd
fi
-
-echo "Committing manual to Apache Dist SVN..."
-pushd manual/target
-svn co https://dist.apache.org/repos/dist/release/unomi/$VERSION
-mv unomi-manual-$BRANCH_NAME.pdf $VERSION
-mv unomi-manual-$BRANCH_NAME.pdf.asc $VERSION
-mv unomi-manual-$BRANCH_NAME.zip $VERSION
-mv unomi-manual-$BRANCH_NAME.pdf.sha512 $VERSION
-mv unomi-manual-$BRANCH_NAME.zip.asc $VERSION
-mv unomi-manual-$BRANCH_NAME.zip.sha512 $VERSION
-cd $VERSION
-svn add unomi-manual*
-svn commit -m "Update Unomi manual packages for version ${VERSION}"
-popd
echo Documentation generation and upload completed.
diff --git a/generate-site.sh b/generate-site.sh
index 6dcf2fb10..8a3fca8ef 100755
--- a/generate-site.sh
+++ b/generate-site.sh
@@ -20,7 +20,8 @@
if [ $# -ne 2 ]
then
echo "Illegal number of arguments supplied. Syntax should be
generate-site.sh X_X_X X.X.X"
- echo "Example: ./generate.sh 2_0_x 2.0.1"
+ echo "Where X_X_X is either the release branch name or master"
+ echo "Example: ./generate-site.sh 2_0_x 2.0.1 or ./generate-site.sh master
2.3.0-SNAPSHOT for updating the master snapshot version"
exit 1
fi
echo Setting up environment...
@@ -41,7 +42,9 @@ echo Git local branch: ${LOCAL_BRANCH_NAME}
echo Generating manual for branch ${RELEASE_BRANCH_NAME} and version
${RELEASE_VERSION}...
mvn clean
pushd manual
-mvn -Ddoc.archive=true
-Ddoc.output.pdf=target/generated-docs/pdf/$RELEASE_BRANCH_NAME
-Ddoc.output.html=target/generated-docs/html/$RELEASE_BRANCH_NAME
-Ddoc.version=$RELEASE_BRANCH_NAME -P sign install
+if [ "$RELEASE_BRANCH_NAME" != "master" ]; then
+ mvn -Ddoc.archive=true
-Ddoc.output.pdf=target/generated-docs/pdf/$RELEASE_BRANCH_NAME
-Ddoc.output.html=target/generated-docs/html/$RELEASE_BRANCH_NAME
-Ddoc.version=$RELEASE_BRANCH_NAME -P sign install
+fi
mvn -P sign install
# If not on master branch we remove the latest directories
if [ "$LOCAL_BRANCH_NAME" != "master" ]; then
