Author: tchemit Date: 2009-08-23 17:30:21 +0200 (Sun, 23 Aug 2009) New Revision: 17 Added: migration-thirdparty/bin/deploy-third-reloc.sh migration-thirdparty/bin/generate-third-poms-reloc.sh Modified: migration-thirdparty/ migration-thirdparty/bin/build-nuiton-modify-projects-type.list.sh migration-thirdparty/bin/build-nuiton-modify-projects.list.sh migration-thirdparty/bin/build-third-translations-list.sh migration-thirdparty/bin/build-third-translations-migrate-list.sh migration-thirdparty/bin/generate-third-poms.sh migration-thirdparty/bin/rebuild-nuiton-modify-projects.sh Log: add relocation step Property changes on: migration-thirdparty ___________________________________________________________________ Modified: svn:ignore - vFile.tmp order projectorder target *.list repo* svn* resolv* poms* + vFile.tmp order projectorder target *.list repo* svn* resolv* poms* poms2* *.pom Modified: migration-thirdparty/bin/build-nuiton-modify-projects-type.list.sh =================================================================== --- migration-thirdparty/bin/build-nuiton-modify-projects-type.list.sh 2009-08-20 00:50:45 UTC (rev 16) +++ migration-thirdparty/bin/build-nuiton-modify-projects-type.list.sh 2009-08-23 15:30:21 UTC (rev 17) @@ -6,11 +6,11 @@ d=$(pwd) for pom in $(cat nuiton-modify-projects.list) ; do - name=$($d/bin/get-project-type.sh $pom) - grep $name nuiton-modify-projects-type.list 1>/dev/null + type=$($d/bin/get-project-type.sh $pom) + grep $type nuiton-modify-projects-type.list 1>/dev/null if [ $? -gt 0 ] ; then -# echo "add $name" ; - echo "$name" >> nuiton-modify-projects-type.list ; +# echo "add $type" ; + echo "$type" >> nuiton-modify-projects-type.list ; fi ; done sort -d nuiton-modify-projects-type.list > nuiton-modify-projects-type.list2 Modified: migration-thirdparty/bin/build-nuiton-modify-projects.list.sh =================================================================== --- migration-thirdparty/bin/build-nuiton-modify-projects.list.sh 2009-08-20 00:50:45 UTC (rev 16) +++ migration-thirdparty/bin/build-nuiton-modify-projects.list.sh 2009-08-23 15:30:21 UTC (rev 17) @@ -2,29 +2,44 @@ rm -fr nuiton-modify-projects.list touch nuiton-modify-projects.list +d=$(pwd) for pom in $(cat nuiton-modify-poms.list) ; do -parent=$(dirname $pom) ; -parent=$(dirname $parent) ; -parentpom="$parent/pom.xml" ; -if [ -e $parentpom ] ; then + parent=$(dirname $pom) ; + parent=$(dirname $parent) ; + parentpom="$parent/pom.xml" ; + realpom="" + if [ -e $parentpom ] ; then # echo "[$pom] - parent $parentpom" ; - grep $parentpom nuiton-modify-projects.list 1>/dev/null ; - if [ $? -gt 0 ] ; then -# echo "add parent pom $parentpom" ; - echo "$parentpom" >> nuiton-modify-projects.list ; - fi ; -else -# echo "[$pom] - standalone" ; - grep $pom nuiton-modify-projects.list 1>/dev/null ; - if [ $? -gt 0 ] ; then -# echo "add standalone pom $pom" ; - echo "$pom" >> nuiton-modify-projects.list ; - fi ; -fi ; + realpom=$parentpom + else + realpom=$pom +# echo "[$pom] - standalone" ; + fi ; + + grep $realpom nuiton-modify-projects.list 1>/dev/null ; + if [ $? -eq 0 ] ; then continue ; fi + echo "$realpom" | grep -e "trunk" 1>/dev/null + # pom non encore enregistrés + if [ $? -eq 0 ] ; then + echo "$realpom" >> nuiton-modify-projects.list + else + # on verifique que la version est deployee + version=$($d/bin/get-pom-version.sh $realpom) + type=$($d/bin/get-project-type.sh $realpom) + groupId="org/nuiton" + url="http://maven.nuiton.org/release/$groupId/$type/$version/$type-$version.pom" + wget $url -o - 1>/dev/null + if [ $? -eq 0 ] ; then + # l'url a bien ete trouvee + echo "$realpom" >> nuiton-modify-projects.list + else + echo "$url not found on nuiton, will skip $realpom" + fi + fi done sort -d nuiton-modify-projects.list > nuiton-modify-projects.list2 mv nuiton-modify-projects.list2 nuiton-modify-projects.list -cat nuiton-modify-projects.list +#cat nuiton-modify-projects.list Modified: migration-thirdparty/bin/build-third-translations-list.sh =================================================================== --- migration-thirdparty/bin/build-third-translations-list.sh 2009-08-20 00:50:45 UTC (rev 16) +++ migration-thirdparty/bin/build-third-translations-list.sh 2009-08-23 15:30:21 UTC (rev 17) @@ -1,6 +1,6 @@ #!/bin/sh cat << EOF > third-translations.list -asm/asm/1.5.3:org.nuiton.thirdparty/asm/1.5.4-SNAPSHOT +asm/asm/1.5.3:org.nuiton.thirdparty/asm/1.5.4-snapshot asm-attrs/asm-attrs/1.5.4-snapshot:org.nuiton.thirdparty/asm-attrs/1.5.4-snapshot asm-util/asm-util/1.5.4-snapshot:org.nuiton.thirdparty/asm-util/1.5.4-snapshot externallib/jGuard-j2ee/0.7.2:org.nuiton.thirdparty/jGuard-j2ee/0.7.2 Modified: migration-thirdparty/bin/build-third-translations-migrate-list.sh =================================================================== --- migration-thirdparty/bin/build-third-translations-migrate-list.sh 2009-08-20 00:50:45 UTC (rev 16) +++ migration-thirdparty/bin/build-third-translations-migrate-list.sh 2009-08-23 15:30:21 UTC (rev 17) @@ -20,9 +20,9 @@ if [ $? -eq 0 ] ; then continue ; fi ; echo "$i" >> third-translations-migrate.list ; done -echo "asm/asm/1.5.4-snapshot:org.nuiton.thirdparty/asm/1.5.4-SNAPSHOT" >> third-translations-migrate.list -echo "asm-attrs/asm-attrs/1.5.4-snapshot:org.nuiton.thirdparty/asm-attrs/1.5.4-SNAPSHOT" >> third-translations-migrate.list -echo "asm-util/asm-util/1.5.4-snapshot:org.nuiton.thirdparty/asm-util/1.5.4-SNAPSHOT" >> third-translations-migrate.list +echo "asm/asm/1.5.4-snapshot:org.nuiton.thirdparty/asm/1.5.4-snapshot" >> third-translations-migrate.list +echo "asm-attrs/asm-attrs/1.5.4-snapshot:org.nuiton.thirdparty/asm-attrs/1.5.4-snapshot" >> third-translations-migrate.list +echo "asm-util/asm-util/1.5.4-snapshot:org.nuiton.thirdparty/asm-util/1.5.4-snapshot" >> third-translations-migrate.list sort -d third-translations-migrate.list > third-translations-migrate.list2 mv third-translations-migrate.list2 third-translations-migrate.list Added: migration-thirdparty/bin/deploy-third-reloc.sh =================================================================== --- migration-thirdparty/bin/deploy-third-reloc.sh (rev 0) +++ migration-thirdparty/bin/deploy-third-reloc.sh 2009-08-23 15:30:21 UTC (rev 17) @@ -0,0 +1,58 @@ +#!/bin/bash + +options="-DupdateReleaseInfo -Durl=scpexe://nuiton.org/var/lib/maven/release -DrepositoryId=nuiton" + +for i in $(cat third-translations-migrate.list) ; do + in=$(echo $i | cut -d':' -f1) + out=$(echo $i | cut -d':' -f2) + g=$(echo $in | cut -d'/' -f1) + a=$(echo $in | cut -d'/' -f2) + v=$(echo $in | cut -d'/' -f3) + g2=$(echo $out | cut -d'/' -f1) + a2=$(echo $out | cut -d'/' -f2) + v2=$(echo $out | cut -d'/' -f3) + parent="repository/${g//.//}/$a/$v" + pom="poms2/$a-pom.xml" + jar="$a-$v.jar" + sources="$a-$v-sources.jar" + javadoc="$a-$v-javadoc.jar" + echo "$g:$a:$v --> adding relocation infos" + echo -n " - deploy $jar ..." + mvn deploy:deploy-file -DpomFile=$pom $options -Dfile=$parent/$jar 1>/tmp/maven-deploy.log + if [ $? -eq 0 ] ; then + echo "OK" + else + echo "KO" + cat /tmp/maven-deploy.log + exit 1 + fi + if [ -e $parent/$sources ] ; then + echo -n " - deploy sources $sources ..." + mvn deploy:deploy-file -DpomFile=$pom -Dclassifier=sources $options -Dfile=$parent/$sources 1>/tmp/maven-deploy.log + if [ $? -eq 0 ] ; then + echo "OK" + else + echo "KO" + cat /tmp/maven-deploy.log + exit 1 + fi + else + echo " - no sources to deploy" + fi + if [ -e $parent/$javadoc ] ; then + echo -n " - deploy javadoc $javadoc ..." + mvn deploy:deploy-file -DpomFile=$pom -Dclassifier=javadoc $options -Dfile=$parent/$javadoc 1>/tmp/maven-deploy.log + if [ $? -eq 0 ] ; then + echo "OK" + else + echo "KO" + cat /tmp/maven-deploy.log + exit 1 + fi + else + echo " - no javadoc to deploy" + fi ; + echo "" +done + + Property changes on: migration-thirdparty/bin/deploy-third-reloc.sh ___________________________________________________________________ Added: svn:executable + * Added: migration-thirdparty/bin/generate-third-poms-reloc.sh =================================================================== --- migration-thirdparty/bin/generate-third-poms-reloc.sh (rev 0) +++ migration-thirdparty/bin/generate-third-poms-reloc.sh 2009-08-23 15:30:21 UTC (rev 17) @@ -0,0 +1,42 @@ +#!/bin/bash + +rm -rf poms2 +mkdir poms2 +for i in $(cat third-translations-migrate.list) ; do + in=$(echo $i | cut -d':' -f1) ; + out=$(echo $i | cut -d':' -f2) ; + g=$(echo $in | cut -d'/' -f1) ; + a=$(echo $in | cut -d'/' -f2) ; + v=$(echo $in | cut -d'/' -f3) ; + g2=$(echo $out | cut -d'/' -f1) ; + a2=$(echo $out | cut -d'/' -f2) ; + v2=$(echo $out | cut -d'/' -f3) ; + parent="repository/${g//.//}/$a/$v" ; + originalPom="$parent/$a-$v.pom" + pom="poms2/$a-pom.xml" + jar="$parent/$a-$v.jar" + echo "$g:$a:$v --> $g2:$a2:$v2" ; + if [ -e $originalPom ] ; then + echo " - copy existing pom $originalPom " ; + cp $originalPom "poms2/$a-pom-orgi.xml" ; + fi ; + echo " - generate pom : $pom" ; + cat << EOF > $pom +<?xml version="1.0" encoding="UTF-8"?><project> + <modelVersion>4.0.0</modelVersion> + <groupId>$g</groupId> + <artifactId>$a</artifactId> + <version>$v</version> + <distributionManagement> + <relocation> + <groupId>$g2</groupId> + <version>$v2</version> + </relocation> + </distributionManagement> + +</project> +EOF + echo "" ; +done + + Property changes on: migration-thirdparty/bin/generate-third-poms-reloc.sh ___________________________________________________________________ Added: svn:executable + * Modified: migration-thirdparty/bin/generate-third-poms.sh =================================================================== --- migration-thirdparty/bin/generate-third-poms.sh 2009-08-20 00:50:45 UTC (rev 16) +++ migration-thirdparty/bin/generate-third-poms.sh 2009-08-23 15:30:21 UTC (rev 17) @@ -29,6 +29,12 @@ <groupId>$g2</groupId> <artifactId>$a2</artifactId> <version>$v2</version> + <distributionManagement> + <relocation> + <groupId>$g</groupId> + </relocation> + </distributionManagement> + </project> EOF echo "" ; Modified: migration-thirdparty/bin/rebuild-nuiton-modify-projects.sh =================================================================== --- migration-thirdparty/bin/rebuild-nuiton-modify-projects.sh 2009-08-20 00:50:45 UTC (rev 16) +++ migration-thirdparty/bin/rebuild-nuiton-modify-projects.sh 2009-08-23 15:30:21 UTC (rev 17) @@ -8,6 +8,7 @@ for pom in $poms ; do echo -n " - build $pom ..." dir=$(dirname $pom) +#TODO peut-etre verifier que la version est deployee sur nuiton sinon on s'en fout un peu ? (cd $dir ; mvn clean install -DperformRelease 1>/tmp/maven-build.log) if [ $? -eq 0 ] ; then echo "OK"
participants (1)
-
tchemit＠users.nuiton.org