Get rid of redundant cloning of own repository

.travis.sh

@@ -10,32 +10,9 @@ then
 fi
 
 WORKING_DIR="`pwd`/work"
-CHECKOUT_DIR=$WORKING_DIR/checkout
 RESULT_DIR=$WORKING_DIR/result
 
-GIT_URL1=https://github.com/jacoco/www.eclemma.org.git
-CHECKOUT_PATH1=$CHECKOUT_DIR/www.eclemma.org
-BRANCH1=master
-
-GIT_URL2=https://github.com/eclipse/eclemma.git
-CHECKOUT_PATH2=$CHECKOUT_DIR/eclemma
-BRANCH2=v3.1.2
-
-rm -fr $WORKING_DIR
-mkdir $WORKING_DIR
-
-git clone -- $GIT_URL1 $CHECKOUT_PATH1
-cd $CHECKOUT_PATH1
-git checkout $BRANCH1
-
-git clone -- $GIT_URL2 $CHECKOUT_PATH2
-cd $CHECKOUT_PATH2
-git checkout $BRANCH2
-
-
-cd $CHECKOUT_PATH1
-python generator/eclemmasite.py $RESULT_DIR
-
+./render.sh
 
 TEMP=/tmp/jacoco-snapshot
 mkdir $TEMP

generator/eclemmasite.py

@@ -39,25 +39,25 @@
 site.item('images/jacocoreport.png', File('content/images/jacocoreport.png'))
 site.item('images/sonarqube.png', File('content/images/sonarqube.png'))
 
-site.item('userdoc/index.html', Page('../eclemma/org.eclipse.eclemma.doc/pages/userguide.html'))
-site.item('userdoc/launching.html', Page('../eclemma/org.eclipse.eclemma.doc/pages/launching.html'))
-site.item('userdoc/coverageview.html', Page('../eclemma/org.eclipse.eclemma.doc/pages/coverageview.html'))
-site.item('userdoc/annotations.html', Page('../eclemma/org.eclipse.eclemma.doc/pages/annotations.html'))
-site.item('userdoc/coverageproperties.html', Page('../eclemma/org.eclipse.eclemma.doc/pages/coverageproperties.html'))
-site.item('userdoc/decorators.html', Page('../eclemma/org.eclipse.eclemma.doc/pages/decorators.html'))
-site.item('userdoc/sessions.html', Page('../eclemma/org.eclipse.eclemma.doc/pages/sessions.html'))
-site.item('userdoc/importexport.html', Page('../eclemma/org.eclipse.eclemma.doc/pages/importexport.html'))
-site.item('userdoc/keyboard.html', Page('../eclemma/org.eclipse.eclemma.doc/pages/keyboard.html'))
-site.item('userdoc/preferences.html', Page('../eclemma/org.eclipse.eclemma.doc/pages/preferences.html'))
-
-site.item('userdoc/images/annotations.png', File('../eclemma/org.eclipse.eclemma.doc/pages/images/annotations.png'))
-site.item('userdoc/images/coverageproperties.png', File('../eclemma/org.eclipse.eclemma.doc/pages/images/coverageproperties.png'))
-site.item('userdoc/images/coverageview.png', File('../eclemma/org.eclipse.eclemma.doc/pages/images/coverageview.png'))
-site.item('userdoc/images/coverageviewtools.png', File('../eclemma/org.eclipse.eclemma.doc/pages/images/coverageviewtools.png'))
-site.item('userdoc/images/coverageviewmenu.png', File('../eclemma/org.eclipse.eclemma.doc/pages/images/coverageviewmenu.png'))
-site.item('userdoc/images/launchdialog.png', File('../eclemma/org.eclipse.eclemma.doc/pages/images/launchdialog.png'))
-site.item('userdoc/images/decorators.png', File('../eclemma/org.eclipse.eclemma.doc/pages/images/decorators.png'))
-site.item('userdoc/images/launchtoolbar.gif', File('../eclemma/org.eclipse.eclemma.doc/pages/images/launchtoolbar.gif'))
+site.item('userdoc/index.html', Page('work/checkout/eclemma/org.eclipse.eclemma.doc/pages/userguide.html'))
+site.item('userdoc/launching.html', Page('work/checkout/eclemma/org.eclipse.eclemma.doc/pages/launching.html'))
+site.item('userdoc/coverageview.html', Page('work/checkout/eclemma/org.eclipse.eclemma.doc/pages/coverageview.html'))
+site.item('userdoc/annotations.html', Page('work/checkout/eclemma/org.eclipse.eclemma.doc/pages/annotations.html'))
+site.item('userdoc/coverageproperties.html', Page('work/checkout/eclemma/org.eclipse.eclemma.doc/pages/coverageproperties.html'))
+site.item('userdoc/decorators.html', Page('work/checkout/eclemma/org.eclipse.eclemma.doc/pages/decorators.html'))
+site.item('userdoc/sessions.html', Page('work/checkout/eclemma/org.eclipse.eclemma.doc/pages/sessions.html'))
+site.item('userdoc/importexport.html', Page('work/checkout/eclemma/org.eclipse.eclemma.doc/pages/importexport.html'))
+site.item('userdoc/keyboard.html', Page('work/checkout/eclemma/org.eclipse.eclemma.doc/pages/keyboard.html'))
+site.item('userdoc/preferences.html', Page('work/checkout/eclemma/org.eclipse.eclemma.doc/pages/preferences.html'))
+
+site.item('userdoc/images/annotations.png', File('work/checkout/eclemma/org.eclipse.eclemma.doc/pages/images/annotations.png'))
+site.item('userdoc/images/coverageproperties.png', File('work/checkout/eclemma/org.eclipse.eclemma.doc/pages/images/coverageproperties.png'))
+site.item('userdoc/images/coverageview.png', File('work/checkout/eclemma/org.eclipse.eclemma.doc/pages/images/coverageview.png'))
+site.item('userdoc/images/coverageviewtools.png', File('work/checkout/eclemma/org.eclipse.eclemma.doc/pages/images/coverageviewtools.png'))
+site.item('userdoc/images/coverageviewmenu.png', File('work/checkout/eclemma/org.eclipse.eclemma.doc/pages/images/coverageviewmenu.png'))
+site.item('userdoc/images/launchdialog.png', File('work/checkout/eclemma/org.eclipse.eclemma.doc/pages/images/launchdialog.png'))
+site.item('userdoc/images/decorators.png', File('work/checkout/eclemma/org.eclipse.eclemma.doc/pages/images/decorators.png'))
+site.item('userdoc/images/launchtoolbar.gif', File('work/checkout/eclemma/org.eclipse.eclemma.doc/pages/images/launchtoolbar.gif'))
 
 site.item('resources.html', Page('content/resources.html'))
 
@@ -73,9 +73,9 @@
 site.item('jacoco/index.html',        Page('content/jacoco/index.html'))
 
 site.item('support.html', Page('content/support.html'))
-site.item('faq.html',     Page('../eclemma/org.eclipse.eclemma.doc/pages/faq.html'))
-site.item('changes.html', Page('../eclemma/org.eclipse.eclemma.doc/pages/changes.html'))
-site.item('license.html', Page('../eclemma/org.eclipse.eclemma.doc/pages/legal.html'))
+site.item('faq.html',     Page('work/checkout/eclemma/org.eclipse.eclemma.doc/pages/faq.html'))
+site.item('changes.html', Page('work/checkout/eclemma/org.eclipse.eclemma.doc/pages/changes.html'))
+site.item('license.html', Page('work/checkout/eclemma/org.eclipse.eclemma.doc/pages/legal.html'))
 site.item('contact.html', Page('content/contact.html'))
 
 # Site Structure

render.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+WORKING_DIR="`pwd`/work"
+CHECKOUT_DIR=$WORKING_DIR/checkout
+RESULT_DIR=$WORKING_DIR/result
+
+GIT_URL_ECLEMMA=https://github.com/eclipse/eclemma.git
+CHECKOUT_PATH_ECLEMMA=$CHECKOUT_DIR/eclemma
+BRANCH_ECLEMMA=v3.1.2
+
+rm -fr $WORKING_DIR
+mkdir $WORKING_DIR
+
+git clone -- $GIT_URL_ECLEMMA $CHECKOUT_PATH_ECLEMMA
+git -C $CHECKOUT_PATH_ECLEMMA checkout $BRANCH_ECLEMMA
+
+python generator/eclemmasite.py $RESULT_DIR
+