Menu
▾
▴
[ccmtools-cvs] ccmtools BRANCHES, NONE, 1.1.2.1 ChangeLog, 1.59, 1.59.4.1 build.xml, 1.73.4.1, 1.73.4.2
|
From: Teiniker E. <tei...@us...> - 2007-02-13 13:57:24
|
Update of /cvsroot/ccmtools/ccmtools In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11134 Modified Files: Tag: BRANCH-FHJ ChangeLog build.xml Added Files: Tag: BRANCH-FHJ BRANCHES Log Message: merged changes from trunk --- NEW FILE: BRANCHES --- $Id: BRANCHES,v 1.1.2.1 2007/02/13 13:56:42 teiniker Exp $ : | +-- RELEASE-0_8_5 |\ | *--------------------------+ RELEASE-0_8-BRANCH | | : : | | | + RELEASE-0_8_7 (February 13, 2007) | /| +<-- merged 2007-02-13 ----* | | v | v Index: build.xml =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/build.xml,v retrieving revision 1.73.4.1 retrieving revision 1.73.4.2 diff -C2 -d -r1.73.4.1 -r1.73.4.2 *** build.xml 2 Feb 2007 14:42:28 -0000 1.73.4.1 --- build.xml 13 Feb 2007 13:56:42 -0000 1.73.4.2 *************** *** 1,11 **** <project name="ccmtools" default="install" basedir="."> ! ! <!-- Define properties that are used in the following tasks. Note that a property can be set from command-line: ant -Dprefix=/usr/local --> <property name="src" location="src" /> ! <property name="src-gen" location="src-gen" /> ! <property name="src-test" location="src-test" /> <property name="idl" location="idl" /> <property name="bin" location="bin" /> --- 1,11 ---- <project name="ccmtools" default="install" basedir="."> ! ! <!-- Define properties that are used in the following tasks. Note that a property can be set from command-line: ant -Dprefix=/usr/local --> <property name="src" location="src" /> ! <property name="src-gen" location="src-gen" /> ! <property name="src-test" location="src-test" /> <property name="idl" location="idl" /> <property name="bin" location="bin" /> *************** *** 17,21 **** <property name="test" location="test" /> ! <!-- Define different paths that are used in the following tasks --> --- 17,21 ---- <property name="test" location="test" /> ! <!-- Define different paths that are used in the following tasks --> *************** *** 38,82 **** <mkdir dir="${build}" /> <mkdir dir="${build}/classes" /> ! </target> - <!-- Generate IDL3 parser source code using ANTLR --> ! <target name="generate.IDL3Parser" depends="init"> ! <antlr target="${src}/ccmtools/parser/idl3/idl3new.g" dir="${src}/ccmtools/parser/idl3" > <classpath refid="compile.classpath" /> </antlr> </target> ! ! <!-- Generate IDL parser source code using JFlex+Cup --> ! <target name="generate.IdlScanner" depends="init"> ! <java jar="${lib}/JFlex.jar" fork="true"> <arg line = "-d ${src-gen}/ccmtools/parser/idl ${src}/ccmtools/parser/idl/idlscanner.flex" /> </java> </target> ! <target name="generate.IdlParser" depends="init"> ! <java jar="${lib}/java-cup-11a.jar" fork="true"> <arg line = "-destdir ${src-gen}/ccmtools/parser/idl -package ccmtools.parser.idl -parser IdlParser ${src}/ccmtools/parser/idl/idlparser.cup" /> ! </java> </target> <!-- Compile ccmtools source code --> ! <target name="compile.ccmtools" depends="generate.IDL3Parser, generate.IdlScanner, generate.IdlParser" description="Compile the ccmtools package." > ! <javac srcdir="${src}/ccmtools:${src-gen}" destdir="${build}/classes" debug="on" source="1.5" target="1.5" verbose="off"> ! <classpath refid="compile.classpath" /> </javac> </target> ! ! <!-- Create Java archive file from all package. --> ! <target name="jar.ccmtools" depends="compile.ccmtools" description="Create Java archive file from ccmtools package." > <jar jarfile="${lib}/ccmtools.jar" basedir="${build}/classes" > --- 38,115 ---- <mkdir dir="${build}" /> <mkdir dir="${build}/classes" /> ! </target> ! <!-- Generate IDL3 parser source code using ANTLR --> ! <target name="generate.IDL3Parser" depends="init"> ! <antlr target="${src}/ccmtools/parser/idl3/idl3new.g" dir="${src}/ccmtools/parser/idl3" > <classpath refid="compile.classpath" /> </antlr> </target> ! ! <!-- Generate IDL parser source code using JFlex+Cup --> ! <target name="generate.IdlScanner" depends="init"> ! <java jar="${lib}/JFlex.jar" fork="true"> <arg line = "-d ${src-gen}/ccmtools/parser/idl ${src}/ccmtools/parser/idl/idlscanner.flex" /> </java> </target> ! <target name="generate.IdlParser" depends="init"> ! <java jar="${lib}/java-cup-11a.jar" fork="true"> <arg line = "-destdir ${src-gen}/ccmtools/parser/idl -package ccmtools.parser.idl -parser IdlParser ${src}/ccmtools/parser/idl/idlparser.cup" /> ! </java> </target> + <!-- Generate assembly parser source code using JFlex+Cup --> + + <target name="generate.AssemblyLexer" depends="init"> + <java jar="${lib}/JFlex.jar" fork="true"> + <arg line = "-d ${src-gen}/ccmtools/parser/assembly ${src}/ccmtools/parser/assembly/assembly.flex" /> + </java> + </target> + + <target name="generate.AssemblyParser" depends="init"> + <java jar="${lib}/java-cup-11a.jar" fork="true"> + <arg line = "-destdir ${src-gen}/ccmtools/parser/assembly -parser AssemblyParser ${src}/ccmtools/parser/assembly/assembly.cup" /> + </java> + </target> + + <target name="compile.AssemblyMain" depends="generate.AssemblyLexer, generate.AssemblyParser"> + <javac srcdir="${src}/ccmtools/parser/assembly:${src-gen}/ccmtools/parser/assembly" + destdir="${build}/classes" + debug="on" source="1.5" target="1.5" verbose="off"> + <classpath refid="compile.classpath" /> + </javac> + </target> + + <target name="jar.AssemblyMain" depends="compile.AssemblyMain"> + <jar jarfile="${lib}/assembly.jar" + basedir="${build}/classes" + includes="ccmtools/parser/assembly/**"> + <manifest> + <attribute name="Main-Class" value="ccmtools.parser.assembly.Main" /> + </manifest> + </jar> + </target> + + <!-- Compile ccmtools source code --> ! <target name="compile.ccmtools" depends="generate.IDL3Parser, generate.IdlScanner, generate.IdlParser" description="Compile the ccmtools package." > ! <javac srcdir="${src}/ccmtools:${src-gen}" destdir="${build}/classes" debug="on" source="1.5" target="1.5" verbose="off"> ! <classpath refid="compile.classpath" /> </javac> </target> ! ! <!-- Create Java archive file from all package. --> ! <target name="jar.ccmtools" depends="compile.ccmtools" description="Create Java archive file from ccmtools package." > <jar jarfile="${lib}/ccmtools.jar" basedir="${build}/classes" > *************** *** 89,101 **** <!-- 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> <!-- for linux only --- 122,134 ---- <!-- 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> <!-- for linux only *************** *** 110,141 **** --> </target> ! <!-- Generate JavaDoc --> ! ! <target name="javadoc" depends="javadoc.ccmtools, javadoc.uml2idl"/> ! <target name="javadoc.ccmtools" description="Generate javadoc for the ccmtools package."> <javadoc packagenames="ccmtools.*" sourcepath="${src}" destDir="${prefix}/javadoc/ccmtools"> </javadoc> </target> ! <target name="javadoc.uml2idl" description="Generate javadoc for the uml_parser and uml2idl package."> <javadoc packagenames="uml_parser, uml2idl" sourcepath="${src}" destDir="${prefix}/javadoc/uml2idl"> </javadoc> </target> ! ! <!-- Run test cases --> ! ! <target name="test" depends="compile.tests, test.idl.parser, test.java.components, test.cpp.components"/> ! <target name="compile.tests" depends="compile.ccmtools" > ! <javac srcdir="${src}/ccmtools:${src-test}" destdir="${build}/classes" debug="on" source="1.5" target="1.5" verbose="off"> ! <classpath refid="compile.classpath" /> </javac> </target> ! <target name="test.idl.parser" > <junit printsummary="true" haltonfailure="true" showoutput="true"> --- 143,174 ---- --> </target> ! <!-- Generate JavaDoc --> ! ! <target name="javadoc" depends="javadoc.ccmtools, javadoc.uml2idl"/> ! <target name="javadoc.ccmtools" description="Generate javadoc for the ccmtools package."> <javadoc packagenames="ccmtools.*" sourcepath="${src}" destDir="${prefix}/javadoc/ccmtools"> </javadoc> </target> ! <target name="javadoc.uml2idl" description="Generate javadoc for the uml_parser and uml2idl package."> <javadoc packagenames="uml_parser, uml2idl" sourcepath="${src}" destDir="${prefix}/javadoc/uml2idl"> </javadoc> </target> ! ! <!-- Run test cases --> ! ! <target name="test" depends="compile.tests, test.idl.parser, test.java.components, test.cpp.components"/> ! <target name="compile.tests" depends="compile.ccmtools" > ! <javac srcdir="${src}/ccmtools:${src-test}" destdir="${build}/classes" debug="on" source="1.5" target="1.5" verbose="off"> ! <classpath refid="compile.classpath" /> </javac> </target> ! <target name="test.idl.parser" > <junit printsummary="true" haltonfailure="true" showoutput="true"> *************** *** 153,157 **** </junit> </target> ! <target name="test.cpp.components" > <junit printsummary="true" haltonfailure="true" showoutput="true"> --- 186,190 ---- </junit> </target> ! <target name="test.cpp.components" > <junit printsummary="true" haltonfailure="true" showoutput="true"> *************** *** 160,168 **** <test name="ccmtools.generator.cpp.CppComponentsTestSuite" /> </junit> ! </target> - <!-- Clean up --> ! <target name="clean" description="Clean up the build and lib directory." > --- 193,201 ---- <test name="ccmtools.generator.cpp.CppComponentsTestSuite" /> </junit> ! </target> ! <!-- Clean up --> ! <target name="clean" description="Clean up the build and lib directory." > *************** *** 175,182 **** <delete dir="${src}/uml_parser" /> ! <delete dir="${src-gen}" /> ! <delete dir="${build}" /> ! <delete dir="${test}/CppRemoteGenerator/sandbox" /> ! <delete file="${lib}/ccmtools.jar" /> </target> --- 208,215 ---- <delete dir="${src}/uml_parser" /> ! <delete dir="${src-gen}" /> ! <delete dir="${build}" /> ! <delete dir="${test}/CppRemoteGenerator/sandbox" /> ! <delete file="${lib}/ccmtools.jar" /> </target> Index: ChangeLog =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/ChangeLog,v retrieving revision 1.59 retrieving revision 1.59.4.1 diff -C2 -d -r1.59 -r1.59.4.1 *** ChangeLog 24 Jan 2007 15:49:16 -0000 1.59 --- ChangeLog 13 Feb 2007 13:56:41 -0000 1.59.4.1 *************** *** 2,5 **** --- 2,16 ---- ============================================================================ + RELEASE-0.8.7 (February 13, 2007) + ---------------------------------------------------------------------------- + *) Bugfix: Windows paths, parser rule for preprocessor lines + + RELEASE-0.8.6 (January 26, 2007) + ---------------------------------------------------------------------------- + *) Refactoring: Interface constants in C++ + Changed the mapping of IDL interface constants from static const members + to static getter methods (using the same name sa the defined constants). + This refactoring was triggert by an Interix problem reported by Duft Markus. + RELEASE-0.8.5 (January 24, 2007) RELEASE-0.8.4 (January 16, 2007) |
