From 6ffbb74268d9a37018a030df71ed6459d86e7afc Mon Sep 17 00:00:00 2001
From: Denis Arrivault <denis.arrivault@lif.univ-mrs.fr>
Date: Wed, 18 Jul 2018 14:48:58 +0200
Subject: [PATCH] Managing index.html thanks to project properties
---
.gitlab-ci.yml | 2 +-
.travis.yml | 4 ++--
build.gradle | 12 ++++++------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57d7194..b5ffa90 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,7 +46,7 @@ pages:
- mkdir -p public/Tests_Results && cp -r build/reports/tests/test/* public/Tests_Results/
- mkdir -p public/Jacoco && cp -r build/jacocoHtml/* public/Jacoco/
- mkdir -p public/Javadoc && cp -r build/docs/javadoc/* public/Javadoc/
- - cp -r `ls -t build/libs/ImmutableComplex*.jar | head -1` public/ImmutableComplex.jar
+ - cp -r `ls -t build/libs/ImmutableComplex*.jar | head -1` public/
artifacts:
paths:
- public
diff --git a/.travis.yml b/.travis.yml
index e31f939..b6997d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,11 +18,11 @@ script:
- ./gradlew run
- ./gradlew javadoc
- ./gradlew jar
- - mkdir -p public/ && cp -r index_github.html public/index.html
+ - mkdir -p public/ && cp -r index.html public/
- mkdir -p public/Tests_Results && cp -r build/reports/tests/test/* public/Tests_Results/
- mkdir -p public/Jacoco && cp -r build/jacocoHtml/* public/Jacoco/
- mkdir -p public/Javadoc && cp -r build/docs/javadoc/* public/Javadoc/
- - cp -r `ls -t build/libs/ImmutableComplex*.jar | head -1` public/ImmutableComplex.jar
+ - cp -r `ls -t build/libs/ImmutableComplex*.jar | head -1` public/
branches:
only:
diff --git a/build.gradle b/build.gradle
index 8919eef..1a6144b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,17 +62,17 @@ task formatIndex(type: Copy) {
into '.'
rename { String fileName -> fileName.replace("index_template.html", "index.html")}
// Substitute property references in files
- //expand(version: "${project.version}")
def remote = "git rev-parse --abbrev-ref --symbolic-full-name @{u}".execute().text.trim().split('/')[0]
def url = "git remote get-url $remote".execute().text.trim()
- def pageurl = ""
if(url.contains("github.com")){
- pageurl = "https://darrivau.github.io/Testproject"
+ project.ext."pageurl" = "https://darrivau.github.io/Testproject"
}
- if(url.contains("lis-lab.fr")){
- pageurl = "http://denis.arrivault.pages.lis-lab.fr/Test_Project"
+ else if(url.contains("lis-lab.fr")){
+ project.ext."pageurl" = "http://denis.arrivault.pages.lis-lab.fr/Test_Project"
+ }else{
+ project.ext."pageurl" = "${buildDir}/"
}
- println(pageurl)
+ expand project.properties
}
javadoc.finalizedBy formatIndex
--
GitLab