incubator-lens git commit: LENS-172 : Fix generate site script (Raju Bairishetti via amareshwari)

[am...@apache.org]

Repository: incubator-lens
Updated Branches:
  refs/heads/master e7b92b271 -> 3aaccf64f


LENS-172 : Fix generate site script (Raju Bairishetti via amareshwari)


Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/3aaccf64
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/3aaccf64
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/3aaccf64

Branch: refs/heads/master
Commit: 3aaccf64f15146621914fd064c7e51f8d22274ba
Parents: e7b92b2
Author: Amareshwari Sriramdasu <am...@inmobi.com>
Authored: Thu Jan 22 10:45:52 2015 +0530
Committer: Amareshwari Sriramdasu <am...@inmobi.com>
Committed: Thu Jan 22 10:45:52 2015 +0530

----------------------------------------------------------------------
 src/site/apt/user/rest.apt            | 20 --------------------
 tools/scripts/generate-site-public.sh | 15 ++++++---------
 2 files changed, 6 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/3aaccf64/src/site/apt/user/rest.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user/rest.apt b/src/site/apt/user/rest.apt
deleted file mode 100644
index a71f56a..0000000
--- a/src/site/apt/user/rest.apt
+++ /dev/null
@@ -1,20 +0,0 @@
-~~
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements.  See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership.  The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License.  You may obtain a copy of the License at
-~~
-~~   http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied.  See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-~~
-
-Lens REST API Docs

http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/3aaccf64/tools/scripts/generate-site-public.sh
----------------------------------------------------------------------
diff --git a/tools/scripts/generate-site-public.sh b/tools/scripts/generate-site-public.sh
index 448962d..896726d 100755
--- a/tools/scripts/generate-site-public.sh
+++ b/tools/scripts/generate-site-public.sh
@@ -25,11 +25,9 @@ die() {
 }
 
 SVN_TARGET=$1
-REPO=https://git-wip-us.apache.org/repos/asf/incubator-lens.git
 TMP=/tmp/lens-site-stage
 STAGE=`pwd`/target/staging
 REST_DIR=`pwd`/lens-server/target/site/wsdocs
-IMAGES_DIR=`pwd`/src/site/apt/figures
 VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version|grep -Ev '(^\[|Download\w+:)' || die "unable to get version")
 
 
@@ -47,11 +45,9 @@ echo "Site gen complete"
 rm -rf $TMP || die "unable to clear $TMP"
 mkdir -p $TMP
 
-echo "Beginning push to gh-pages from " $CURR_BRANCH
 cd $TMP
 
 mkdir -p current || die "unable to create dir current"
-mkdir -p wsdocs || die "Unable to create dir for REST docs"
 mkdir -p versions/$VERSION || due "unable to create dir versions/$VERSION"
 
 find current -type f -exec git rm {} \;
@@ -61,10 +57,10 @@ echo "DELETE $REST_DIR/index.html"
 rm $REST_DIR/index.html
 echo "Copy enunciate documentation"
 cp -r $REST_DIR/* .
-echo "Copy images"
-cp -r $IMAGES_DIR . 
+cp -r $REST_DIR/* current/ || die "unable to copy REST to current"
+cp -r $REST_DIR/* versions/$VERSION/ || die "unable to copy REST to versions/$VERSION"
 echo "Copy MVN site"
-cp -r $STAGE/ . || die "unable to copy to base"
+cp -r $STAGE/ .
 echo "Copy docs to current/"
 cp -r $STAGE/ current/ || die "unable to copy to current"
 echo "Copy docs to version:" $VERSION
@@ -80,6 +76,7 @@ echo '</ul>' >> versions/index.html
 
 
 ## Copy entire doc directory to Apache SVN Target dir
-cp -r $TMP/ $SVN_TARGET/site/publish 
+mkdir -p $SVN_TARGET/site/publish
+cp -r $TMP/ $SVN_TARGET/site/publish
 cd $SVN_TARGET
-echo "Site gen complete. Ready to commit"
+echo "Generated site."