Menu
▾
▴
[Fudaa-cvs-commit] fudaa_devel/aide/src/prepro build.xml,1.1,1.2 readme.txt,1.1,1.2
|
From: <de...@us...> - 2004-02-12 15:25:07
|
Update of /cvsroot/fudaa/fudaa_devel/aide/src/prepro In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18294 Modified Files: build.xml readme.txt Log Message: maj de l'aide version 0.05 Index: build.xml =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/aide/src/prepro/build.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** build.xml 21 Jan 2004 10:42:31 -0000 1.1 --- build.xml 12 Feb 2004 15:19:36 -0000 1.2 *************** *** 8,18 **** <property name="project.dir" location="${basedir}"/> <tstamp> ! <format property="lastUpdate" locale="fr" pattern="dd MMMM yyyy"/> </tstamp> <property name="html.dir" location="html"/> <property name="dist.dir" location="dist"/> ! <property name="dist.html.dir" location="dist/html"/> <property name="src.dir" location="src"/> <property name="src.web.dir" location="src_web"/> <property name="init.ext" value=".xml"/> <property name="dest.ext" value=".html"/> --- 8,22 ---- <property name="project.dir" location="${basedir}"/> <tstamp> ! <format property="lastUpdate" locale="fr" pattern="yyyy-MM-dd "/> </tstamp> <property name="html.dir" location="html"/> <property name="dist.dir" location="dist"/> ! <property name="dist.web.dir" location="${dist.dir}/web"/> ! <property name="dist.devel.dir" location="${dist.web.dir}/devel/"/> ! <property name="src.dir" location="src"/> <property name="src.web.dir" location="src_web"/> + <property name="src.devel.dir" location="src_devel"/> + <property name="init.ext" value=".xml"/> <property name="dest.ext" value=".html"/> *************** *** 22,30 **** <property name="template.xsl" location="template/sort-menu.xsl"/> <property name="base.xsl" location="template/template.xsl"/> ! <patternset id="sort.files" includes="**/index${dest.ext},**/alphabetique${dest.ext}"/> ! <patternset id="style.files" includes="**/*${init.ext}"/> ! <patternset id="resources.files" includes="**/images/**,**/common/**" excludes="**/${filelist}"/> ! <mkdir dir="${html.dir}"/> </target> --- 26,44 ---- <property name="template.xsl" location="template/sort-menu.xsl"/> <property name="base.xsl" location="template/template.xsl"/> + <property name="style.css" location="template/style.css"/> ! <patternset id="sort.files" includes="**/alphabetique${dest.ext}"/> ! <patternset id="style.files" includes="**/*${init.ext}" excludes="**/*.inc.xml,**/pdf.xml"/> ! <patternset id="pdf.files" includes="**/pdf.xml"/> ! ! <patternset id="resources.files" includes="**/images/**" excludes="**/${filelist}"/> ! ! <dependset> ! <srcfileset dir="${src.dir}" includes="**/*.dtd"/> ! <srcfileset dir="${basedir}/template/" includes="**/*.*" excludes="**/*.css"/> ! <srcfilelist dir="${basedir}" files="build.xml"/> ! <targetfileset dir="${html.dir}" includes="**/*${dest.ext},**/*.pdf" /> ! <targetfileset dir="${dist.dir}" includes="**/*${dest.ext},**/*.pdf" /> ! </dependset> </target> *************** *** 33,50 **** includes="FileList.java" debug="on"/> <taskdef classname="FileList" name="fileList" classpath="${task.dir}"/> ! <fileList file="${filelist}"> <dirset dir="${src.dir}" includes="?*/**" excludes="**/images/**,**/common/**"/> </fileList> </target> - <target name="generate" depends=".initialisation"> ! <dependset> ! <srcfileset dir="${src.dir}" includes="**/*.dtd"/> ! <srcfileset dir="${basedir}/template/" includes="**/*.*"/> ! <srcfilelist dir="${basedir}" files="build.xml"/> ! <targetfileset dir="${html.dir}" includes="**/*${dest.ext}" /> ! <targetfileset dir="${dist.dir}" includes="**/*${dest.ext}" /> ! </dependset> <copy todir="${html.dir}"> <fileset dir="${src.dir}"> --- 47,62 ---- includes="FileList.java" debug="on"/> <taskdef classname="FileList" name="fileList" classpath="${task.dir}"/> ! <fileList file="${filelist}" includes="*.xml" excludes="*.inc.xml"> <dirset dir="${src.dir}" includes="?*/**" excludes="**/images/**,**/common/**"/> </fileList> </target> ! <target name="pdf" depends="build"> ! ! ! </target> ! <target name="build_aide" depends="filelist"> ! <mkdir dir="${html.dir}"/> <copy todir="${html.dir}"> <fileset dir="${src.dir}"> *************** *** 52,55 **** --- 64,68 ---- </fileset> </copy> + <copy file="${style.css}" todir="${html.dir}" /> <style destdir="${html.dir}" basedir="${src.dir}" *************** *** 59,66 **** <param name="destExt" expression="${dest.ext}"/> </style> ! </target> ! ! <target name="build_doc" depends="filelist,generate"> ! <replace dir="${html.dir}" token='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'> <patternset refid="sort.files"/> </replace> --- 72,76 ---- <param name="destExt" expression="${dest.ext}"/> </style> ! <replace dir="${html.dir}" token='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'> <patternset refid="sort.files"/> </replace> *************** *** 77,86 **** </target> ! <target name="build" depends="build_doc" description="Construit le dossier html et dist et genere les fichiers html"> ! <mkdir dir="${dist.html.dir}"/> ! <copy todir="${dist.html.dir}/doc"> <fileset dir="${html.dir}"/> </copy> ! <style destdir="${dist.html.dir}" basedir="${src.web.dir}" style="${base.xsl}" extension="${dest.ext}"> <patternset refid="style.files"/> --- 87,119 ---- </target> ! <target name="build_devel" depends=".initialisation" description="Construit le dossier dist/web/devel"> ! <mkdir dir="${dist.devel.dir}"/> ! <copy file="${style.css}" todir="${dist.devel.dir}" /> ! <copy todir="${dist.devel.dir}"> ! <fileset dir="${src.devel.dir}"> ! <patternset refid="resources.files"/> ! </fileset> ! </copy> ! <style destdir="${dist.devel.dir}" basedir="${src.devel.dir}" ! style="${base.xsl}" extension="${dest.ext}"> ! <patternset refid="style.files"/> ! <param name="lastUpdate" expression="${lastUpdate}"/> ! <param name="destExt" expression="${dest.ext}"/> ! </style> ! </target> ! ! ! <target name="build_web" depends="build_aide" description="Construit le dossier html et dist et genere les fichiers html"> ! <mkdir dir="${dist.web.dir}"/> ! <copy todir="${dist.web.dir}/doc"> <fileset dir="${html.dir}"/> </copy> ! <copy file="${style.css}" todir="${dist.web.dir}" /> ! <copy todir="${dist.web.dir}"> ! <fileset dir="${src.web.dir}"> ! <patternset refid="resources.files"/> ! </fileset> ! </copy> ! <style destdir="${dist.web.dir}" basedir="${src.web.dir}" style="${base.xsl}" extension="${dest.ext}"> <patternset refid="style.files"/> *************** *** 89,92 **** --- 122,138 ---- </style> </target> + <target name="build" depends="build_aide,build_web,build_devel"> + + </target> + + <target name="valideHtml" depends="build" + description="valide les fichiers html dans le dossier ${dist.dir}"> + <xmlvalidate failonerror="no" lenient="false" warn="yes" + classname="org.apache.xerces.parsers.SAXParser"> + <fileset dir="${dist.dir}" includes="**/*.html"/> + <dtd publicId="-//W3C//DTD XHTML 1.0 Strict//EN" location="template/dtd/xhtml1-strict.dtd"/> + </xmlvalidate> + </target> + <target name="clean" description="Efface les dossiers html et dist" depends=".initialisation"> *************** *** 96,104 **** <target name="buildDist" depends="build" description="Creer les archives pour la doc et pour le site dans dist/"> ! <zip destfile="${dist.dir}/html/prepro_doc.zip"> ! <zipfileset dir="${dist.dir}/html/doc" prefix="fudaa_prepro"/> </zip> <tar tarfile="${dist.dir}/prepro_web.tar.bz2" compression="bzip2"> ! <tarfileset dir="${dist.dir}/html" prefix="prepro_web"/> </tar> </target> --- 142,150 ---- <target name="buildDist" depends="build" description="Creer les archives pour la doc et pour le site dans dist/"> ! <zip destfile="${dist.web.dir}/prepro_doc.zip"> ! <zipfileset dir="${dist.web.dir}/doc" prefix="fudaa_prepro"/> </zip> <tar tarfile="${dist.dir}/prepro_web.tar.bz2" compression="bzip2"> ! <tarfileset dir="${dist.web.dir}" prefix="prepro_web"/> </tar> </target> Index: readme.txt =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/aide/src/prepro/readme.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** readme.txt 21 Jan 2004 17:21:41 -0000 1.1 --- readme.txt 12 Feb 2004 15:19:36 -0000 1.2 *************** *** 24,26 **** pour le téléchargement depuis le site web - crée l'archive dist/prepro_web.tar.bz2 contenant le dossier ! dist/html : pour mettre à jour le site web + rapidement \ No newline at end of file --- 24,26 ---- pour le téléchargement depuis le site web - crée l'archive dist/prepro_web.tar.bz2 contenant le dossier ! dist/html : pour mettre à jour le site web + rapidement \ No newline at end of file |
