From: Teiniker E. <tei...@us...> - 2007-04-12 11:55:58
|
Update of /cvsroot/ccmtools/ccmtools In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21469 Modified Files: build.xml Log Message: Refactored build.xml to support Windows builds too. Index: build.xml =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/build.xml,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** build.xml 19 Feb 2007 09:39:21 -0000 1.77 --- build.xml 12 Apr 2007 11:55:54 -0000 1.78 *************** *** 17,23 **** <property name="test" location="test" /> ! <!-- Define different paths that are used in the following tasks --> ! <path id="compile.classpath"> <pathelement path="${lib}/commons-cli-1.0.jar" /> --- 17,29 ---- <property name="test" location="test" /> + <!-- + If this build is running in a Unix like system the isUnix property + will be set to true. + --> + <condition property="isUnix"> <os family="unix"/> </condition> ! <!-- ! Define different paths that are used in the following tasks ! --> <path id="compile.classpath"> <pathelement path="${lib}/commons-cli-1.0.jar" /> *************** *** 32,37 **** ! <!-- Set up directories for the build process --> ! <target name="init" > <mkdir dir="${src-gen}" /> --- 38,44 ---- ! <!-- ! Set up directories for the build process ! --> <target name="init" > <mkdir dir="${src-gen}" /> *************** *** 41,47 **** </target> - <!-- Generate IDL3 parser source code using ANTLR --> <target name="generate.IDL3Parser" depends="init"> <antlr target="${src}/ccmtools/parser/idl3/idl3new.g" --- 48,73 ---- </target> + + <!-- + Clean up all generated files and directories + --> + <target name="clean" description="Clean up the build and lib directory." > + <delete file="${src}/${PACKAGE}/Constants.java" /> + <delete file="${src}/ccmtools/parser/idl3/Idl3Lexer.java" /> + <delete file="${src}/ccmtools/parser/idl3/Idl3Parser.java" /> + <delete file="${src}/ccmtools/parser/idl3/Idl3TokenTypes.java" /> + <delete file="${src}/ccmtools/parser/idl3/Idl3TokenTypes.txt" /> + <delete dir="${src}/uml_parser" /> + <delete dir="${src-gen}" /> + <delete dir="${build}" /> + <delete dir="${test}/CppRemoteGenerator/sandbox" /> + <delete file="${lib}/ccmtools.jar" /> + <delete file="${lib}/assembly.jar" /> + </target> + <!-- + Generate IDL3 parser source code using ANTLR + --> <target name="generate.IDL3Parser" depends="init"> <antlr target="${src}/ccmtools/parser/idl3/idl3new.g" *************** *** 52,57 **** ! <!-- Generate IDL parser source code using JFlex+Cup --> ! <target name="generate.IdlScanner" depends="init"> <java jar="${lib}/JFlex.jar" fork="true"> --- 78,84 ---- ! <!-- ! Generate IDL parser source code using JFlex+Cup ! --> <target name="generate.IdlScanner" depends="init"> <java jar="${lib}/JFlex.jar" fork="true"> *************** *** 67,72 **** ! <!-- Generate assembly parser source code using JFlex+Cup --> ! <target name="generate.AssemblyLexer" depends="init"> <java jar="${lib}/JFlex.jar" fork="true"> --- 94,100 ---- ! <!-- ! Generate assembly parser source code using JFlex+Cup ! --> <target name="generate.AssemblyLexer" depends="init"> <java jar="${lib}/JFlex.jar" fork="true"> *************** *** 100,105 **** ! <!-- Compile ccmtools source code --> ! <target name="compile.ccmtools" depends="generate.IDL3Parser, generate.IdlScanner, generate.IdlParser, generate.AssemblyLexer, generate.AssemblyParser" description="Compile the ccmtools package." > --- 128,134 ---- ! <!-- ! Compile ccmtools source code ! --> <target name="compile.ccmtools" depends="generate.IDL3Parser, generate.IdlScanner, generate.IdlParser, generate.AssemblyLexer, generate.AssemblyParser" description="Compile the ccmtools package." > *************** *** 111,115 **** ! <!-- Create Java archive file from all package. --> <target name="jar.ccmtools" depends="compile.ccmtools" description="Create Java archive file from ccmtools package." > --- 140,146 ---- ! <!-- ! Create a Java archive file from compiled ccmtools packages ! --> <target name="jar.ccmtools" depends="compile.ccmtools" description="Create Java archive file from ccmtools package." > *************** *** 122,137 **** ! <!-- Install ccmtools --> ! ! <target name="install" depends="jar.ccmtools" description="Install ccmtools to prefix/."> <mkdir dir="${prefix}" /> ! ! <copy todir="${prefix}/lib" overwrite="true"> <fileset dir="${lib}"/> </copy> <copy todir="${prefix}/templates" overwrite="true"> <fileset dir="${src}/templates"/> </copy> <copy todir="${prefix}/idl" overwrite="true"> <fileset dir="${idl}"/> </copy> <copy todir="${prefix}/etc" overwrite="true"> <fileset dir="${etc}"/> </copy> - <copy todir="${prefix}/bin" overwrite="true"> <fileset dir="${bin}"/> </copy> ! <exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmtools"/> </exec> <exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmjava"/> </exec> <exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmidl"/> </exec> --- 153,179 ---- ! <!-- ! Install ccmtools ! --> ! <target name="install.copy" depends="jar.ccmtools" ! description="Install ccmtools to prefix/."> <mkdir dir="${prefix}" /> ! <copy todir="${prefix}/lib" overwrite="true"> ! <fileset dir="${lib}"> ! <include name="ccmtools.jar"/> ! <include name="commons-cli-1.0.jar"/> ! <include name="java-cup-11a.jar"/> ! <include name="antlr.jar"/> ! <include name="jdom.jar"/> ! </fileset> ! </copy> <copy todir="${prefix}/templates" overwrite="true"> <fileset dir="${src}/templates"/> </copy> <copy todir="${prefix}/idl" overwrite="true"> <fileset dir="${idl}"/> </copy> <copy todir="${prefix}/etc" overwrite="true"> <fileset dir="${etc}"/> </copy> <copy todir="${prefix}/bin" overwrite="true"> <fileset dir="${bin}"/> </copy> ! </target> ! ! <target name="install.setup" depends="install.copy" if="isUnix"> ! <exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmtools"/> </exec> <exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmjava"/> </exec> <exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmidl"/> </exec> *************** *** 141,149 **** <exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmdescriptor"/> </exec> <exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmtools-idl"/> </exec> ! </target> ! ! ! <!-- Generate JavaDoc --> <target name="javadoc" depends="javadoc.ccmtools, javadoc.uml2idl"/> --- 183,199 ---- <exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmdescriptor"/> </exec> <exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmtools-idl"/> </exec> ! </target> + <target name="install.doc" > + <mkdir dir="${prefix}/doc" /> + <copy file="${doc}/manual/CcmtoolsManual.pdf" todir="${prefix}/doc" overwrite="true"/> + </target> + + <target name="install" depends="install.doc,install.setup"></target> + + + <!-- + Generate JavaDoc + --> <target name="javadoc" depends="javadoc.ccmtools, javadoc.uml2idl"/> *************** *** 159,164 **** ! <!-- Run test cases --> ! <target name="test" depends="compile.tests, test.idl.parser, test.java.components, test.cpp.components"/> --- 209,215 ---- ! <!-- ! Run test cases ! --> <target name="test" depends="compile.tests, test.idl.parser, test.java.components, test.cpp.components"/> *************** *** 194,215 **** </target> - - <!-- Clean up --> - - <target name="clean" description="Clean up the build and lib directory." > - - <delete file="${src}/${PACKAGE}/Constants.java" /> - - <delete file="${src}/ccmtools/parser/idl3/Idl3Lexer.java" /> - <delete file="${src}/ccmtools/parser/idl3/Idl3Parser.java" /> - <delete file="${src}/ccmtools/parser/idl3/Idl3TokenTypes.java" /> - <delete file="${src}/ccmtools/parser/idl3/Idl3TokenTypes.txt" /> - - <delete dir="${src}/uml_parser" /> - <delete dir="${src-gen}" /> - <delete dir="${build}" /> - <delete dir="${test}/CppRemoteGenerator/sandbox" /> - <delete file="${lib}/ccmtools.jar" /> - </target> - </project> --- 245,247 ---- |