[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jibx-cvs
Subject:    [Jibx-cvs] core/examples/codegen build.xml,1.4,1.5
From:       Dennis Sosnoski <dsosnoski () users ! sourceforge ! net>
Date:       2010-01-20 11:31:55
Message-ID: E1NXYmx-0003iC-Ol () sfp-cvsdas-3 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Update of /cvsroot/jibx/core/examples/codegen
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv14267/examples/codegen

Modified Files:
	build.xml 
Log Message:
Clean up build.

Index: build.xml
===================================================================
RCS file: /cvsroot/jibx/core/examples/codegen/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** build.xml	6 Jan 2010 12:07:33 -0000	1.4
--- build.xml	20 Jan 2010 11:31:53 -0000	1.5
***************
*** 65,74 ****
    </target>
    
!   <!-- make sure modular generation base build is present -->
    <target name="check-base">
      <condition property="base-found">
!       <available file="${basedir}/base/base.jar"/>
      </condition>
!     <fail unless="base-found">Need to first run base generation and build (ant \
buildbase).</fail>  </target>
    
--- 65,74 ----
    </target>
    
!   <!-- make sure modular base jar is present -->
    <target name="check-base">
      <condition property="base-found">
!       <available file="${basedir}/base.jar"/>
      </condition>
!     <fail unless="base-found">Need to first run base generation and build (ant \
custgen3a buildbase).</fail>  </target>
    
***************
*** 86,90 ****
    </target>
    <target name="clean" depends="clean-partial">
!     <delete quiet="true" dir="${basedir}/base"/>
    </target>
    
--- 86,90 ----
    </target>
    <target name="clean" depends="clean-partial">
!     <delete quiet="true" file="${basedir}/base.jar"/>
    </target>
    
***************
*** 93,96 ****
--- 93,97 ----
      
      <echo message="Running code generation from schema"/>
+     <delete quiet="true" dir="${basedir}/gen"/>
      <java classname="org.jibx.schema.codegen.CodeGen" fork="yes"
          classpathref="classpath" failonerror="true">
***************
*** 106,109 ****
--- 107,111 ----
      
      <echo message="Running code generation from schema"/>
+     <delete quiet="true" dir="${basedir}/gen"/>
      <java classname="org.jibx.schema.codegen.CodeGen" fork="yes"
          classpathref="classpath" failonerror="true">
***************
*** 121,124 ****
--- 123,127 ----
      
      <echo message="Running code generation from schema"/>
+     <delete quiet="true" dir="${basedir}/gen"/>
      <java classname="org.jibx.schema.codegen.CodeGen" fork="yes"
          classpathref="classpath" failonerror="true">
***************
*** 136,145 ****
      
      <echo message="Running base code generation from schema"/>
!     <delete quiet="true" dir="${basedir}/base"/>
!     <mkdir dir="${basedir}/base/src"/>
      <java classname="org.jibx.schema.codegen.CodeGen" fork="yes"
          classpathref="classpath" failonerror="true">
        <arg value="-t"/>
!       <arg value="${basedir}/base/src"/>
        <arg value="-c"/>
        <arg value="${basedir}/custom3a.xml"/>
--- 139,147 ----
      
      <echo message="Running base code generation from schema"/>
!     <delete quiet="true" dir="${basedir}/gen"/>
      <java classname="org.jibx.schema.codegen.CodeGen" fork="yes"
          classpathref="classpath" failonerror="true">
        <arg value="-t"/>
!       <arg value="${basedir}/gen/src"/>
        <arg value="-c"/>
        <arg value="${basedir}/custom3a.xml"/>
***************
*** 152,163 ****
    
    <!-- modular generation of extension types -->
!   <target name="custgen3b" depends="check-runtime,clean-partial">
      
      <echo message="Running extension code generation from schema"/>
      <java classname="org.jibx.schema.codegen.CodeGen" fork="yes"
          classpathref="classpath" failonerror="true">
        <classpath>
          <path refid="classpath"/>
!         <pathelement location="${basedir}/base/base.jar"/>
        </classpath>
        <arg value="-t"/>
--- 154,166 ----
    
    <!-- modular generation of extension types -->
!   <target name="custgen3b" depends="check-runtime,check-base,clean-partial">
      
      <echo message="Running extension code generation from schema"/>
+     <delete quiet="true" dir="${basedir}/gen"/>
      <java classname="org.jibx.schema.codegen.CodeGen" fork="yes"
          classpathref="classpath" failonerror="true">
        <classpath>
          <path refid="classpath"/>
!         <pathelement location="${basedir}/base.jar"/>
        </classpath>
        <arg value="-t"/>
***************
*** 176,179 ****
--- 179,183 ----
    
      <echo message="Compiling Java source code"/>
+     <delete quiet="true" dir="${basedir}/bin"/>
      <mkdir dir="${basedir}/bin"/>
      <javac srcdir="${basedir}/gen/src" destdir="${basedir}/bin" debug="on">
***************
*** 200,220 ****
    
      <echo message="Compiling Java source code"/>
!     <mkdir dir="${basedir}/base/bin"/>
!     <javac srcdir="${basedir}/base/src" destdir="${basedir}/base/bin" debug="on">
        <classpath refid="classpath"/>
      </javac>
      
      <echo message="Running JiBX binding compiler"/>
!     <bind binding="${basedir}/base/src/base-binding.xml">
        <classpath>
          <path refid="classpath"/>
!         <pathelement location="${basedir}/base/bin"/>
        </classpath>
      </bind>
      
      <echo message="Building jar"/>
!     <jar jarfile="${basedir}/base/base.jar">
!       <fileset dir="${basedir}/base/bin"/>
!       <fileset dir="${basedir}/base/src" includes="*.xml"/>
      </jar>
      
--- 204,225 ----
    
      <echo message="Compiling Java source code"/>
!     <delete quiet="true" dir="${basedir}/gen/bin"/>
!     <mkdir dir="${basedir}/gen/bin"/>
!     <javac srcdir="${basedir}/gen/src" destdir="${basedir}/gen/bin" debug="on">
        <classpath refid="classpath"/>
      </javac>
      
      <echo message="Running JiBX binding compiler"/>
!     <bind binding="${basedir}/gen/src/base-binding.xml">
        <classpath>
          <path refid="classpath"/>
!         <pathelement location="${basedir}/gen/bin"/>
        </classpath>
      </bind>
      
      <echo message="Building jar"/>
!     <jar jarfile="${basedir}/base.jar">
!       <fileset dir="${basedir}/gen/bin"/>
!       <fileset dir="${basedir}/gen/src" includes="*.xml"/>
      </jar>
      
***************
*** 222,233 ****
    
    <!-- compile and bind the modular classes extending base classes -->
!   <target name="buildext" depends="check-runtime,check-base">
    
      <echo message="Compiling Java source code"/>
      <mkdir dir="${basedir}/bin"/>
      <javac srcdir="${basedir}/gen/src" destdir="${basedir}/bin" debug="on">
        <classpath>
          <path refid="classpath"/>
!         <pathelement path="${basedir}/base/base.jar"/>
        </classpath>
      </javac>
--- 227,239 ----
    
    <!-- compile and bind the modular classes extending base classes -->
!   <target name="buildext" depends="check-runtime,clean-partial">
    
      <echo message="Compiling Java source code"/>
+     <delete quiet="true" dir="${basedir}/bin"/>
      <mkdir dir="${basedir}/bin"/>
      <javac srcdir="${basedir}/gen/src" destdir="${basedir}/bin" debug="on">
        <classpath>
          <path refid="classpath"/>
!         <pathelement path="${basedir}/base.jar"/>
        </classpath>
      </javac>
***************
*** 240,244 ****
        <classpath>
          <path refid="classpath"/>
!         <pathelement path="${basedir}/base/base.jar"/>
        </classpath>
      </bind>
--- 246,250 ----
        <classpath>
          <path refid="classpath"/>
!         <pathelement path="${basedir}/base.jar"/>
        </classpath>
      </bind>
***************
*** 272,276 ****
        <classpath>
          <path refid="classpath"/>
!         <pathelement path="${basedir}/base/base.jar"/>
        </classpath>
        <arg value="org.ota.air"/>
--- 278,282 ----
        <classpath>
          <path refid="classpath"/>
!         <pathelement path="${basedir}/base.jar"/>
        </classpath>
        <arg value="org.ota.air"/>
***************
*** 293,308 ****
      <echo message="custgen1      generate code and binding using custom1.xml"/>
      <echo message="custgen2      generate code and binding using custom2.xml"/>
!     <echo message="custgen3a     generate base code and binding using \
                custom3a.xml"/>
!     <echo message="custgen3b     generate extension code and binding using \
                custom3b.xml"/>
!     <echo message="compile       compile class files"/>
!     <echo message="bind          compile JiBX bindings"/>
!     <echo message="buildbase     compile, bind, and jar base code for modular \
                binding"/>
!     <echo message="buildext      compile and bind modular extension JiBX \
                bindings"/>
      <echo message="run           run test application with default code package"/>
      <echo message="runcust       run test application with custom code package"/>
-     <echo message="runmodular    run test application with modular code package"/>
      <echo message="full          generate default, compile, bind, and test"/>
      <echo message="custom1       generate using custom1.xml, compile, bind, and \
                test"/>
      <echo message="custom2       generate using custom2.xml, compile, bind, and \
                test"/>
      <echo message="modular       generate modular using custom3a.xml and \
custom3b.xml,"/>  <echo message="              compile, bind, and test"/>
--- 299,314 ----
      <echo message="custgen1      generate code and binding using custom1.xml"/>
      <echo message="custgen2      generate code and binding using custom2.xml"/>
!     <echo message="compile       compile class files (non-modular)"/>
!     <echo message="bind          compile JiBX bindings (non-modular)"/>
      <echo message="run           run test application with default code package"/>
      <echo message="runcust       run test application with custom code package"/>
      <echo message="full          generate default, compile, bind, and test"/>
      <echo message="custom1       generate using custom1.xml, compile, bind, and \
                test"/>
      <echo message="custom2       generate using custom2.xml, compile, bind, and \
test"/> +     <echo message="custgen3a     generate base code and binding using \
custom3a.xml"/> +     <echo message="custgen3b     generate extension code and \
binding using custom3b.xml"/> +     <echo message="buildbase     compile, bind, and \
jar base code for modular binding"/> +     <echo message="buildext      compile and \
bind modular extension JiBX bindings"/> +     <echo message="runmodular    run test \
                application with modular code package"/>
      <echo message="modular       generate modular using custom3a.xml and \
custom3b.xml,"/>  <echo message="              compile, bind, and test"/>


------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
Jibx-cvs mailing list
Jibx-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jibx-cvs


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic