From: easter <ea...@fr...> - 2004-08-05 08:24:44
|
All, It's difficult to predict all the funny ways we can use build files in our various development environments (via Eclipse, Netbeans, XEmacs etc) so I can only test my changes for my particular config (following Ant standard guidelines for build files). Although it's unlikely, unless you are doing something strange, please let me know if this change breaks something for you, so I can help debug it. Hopefully we can now remove these .bat and .sh scripts which we don't seem to have any real need for other than limiting our compile platforms. ea >Update of /cvsroot/babeldoc/babeldoc >In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9583 > >Modified Files: > build.xml >Log Message: >No longer need the silly batch/.sh files to build the workspace. >Targets properly modified to handle the various dependancies, such as the missing "setup" dependancy from the "build" target. > >Index: build.xml >=================================================================== >RCS file: /cvsroot/babeldoc/babeldoc/build.xml,v >retrieving revision 1.19 >retrieving revision 1.20 >diff -C2 -d -r1.19 -r1.20 >*** build.xml 23 Jul 2004 22:12:50 -0000 1.19 >--- build.xml 5 Aug 2004 08:14:17 -0000 1.20 >*************** >*** 10,14 **** > <property file="build.properties"/> > >! <!-- Load the local customizations --> > <property file="local.properties"/> > >--- 10,14 ---- > <property file="build.properties"/> > >! <!-- Load the local customizations --> > <property file="local.properties"/> > >*************** >*** 16,19 **** >--- 16,22 ---- > <property name="base_dir" value="${basedir}"/> > >+ <property name="babeldoc.bootstrap.jar" value="${basedir}/support/ant/lib/babeldoc_bootstrap.jar" /> >+ <property name="jalopy.jar" value="${basedir}/support/jalopy/lib/jalopy-ant-0.6.1.jar" /> >+ > <!-- > Build the source distribution package >*************** >*** 89,93 **** > </javac> > <jar >! jarfile="support/ant/lib/babeldoc_bootstrap.jar" > basedir="support/build"/> > </target> >--- 92,96 ---- > </javac> > <jar >! jarfile="${babeldoc.bootstrap.jar}" > basedir="support/build"/> > </target> >*************** >*** 98,110 **** > <target > name="declare" >! description="Declare the babeldoc tasks"> > <taskdef name="modulefinder" >! classname="com.babeldoc.bootstrap.ant.ModuleFinder"/> > <taskdef name="pathtrimmer" >! classname="com.babeldoc.bootstrap.ant.PathTrimmer"/> > <taskdef name="moduleRunner" >! classname="com.babeldoc.bootstrap.ant.ModuleRunnerTask"/> > <taskdef name="jalopy" >! classname="de.hunsicker.jalopy.plugin.ant.AntPlugin"/> > </target> > >--- 101,133 ---- > <target > name="declare" >! description="Declare the babeldoc tasks" >! depends="bootstrap"> > <taskdef name="modulefinder" >! classname="com.babeldoc.bootstrap.ant.ModuleFinder"> >! <classpath> >! <pathelement location="${babeldoc.bootstrap.jar}"/> >! </classpath> >! </taskdef> >! > <taskdef name="pathtrimmer" >! classname="com.babeldoc.bootstrap.ant.PathTrimmer"> >! <classpath> >! <pathelement location="${babeldoc.bootstrap.jar}"/> >! </classpath> >! </taskdef> >! > <taskdef name="moduleRunner" >! classname="com.babeldoc.bootstrap.ant.ModuleRunnerTask"> >! <classpath> >! <pathelement location="${babeldoc.bootstrap.jar}"/> >! </classpath> >! </taskdef> >! > <taskdef name="jalopy" >! classname="de.hunsicker.jalopy.plugin.ant.AntPlugin"> >! <classpath> >! <pathelement location="${jalopy.jar}"/> >! </classpath> >! </taskdef> > </target> > >*************** >*** 172,180 **** > name="setup" > depends="depends"> >! <mkdir dir="./build"/> >! <mkdir dir="./build/lib"/> >! <mkdir dir="./build/examples"/> >! <mkdir dir="./build/readme"/> >! <mkdir dir="./build/support"/> > <moduleRunner target="setup" modules="${babeldoc_modules}"/> > </target> >--- 195,203 ---- > name="setup" > depends="depends"> >! <mkdir dir="${basedir}/build"/> >! <mkdir dir="${basedir}/build/lib"/> >! <mkdir dir="${basedir}/build/examples"/> >! <mkdir dir="${basedir}/build/readme"/> >! <mkdir dir="${basedir}/build/support"/> > <moduleRunner target="setup" modules="${babeldoc_modules}"/> > </target> >*************** >*** 185,191 **** > <target > name="build" >! depends="depends"> > <!--<echo message="${build.compiler}"/>--> >! <available file="./build" type="dir" property="setup.done"/> > <fail message="Setup has not been run - run 'build setup' first" unless="setup.done"/> > >--- 208,214 ---- > <target > name="build" >! depends="setup"> > <!--<echo message="${build.compiler}"/>--> >! <available file="${basedir}/build" type="dir" property="setup.done"/> > <fail message="Setup has not been run - run 'build setup' first" unless="setup.done"/> > >*************** >*** 202,206 **** > name="deploy" > depends="depends"> >! <available file="./build" type="dir" property="setup.done"/> > <fail message="Setup has not been run - run 'build setup' first" unless="setup.done"/> > <moduleRunner target="deploy" modules="${babeldoc_modules}"/> >--- 225,229 ---- > name="deploy" > depends="depends"> >! <available file="${basedir}/build" type="dir" property="setup.done"/> > <fail message="Setup has not been run - run 'build setup' first" unless="setup.done"/> > <moduleRunner target="deploy" modules="${babeldoc_modules}"/> >*************** >*** 214,218 **** > name="test" > depends="depends"> >! <available file="./build" type="dir" property="setup.done"/> > <fail message="Setup has not been run - run 'build setup' first" unless="setup.done"/> > <moduleRunner target="test" modules="${babeldoc_modules}"/> >--- 237,241 ---- > name="test" > depends="depends"> >! <available file="${basedir}/build" type="dir" property="setup.done"/> > <fail message="Setup has not been run - run 'build setup' first" unless="setup.done"/> > <moduleRunner target="test" modules="${babeldoc_modules}"/> > > > >------------------------------------------------------- >This SF.Net email is sponsored by OSTG. Have you noticed the changes on >Linux.com, ITManagersJournal and NewsForge in the past few weeks? Now, >one more big change to announce. We are now OSTG- Open Source Technology >Group. Come see the changes on the new OSTG site. www.ostg.com >_______________________________________________ >Babeldoc-devel mailing list >Bab...@li... >https://lists.sourceforge.net/lists/listinfo/babeldoc-devel > > > > |