- Adminsys-commits - mailman.cloud.codelutin.com

r95 - scripts/redmine-tools
by tchemit＠users.forge.codelutin.com July 13, 2014

July 13, 2014

Author: tchemit Date: 2014-07-13 17:56:45 +0200 (Sun, 13 Jul 2014) New Revision: 95 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/95 Log: fix git message Modified: scripts/redmine-tools/redmine-post-commit-git.sh Modified: scripts/redmine-tools/redmine-post-commit-git.sh =================================================================== --- scripts/redmine-tools/redmine-post-commit-git.sh 2014-07-13 15:36:07 UTC (rev 94) +++ scripts/redmine-tools/redmine-post-commit-git.sh 2014-07-13 15:56:45 UTC (rev 95) @@ -20,7 +20,7 @@ # send post-commit email #(cd /var/lib/git/git-$DOMAIN/$PROJECT_NAME.git ; python /usr/local/lib/python2.6/dist-packages/git_multimail-1.0.0-py2.6.egg/git_multimail.py) -echo "Send email to commits-$PROJECT_NAME(a)list.$MAIL_DOMAIN" +echo "Send email to $PROJECT_NAME-commits(a)list.$MAIL_DOMAIN" (cd /var/lib/git/git-$DOMAIN/$PROJECT_NAME.git ; python /opt/git-tools/git-multimail-run.py) # touch project for nightly build

1 0

r94 - in forge-tools/sys: . chorem.org codelutin.com nuiton.org
by maven-release＠users.forge.codelutin.com July 13, 2014

July 13, 2014

Author: maven-release Date: 2014-07-13 17:36:07 +0200 (Sun, 13 Jul 2014) New Revision: 94 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/94 Log: refs #5428 (sur ci) Modified: forge-tools/sys/check-get-tomcat.sh forge-tools/sys/chorem.org/tomcat-init.d forge-tools/sys/codelutin.com/tomcat-init.d forge-tools/sys/nuiton.org/tomcat-init.d Modified: forge-tools/sys/check-get-tomcat.sh =================================================================== --- forge-tools/sys/check-get-tomcat.sh 2014-07-11 16:03:35 UTC (rev 93) +++ forge-tools/sys/check-get-tomcat.sh 2014-07-13 15:36:07 UTC (rev 94) @@ -86,4 +86,4 @@ fi } -update 7 +update 8 Modified: forge-tools/sys/chorem.org/tomcat-init.d =================================================================== --- forge-tools/sys/chorem.org/tomcat-init.d 2014-07-11 16:03:35 UTC (rev 93) +++ forge-tools/sys/chorem.org/tomcat-init.d 2014-07-13 15:36:07 UTC (rev 94) @@ -27,7 +27,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin DESC="Tomcat servlet engine" DAEMON=/usr/bin/jsvc -CATALINA_HOME=/opt/apache-tomcat-7 +CATALINA_HOME=/opt/apache-tomcat-8 DEFAULT=/etc/default/$NAME LOG=/var/log/$NAME.log CATALINA_BASE=/var/local/forge/exec/$NAME Modified: forge-tools/sys/codelutin.com/tomcat-init.d =================================================================== --- forge-tools/sys/codelutin.com/tomcat-init.d 2014-07-11 16:03:35 UTC (rev 93) +++ forge-tools/sys/codelutin.com/tomcat-init.d 2014-07-13 15:36:07 UTC (rev 94) @@ -27,7 +27,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin DESC="Tomcat servlet engine" DAEMON=/usr/bin/jsvc -CATALINA_HOME=/opt/apache-tomcat-7 +CATALINA_HOME=/opt/apache-tomcat-8 DEFAULT=/etc/default/$NAME LOG=/var/log/$NAME.log CATALINA_BASE=/var/local/forge/exec/$NAME Modified: forge-tools/sys/nuiton.org/tomcat-init.d =================================================================== --- forge-tools/sys/nuiton.org/tomcat-init.d 2014-07-11 16:03:35 UTC (rev 93) +++ forge-tools/sys/nuiton.org/tomcat-init.d 2014-07-13 15:36:07 UTC (rev 94) @@ -27,7 +27,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin DESC="Tomcat servlet engine" DAEMON=/usr/bin/jsvc -CATALINA_HOME=/opt/apache-tomcat-7 +CATALINA_HOME=/opt/apache-tomcat-8 DEFAULT=/etc/default/$NAME LOG=/var/log/$NAME.log CATALINA_BASE=/var/local/forge/exec/$NAME

1 0

r93 - demo-tools/tomcat
by tchemit＠users.forge.codelutin.com July 11, 2014

July 11, 2014

Author: tchemit Date: 2014-07-11 18:03:35 +0200 (Fri, 11 Jul 2014) New Revision: 93 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/93 Log: fixes #5428: Install tomcat8 Modified: demo-tools/tomcat/check-get-tomcat.sh demo-tools/tomcat/deploy.cgi demo-tools/tomcat/tomcat-init.d Modified: demo-tools/tomcat/check-get-tomcat.sh =================================================================== --- demo-tools/tomcat/check-get-tomcat.sh 2014-07-04 13:15:32 UTC (rev 92) +++ demo-tools/tomcat/check-get-tomcat.sh 2014-07-11 16:03:35 UTC (rev 93) @@ -11,8 +11,8 @@ # - affiche le chemin des nouvelles instances mise en place si besoin # # l'administrateur devra alors faire un -# - /etc/init.d/tomcat stop [6|7] -# - /etc/init.d/tomcat start [6|7] +# - /etc/init.d/tomcat stop [6|7|8] +# - /etc/init.d/tomcat start [6|7|8] # DEBUG=false @@ -91,3 +91,4 @@ update 6 update 7 +update 8 \ No newline at end of file Modified: demo-tools/tomcat/deploy.cgi =================================================================== --- demo-tools/tomcat/deploy.cgi 2014-07-04 13:15:32 UTC (rev 92) +++ demo-tools/tomcat/deploy.cgi 2014-07-11 16:03:35 UTC (rev 93) @@ -60,7 +60,7 @@ else: TOMCAT_VERSION=7 else: - TOMCAT_VERSION_UNIVERSE = ['6','7'] + TOMCAT_VERSION_UNIVERSE = ['6','7','8'] if not TOMCAT_VERSION in TOMCAT_VERSION_UNIVERSE: print "<h1>TOMCAT_VERSION must be in %s but was <strong>%s</strong></h1>" % (TOMCAT_VERSION_UNIVERSE, TOMCAT_VERSION) sys.exit() Modified: demo-tools/tomcat/tomcat-init.d =================================================================== --- demo-tools/tomcat/tomcat-init.d 2014-07-04 13:15:32 UTC (rev 92) +++ demo-tools/tomcat/tomcat-init.d 2014-07-11 16:03:35 UTC (rev 93) @@ -310,9 +310,9 @@ # ACTION ACTION=$1 -# 6|7|all +# 6|7|8|all TOMCAT_VERSION=${2:-all} -TOMCAT_VERSION=${TOMCAT_VERSION/all/6 7} +TOMCAT_VERSION=${TOMCAT_VERSION/all/6 7 8} # stable|staging|latest|all TOMCAT_INSTANCE=${3:-all} TOMCAT_INSTANCE=${TOMCAT_INSTANCE/all/stable staging latest}

1 0

r92 - in forge-tools/sys: chorem.org codelutin.com nuiton.org
by maven-release＠users.forge.codelutin.com July 4, 2014

July 4, 2014

Author: maven-release Date: 2014-07-04 15:15:32 +0200 (Fri, 04 Jul 2014) New Revision: 92 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/92 Log: use jdk8 Modified: forge-tools/sys/chorem.org/tomcat-default forge-tools/sys/chorem.org/tomcat-init.d forge-tools/sys/codelutin.com/tomcat-default forge-tools/sys/codelutin.com/tomcat-init.d forge-tools/sys/nuiton.org/tomcat-default forge-tools/sys/nuiton.org/tomcat-init.d Modified: forge-tools/sys/chorem.org/tomcat-default =================================================================== --- forge-tools/sys/chorem.org/tomcat-default 2014-06-25 16:46:09 UTC (rev 91) +++ forge-tools/sys/chorem.org/tomcat-default 2014-07-04 13:15:32 UTC (rev 92) @@ -1,4 +1,4 @@ -export JAVA_HOME=/opt/jdk7 +export JAVA_HOME=/opt/jdk export JAVA_OPTS="-XX:MaxPermSize=256m -Xmx448m -Dhudson.DNSMultiCast.disabled=true -Djava.awt.headless=true -Dsvnkit.http.sslProtocols="SSLv3"" export JENKINS_HOME=/var/local/forge/data/chorem.org/jenkins export ANDROID_HOME=/opt/android Modified: forge-tools/sys/chorem.org/tomcat-init.d =================================================================== --- forge-tools/sys/chorem.org/tomcat-init.d 2014-06-25 16:46:09 UTC (rev 91) +++ forge-tools/sys/chorem.org/tomcat-init.d 2014-07-04 13:15:32 UTC (rev 92) @@ -53,7 +53,7 @@ # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not # defined in $DEFAULT) -JDK_DIRS="/opt/jdk7 /usr/lib/jvm/default-java /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-cacao /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe" +JDK_DIRS="/opt/jdk /usr/lib/jvm/default-java /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-cacao /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe" # Look for the right JVM to use for jdir in $JDK_DIRS; do Modified: forge-tools/sys/codelutin.com/tomcat-default =================================================================== --- forge-tools/sys/codelutin.com/tomcat-default 2014-06-25 16:46:09 UTC (rev 91) +++ forge-tools/sys/codelutin.com/tomcat-default 2014-07-04 13:15:32 UTC (rev 92) @@ -1,4 +1,4 @@ -export JAVA_HOME=/opt/jdk7 +export JAVA_HOME=/opt/jdk export JAVA_OPTS="-XX:MaxPermSize=256m -Xmx448m -Dhudson.DNSMultiCast.disabled=true -Djava.awt.headless=true -Dsvnkit.http.sslProtocols="SSLv3"" export JENKINS_HOME=/var/local/forge/data/codelutin.com/jenkins export ANDROID_HOME=/opt/android Modified: forge-tools/sys/codelutin.com/tomcat-init.d =================================================================== --- forge-tools/sys/codelutin.com/tomcat-init.d 2014-06-25 16:46:09 UTC (rev 91) +++ forge-tools/sys/codelutin.com/tomcat-init.d 2014-07-04 13:15:32 UTC (rev 92) @@ -53,7 +53,7 @@ # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not # defined in $DEFAULT) -JDK_DIRS="/opt/jdk7 /usr/lib/jvm/default-java /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-cacao /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe" +JDK_DIRS="/opt/jdk /usr/lib/jvm/default-java /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-cacao /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe" # Look for the right JVM to use for jdir in $JDK_DIRS; do Modified: forge-tools/sys/nuiton.org/tomcat-default =================================================================== --- forge-tools/sys/nuiton.org/tomcat-default 2014-06-25 16:46:09 UTC (rev 91) +++ forge-tools/sys/nuiton.org/tomcat-default 2014-07-04 13:15:32 UTC (rev 92) @@ -1,4 +1,4 @@ -export JAVA_HOME=/opt/jdk7 +export JAVA_HOME=/opt/jdk export JAVA_OPTS="-XX:MaxPermSize=256m -Xmx448m -Dhudson.DNSMultiCast.disabled=true -Djava.awt.headless=true -Dsvnkit.http.sslProtocols="SSLv3"" export JENKINS_HOME=/var/local/forge/data/nuiton.org/jenkins export ANDROID_HOME=/opt/android Modified: forge-tools/sys/nuiton.org/tomcat-init.d =================================================================== --- forge-tools/sys/nuiton.org/tomcat-init.d 2014-06-25 16:46:09 UTC (rev 91) +++ forge-tools/sys/nuiton.org/tomcat-init.d 2014-07-04 13:15:32 UTC (rev 92) @@ -53,7 +53,7 @@ # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not # defined in $DEFAULT) -JDK_DIRS="/opt/jdk7 /usr/lib/jvm/default-java /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-cacao /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe" +JDK_DIRS="/opt/jdk /usr/lib/jvm/default-java /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-cacao /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe" # Look for the right JVM to use for jdir in $JDK_DIRS; do

1 0

r91 - scripts/maven-release
by bleny＠users.forge.codelutin.com June 25, 2014

June 25, 2014

Author: bleny Date: 2014-06-25 18:46:09 +0200 (Wed, 25 Jun 2014) New Revision: 91 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/91 Log: fixes #5261 for SVN too Modified: scripts/maven-release/deploy-to-demo-from-SVN.sh Modified: scripts/maven-release/deploy-to-demo-from-SVN.sh =================================================================== --- scripts/maven-release/deploy-to-demo-from-SVN.sh 2014-06-25 10:06:47 UTC (rev 90) +++ scripts/maven-release/deploy-to-demo-from-SVN.sh 2014-06-25 16:46:09 UTC (rev 91) @@ -133,7 +133,7 @@ if [ $KEEP_VERSION -eq 1 ]; then NEW_VERSION=$VERSION else - NEW_VERSION=`${M2_HOME}/bin/mvn -N helper:transform-project-version -Dhelper.newVersionPattern="#V-rev#R" -Dhelper.revision=$REV -DhelperPluginVersion=2.0 -Dhelper.versionKey=deployKey help:evaluate -Dexpression=deployKey | grep -v "\[" | grep "-rev" | grep -v "Download"` + NEW_VERSION=`${M2_HOME}/bin/mvn -N helper:transform-project-version -Dhelper.newVersionPattern="#V-rev#R" -Dhelper.revision=$REV -DhelperPluginVersion=2.0 -Dhelper.versionKey=deployKey help:evaluate -Dexpression=deployKey | grep -v "\[" | grep "\-rev" | grep -v "Download"` fi echo "OK"

1 0

r90 - scripts/maven-release
by maven-release＠users.forge.codelutin.com June 25, 2014

June 25, 2014

Author: maven-release Date: 2014-06-25 12:06:47 +0200 (Wed, 25 Jun 2014) New Revision: 90 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/90 Log: fixes #5261 Modified: scripts/maven-release/deploy-to-demo-from-GIT.sh Modified: scripts/maven-release/deploy-to-demo-from-GIT.sh =================================================================== --- scripts/maven-release/deploy-to-demo-from-GIT.sh 2014-06-18 06:13:26 UTC (rev 89) +++ scripts/maven-release/deploy-to-demo-from-GIT.sh 2014-06-25 10:06:47 UTC (rev 90) @@ -134,7 +134,7 @@ if [ $KEEP_VERSION -eq 1 ]; then NEW_VERSION=$VERSION else - NEW_VERSION=`${M2_HOME}/bin/mvn -N helper:transform-project-version -Dhelper.newVersionPattern="#V-rev#R" -Dhelper.revision=$REV -DhelperPluginVersion=2.0 -Dhelper.versionKey=deployKey help:evaluate -Dexpression=deployKey | grep -v "\[" | grep "-rev" | grep -v "Download"` + NEW_VERSION=`${M2_HOME}/bin/mvn -N helper:transform-project-version -Dhelper.newVersionPattern="#V-rev#R" -Dhelper.revision=$REV -DhelperPluginVersion=2.0 -Dhelper.versionKey=deployKey help:evaluate -Dexpression=deployKey | grep -v "\[" | grep "\-rev" | grep -v "Download"` fi echo "OK"

1 0

r89 - scripts/git-tools
by tchemit＠users.forge.codelutin.com June 18, 2014

June 18, 2014

Author: tchemit Date: 2014-06-18 08:13:26 +0200 (Wed, 18 Jun 2014) New Revision: 89 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/89 Log: refs #5074 : add a pre-commit hook to forbidde svn commit Added: scripts/git-tools/svn-read-only-pre-commit Added: scripts/git-tools/svn-read-only-pre-commit =================================================================== --- scripts/git-tools/svn-read-only-pre-commit (rev 0) +++ scripts/git-tools/svn-read-only-pre-commit 2014-06-18 06:13:26 UTC (rev 89) @@ -0,0 +1,15 @@ +#!/bin/sh + +FORGE="$1" +REPO=$(basename $2) + +echo "-------------------------------------------------------------------------------" 1>&2 +echo "$REPO uses now GIT, you can't commit any longer with SVN." 1>&2 +echo "" 1>&2 +echo "For read-only access use 'git clone http://git.$FORGE/$REPO.git'" 1>&2 +echo "For read-write access use 'git clone https://git.$FORGE/$REPO.git'" 1>&2 +echo "" 1>&2 +echo "To browse repository, visit https://gitweb.$FORGE/$REPO.git" 1>&2 +echo "-------------------------------------------------------------------------------" 1>&2 + +exit 1 Property changes on: scripts/git-tools/svn-read-only-pre-commit ___________________________________________________________________ Added: svn:executable + *

1 0

r88 - scripts/redmine-tools
by tchemit＠users.forge.codelutin.com June 8, 2014

June 8, 2014

Author: tchemit Date: 2014-06-08 13:48:46 +0200 (Sun, 08 Jun 2014) New Revision: 88 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/88 Log: refs #4057 improve build site script Modified: scripts/redmine-tools/deploy-git-sites.sh Modified: scripts/redmine-tools/deploy-git-sites.sh =================================================================== --- scripts/redmine-tools/deploy-git-sites.sh 2014-06-08 10:33:39 UTC (rev 87) +++ scripts/redmine-tools/deploy-git-sites.sh 2014-06-08 11:48:46 UTC (rev 88) @@ -74,8 +74,9 @@ -s "/p:project" -t elem -n "distributionManagement" \ -s "//p:project/distributionManagement" -t elem -n "site" \ -s "//p:project/distributionManagement/site" -t elem -n "id" -v "doc.$forge" \ - -s "//p:project/distributionManagement/site" -t elem -n "url" -v "scpexe://doc.$forge/var/lib/redmine-$forge/project-site/$projectId" pom.xml + -s "//p:project/distributionManagement/site" -t elem -n "url" -v "scpexe://doc.$forge/var/lib/redmine-$forge/project-site/$projectId" pom.xml + exit 1 else deployUrl=$(xmlstarlet sel -N "p=http://maven.apache.org/POM/4.0.0" -t -v "/p:project/p:distributionManagement/p:site/p:url" pom.xml) @@ -94,8 +95,14 @@ logFile=/tmp/build-site-"$projectId"-"$versionId".log echo "Build site $tagName (log: $logFile)" - #mvn clean site-deploy -DperformRelease -l $logFile - + # relocate svn + sed -i "s/svn.$forge\/svn/svn.$forge/" pom.xml + mvn clean site-deploy -DperformRelease -l $logFile -DsitePluginVersion=3.3 -DprojectInfoReportsPluginVersion=2.7 -DjredminePluginVersion=1.8.2 + if [ $? -eq 1 ]; then + echo "build failed see $logFile" + exit 1 + fi + else echo "$siteUrl already exist, skip site generation"

1 0

r87 - scripts/redmine-tools
by tchemit＠users.forge.codelutin.com June 8, 2014

June 8, 2014

Author: tchemit Date: 2014-06-08 12:33:39 +0200 (Sun, 08 Jun 2014) New Revision: 87 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/87 Log: refs #4057 script pour generer les sites maven pour chaque version Added: scripts/redmine-tools/deploy-git-sites.sh Added: scripts/redmine-tools/deploy-git-sites.sh =================================================================== --- scripts/redmine-tools/deploy-git-sites.sh (rev 0) +++ scripts/redmine-tools/deploy-git-sites.sh 2014-06-08 10:33:39 UTC (rev 87) @@ -0,0 +1,119 @@ +#! /bin/bash + +############################################################ +# To deploy all sites for a project (git version) +# +# usage deploy-git-sites.sh forge projectId versionFile +# +# forge is forge domain name (nuiton.org|chorem.org|codelutin.com) +# +# projectId is the redmine projectId +# +# versionFile contains one line by version in this format +# +# version1:releaseDate +# version2:releaseDate +# ... +# +# An ouput file is /tmp/changelog-$projectId.html which contains +# the html fragment to put in the changelog file on the +# top of the project. +# +############################################################ +## History +# 2014-06-08 chemit(a)codelutin.com +# - initial version +# +############################################################ + +if [ ! $# -eq 3 ]; then + echo "usage: $0 forge projectId versionFile" + echo "" + echo "- forge is the forge domain name (nuiton.org|chorem.org|codelutin.com)" + echo "- projectId is the redmine project id " + echo "- versionfile contains all versions of the project, one version per line in this format" + echo " versionId:releaseDate (versionId is the redmine version id)" + echo "" + echo "Produce an output file in /tmp/index-projectId.html to put in changelog page" + exit 1 +fi + +forge=$1 +projectId=$2 +projectFile=$3 +projectId=$(basename $projectFile .versions) +oldPath=$(pwd) + +gitDirectory=/tmp/"$projectId" +rm -rf $gitDirectory +git clone https://git."$forge"/"$projectId".git $gitDirectory + +cd $gitDirectory + +changelogFile=/tmp/changelog-$projectId.html +rm -rf $changelogFile + +while read line ; do + versionId=$(echo $line | cut -d':' -f1) + releaseDate=$(echo $line | cut -d':' -f2) + tagName=$projectId-$versionId + siteUrl=http://doc.$forge/$projectId/$versionId/ + echo "Check if exist $siteUrl (tag name: $tagName)" + response=$(curl -sI $siteUrl | head -1 | grep HTTP | cut -d' ' -f2) + if [ "$response" = "404" ]; then + + echo "Get tag $tagName" + git reset -q --hard "$tagName" + + grep distributionManagement pom.xml &> /dev/null + if [ $? -eq 1 ]; then + + echo "No distributionManagement section in pom, add it" + + xmlstarlet ed -P -L -N "p=http://maven.apache.org/POM/4.0.0" \ + -s "/p:project" -t elem -n "distributionManagement" \ + -s "//p:project/distributionManagement" -t elem -n "site" \ + -s "//p:project/distributionManagement/site" -t elem -n "id" -v "doc.$forge" \ + -s "//p:project/distributionManagement/site" -t elem -n "url" -v "scpexe://doc.$forge/var/lib/redmine-$forge/project-site/$projectId" pom.xml + + else + + deployUrl=$(xmlstarlet sel -N "p=http://maven.apache.org/POM/4.0.0" -t -v "/p:project/p:distributionManagement/p:site/p:url" pom.xml) + + if [ -z $deployUrl ]; then + echo "pas de distributionManagement/url" + exit 1 + fi + + deployUrl=$deployUrl/$versionId + echo "Change deploy url to $deployUrl" + + xmlstarlet ed -P -L -N "p=http://maven.apache.org/POM/4.0.0" -u "/p:project/p:distributionManagement/p:site/p:id" -v "doc.$forge" -u "/p:project/p:distributionManagement/p:site/p:url" -v "$deployUrl" pom.xml + + fi + + logFile=/tmp/build-site-"$projectId"-"$versionId".log + echo "Build site $tagName (log: $logFile)" + #mvn clean site-deploy -DperformRelease -l $logFile + + else + + echo "$siteUrl already exist, skip site generation" + + fi + + cat << EOF >> $changelogFile + <tr> + <td>$versionId</td> + <td>$releaseDate</td> + <td><a target="site" href="./$versionId">site</a></td> + <td></td> + <td>tag <strong>$projectId-$versionId</strong></td> + </tr> +EOF + +done < $oldPath/$projectFile + +echo "Get changelog in $changelogFile" + +cd $oldPath Property changes on: scripts/redmine-tools/deploy-git-sites.sh ___________________________________________________________________ Added: svn:executable + *

1 0

r86 - scripts/redmine-tools
by tchemit＠users.forge.codelutin.com June 8, 2014

June 8, 2014

Author: tchemit Date: 2014-06-08 12:32:33 +0200 (Sun, 08 Jun 2014) New Revision: 86 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/86 Log: refs-50 #5196 Ajout de liste build pour chaque projet Modified: scripts/redmine-tools/cron-redmine Modified: scripts/redmine-tools/cron-redmine =================================================================== --- scripts/redmine-tools/cron-redmine 2014-06-08 10:31:01 UTC (rev 85) +++ scripts/redmine-tools/cron-redmine 2014-06-08 10:32:33 UTC (rev 86) @@ -21,15 +21,19 @@ ruby /opt/redmine-tools/project-list.rb --redmine-host forge.nuiton.org --admin-email moderate(a)codelutin.com --list-domain list.nuiton.org --list-suffix commits --key $nuiton_key >> $nuiton_log ruby /opt/redmine-tools/project-list.rb --redmine-host forge.nuiton.org --admin-email moderate(a)codelutin.com --list-domain list.nuiton.org --list-suffix users --key $nuiton_key >> $nuiton_log ruby /opt/redmine-tools/project-list.rb --redmine-host forge.nuiton.org --admin-email moderate(a)codelutin.com --list-domain list.nuiton.org --list-suffix devel --key $nuiton_key >> $nuiton_log +ruby /opt/redmine-tools/project-list.rb --redmine-host forge.nuiton.org --admin-email moderate+nuiton.org+build(a)codelutin.com --list-domain list.nuiton.org --list-suffix build --key $nuiton_key >> $nuiton_log + ruby /opt/redmine-tools/project-list.rb --redmine-host forge.chorem.org --admin-email moderate(a)codelutin.com --list-domain list.chorem.org --list-suffix commits --key $chorem_key >> $chorem_log ruby /opt/redmine-tools/project-list.rb --redmine-host forge.chorem.org --admin-email moderate(a)codelutin.com --list-domain list.chorem.org --list-suffix users --key $chorem_key >> $chorem_log ruby /opt/redmine-tools/project-list.rb --redmine-host forge.chorem.org --admin-email moderate(a)codelutin.com --list-domain list.chorem.org --list-suffix devel --key $chorem_key >> $chorem_log +ruby /opt/redmine-tools/project-list.rb --redmine-host forge.chorem.org --admin-email moderate+chorem.org+build(a)codelutin.com --list-domain list.chorem.org --list-suffix build --key $chorem_key >> $chorem_log ruby /opt/redmine-tools/project-list.rb --redmine-host forge.codelutin.com --admin-email moderate(a)codelutin.com --list-domain list.forge.codelutin.com --list-suffix commits --key $codelutin_key >> $codelutin_log ruby /opt/redmine-tools/project-list.rb --redmine-host forge.codelutin.com --admin-email moderate(a)codelutin.com --list-domain list.forge.codelutin.com --list-suffix users --key $codelutin_key >> $codelutin_log ruby /opt/redmine-tools/project-list.rb --redmine-host forge.codelutin.com --admin-email moderate(a)codelutin.com --list-domain list.forge.codelutin.com --list-suffix devel --key $codelutin_key >> $codelutin_log ruby /opt/redmine-tools/project-list.rb --redmine-host forge.codelutin.com --admin-email moderate(a)codelutin.com --list-domain list.forge.codelutin.com --list-suffix private --key $codelutin_key >> $codelutin_log +ruby /opt/redmine-tools/project-list.rb --redmine-host forge.codelutin.com --admin-email moderate+codelutin.com+build(a)codelutin.com --list-domain list.forge.codelutin.com --list-suffix build --key $codelutin_key >> $codelutin_log ruby /opt/redmine-nuiton.org/extra/svn/reposman.rb --redmine-host forge.nuiton.org --svn-dir /var/lib/svn/svn-nuiton.org --owner www-data --group publish --url http://forge.nuiton.org/svn-private/ --key $nuiton_key >> $nuiton_log ruby /opt/redmine-chorem.org/extra/svn/reposman.rb --redmine-host forge.chorem.org --svn-dir /var/lib/svn/svn-chorem.org --owner www-data --group publish --url http://forge.chorem.org/svn-private/ --key $chorem_key >> $chorem_log

1 0