csms-cvs

[<rga...@us...>]

Update of /cvsroot/csms/csms-core
In directory usw-pr-cvs1:/tmp/cvs-serv32393

Modified Files:
	centibuild.xml 
Log Message:
Fixed problem executing startup script on windows

Index: centibuild.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/centibuild.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** centibuild.xml	22 Oct 2002 18:08:40 -0000	1.7
--- centibuild.xml	27 Oct 2002 21:18:31 -0000	1.8
***************
*** 1,24 ****
  <?xml version="1.0"?>
  <project default="interactive" basedir="." name="project build file">
! 	
!     <description>
!                        * ===================================== *
!                        |   Krysalis Centipede Build System     |
!                        * ===================================== *
!                                          by
! 
!                        Nicola Ken Barozzi (nic...@ap...)
!                        Marc Johnson (mjo...@ap...)
! 
! 
!                        For a simple interactive build, simply
!                        run the build script (build.bar or build.sh)
!     </description>
! 
  
!     <!-- =================================================================== -->
!     <!-- Import Ant-Centipede -init targets - sets up basic build stuff      -->
!     <!-- =================================================================== -->
!     <!--
            This is the target that initializes tasks and properties used
            commonly in every other target.
--- 1,14 ----
  <?xml version="1.0"?>
  <project default="interactive" basedir="." name="project build file">
!   <description>* ===================================== * | Krysalis Centipede
!   Build System | * ===================================== * by Nicola Ken
!   Barozzi (nic...@ap...) Marc Johnson (mjo...@ap...) For a
!   simple interactive build, simply run the build script (build.bar or
!   build.sh)</description>
  
! <!-- =================================================================== -->
! <!-- Import Ant-Centipede -init targets - sets up basic build stuff      -->
! <!-- =================================================================== -->
! <!--
            This is the target that initializes tasks and properties used
            commonly in every other target.
***************
*** 31,125 ****
            To make it invisible when using -projecthelp, it lacks a description.
      -->
  
!     <import file="${ant.home}/src/core/xbuild.xml"/>
!     <taskdef file="${ant.home}/src/core/tasks.properties"/>
  
!     <importcent name="centipede"/> 
!     <importcent name="antidote"/> 
!     <importcent name="checkstyle"/>
!     <importcent name="jdepend"/>
!     <importcent name="forrest"/> 
!     <importcent name="gump"/>
!     <importcent name="javasrc"/> 
!     <importcent name="junit"/>
!     <importcent name="scripts"/>
  
!     <!-- =================================================================== -->
!     <!-- Basic build targets for the project                                 -->
!     <!-- =================================================================== -->
  
!     <!-- =================================================================== -->
!     <!-- Interactive build                                                   -->
!     <!-- =================================================================== -->
!     <target name="interactive" description="Interactive Build">
!         <echo>
!         --------------------------------------------------------------
  
!                       ${xgump.module.name}  [${YEAR}]
  
!         --------------------------------------------------------------
!          Using ${ant.version}
!          Build file ${ant.file}
!         --------------------------------------------------------------
!          These are the most common build targets.
!          You can also invoke them directly; see build.xml for more info.
!          Builds will be in /build directory, distributions in /dist.
  
!          all -------------- creates the jars and the site
!          compile ---------- compiles the source code
!          test ------------- performs the jUnit tests
!          jar -------------- create the jar files
!          docs ------------- generates the html docs - clean not needed
!          javadocs --------- generates the API documentation
!          site ------------- generates the html site (docs+reports)
!          clean ------------ cleans the build directory
!          dist ------------- creates src and bin distributions
!         </echo>
!         
!           <input
!              message="Please select a target "
!              addproperty="input.selection"
!           />
!          <condition property="do.abort">
!            <equals arg1="" arg2="input.selection" />
!          </condition>
!          <fail if="do.abort">Build aborted by user.</fail>
  
!         <antrun target="splash"/>
!         <antrun target="${input.selection}"/>
  
!     </target>
!     
!     <target name="all" depends="clean, code, metrics, docs, dist"/>
!     	
!     <target name="code" depends="compile, test, package"/>
!     <target name="metrics" depends="checkstyle, report, jdepend-xdoc"/>
!     <target name="docs" depends="test, metrics, javasrc, javadocs, forrest.docs"/>
!     <target name="run" depends="distclean, dist-bin">
!       <exec executable="${basedir}/dist/bin/bin/csms" dir="${basedir}/dist/bin/bin"/>
!     </target>
  
!     <!-- ================================== -->
!     <!--        Target used by Gump         -->
!     <!-- ================================== -->
  
!     <target  name="gump" description="Target used by Gump">
!     </target>
  
!   <target name="pre-dist" depends="scripts"/>
  
    <target name="scripts">
!        <!-- Make scripts for Fantasy Sports Module -->
!        <antcall target="make-main-scripts">
!          <param name="scripts.cent.script.name" value="fsm"/>
!          <param name="scripts.cent.class" value="org.fanfoot.gui.ControlCentre"/>
!        </antcall>
!        <!-- Make scripts for CSMS core application -->
!        <antcall target="make-main-scripts">
!          <param name="scripts.cent.script.name" value="csms"/>
!          <param name="scripts.cent.class" value="org.fanfoot.gui.ControlCentre"/>
!        </antcall>
!    </target>
  
  </project>
  
--- 21,157 ----
            To make it invisible when using -projecthelp, it lacks a description.
      -->
+   <import file="${ant.home}/src/core/xbuild.xml" />
  
!   <taskdef file="${ant.home}/src/core/tasks.properties" />
  
!   <importcent name="centipede" />
  
!   <importcent name="antidote" />
  
!   <importcent name="checkstyle" />
  
!   <importcent name="jdepend" />
!   
!   <!-- FIXME: This cent should be uploaded to a Krysalis repositroy, until then
!   it will break builds, please comment this line out if you do not have the cent 
!   locally
!   <importcent name="javaNCSS" dest="file://ext/openSource/krysalis-gpl-cents/cents"/> -->
  
!   <importcent name="forrest" />
  
!   <importcent name="gump" />
  
!   <importcent name="javasrc" />
  
!   <importcent name="junit" />
  
!   <importcent name="scripts" />
  
! <!-- =================================================================== -->
! <!-- Basic build targets for the project                                 -->
! <!-- =================================================================== -->
! <!-- =================================================================== -->
! <!-- Interactive build                                                   -->
! <!-- =================================================================== -->
!   <target name="interactive" description="Interactive Build">
!     <echo>--------------------------------------------------------------
!     ${xgump.module.name} [${YEAR}]
!     -------------------------------------------------------------- Using
!     ${ant.version} Build file ${ant.file}
!     -------------------------------------------------------------- These are
!     the most common build targets. You can also invoke them directly; see
!     build.xml for more info. Builds will be in /build directory, distributions
!     in /dist. all -------------- creates the jars and the site compile
!     ---------- compiles the source code test ------------- performs the jUnit
!     tests jar -------------- create the jar files docs ------------- generates
!     the html docs - clean not needed javadocs --------- generates the API
!     documentation site ------------- generates the html site (docs+reports)
!     clean ------------ cleans the build directory dist ------------- creates
!     src and bin distributions</echo>
  
!     <input message="Please select a target " addproperty="input.selection" />
! 
!     <condition property="do.abort">
!       <equals arg1="" arg2="input.selection" />
!     </condition>
! 
!     <fail if="do.abort">Build aborted by user.</fail>
! 
!     <antrun target="splash" />
! 
!     <antrun target="${input.selection}" />
!   </target>
! 
!   <target name="all" depends="clean, code, metrics, docs, dist" />
! 
!   <target name="code" depends="compile, test, package" />
! 
!   <target name="metrics" depends="checkstyle, report, jdepend-xdoc" />
! 
!   <target name="docs"
!   depends="test, metrics, javasrc, javadocs, forrest.docs" />
! 
!   <!-- ============================================= -->
!   <!--        Build the distribution and run it      -->
!   <!-- ============================================= -->
!   
!   <target name="run" depends="os-type, dist-bin">
!     <if>
!       <equals arg1="${isUnix}" arg2="true" />
! 
!       <then>
!         <exec executable="${basedir}/dist/bin/bin/csms"
!         dir="${basedir}/dist/bin/bin" />
!       </then>
!     </if>
! 
!     <if>
!       <equals arg1="${isWindows}" arg2="true" />
! 
!       <then>
!         <exec executable="${basedir}/dist/bin/bin/csms.bat"
!         dir="${basedir}/dist/bin/bin" />
!       </then>
!     </if>
!   </target>
! 
! <!-- ============================================= -->
! <!--        Set a property for the OS type         -->
! <!-- ============================================= -->
!   <target name="os-type">
!     <condition property="isWindows">
!       <os family="windows" />
!     </condition>
! 
!     <condition property="isUnix">
!       <os family="unix" />
!     </condition>
!   </target>
! 
! <!-- ================================== -->
! <!--        Target used by Gump         -->
! <!-- ================================== -->
!   <target name="gump" description="Target used by Gump">
!   </target>
! 
!   <target name="pre-dist" depends="scripts" />
  
    <target name="scripts">
! <!-- Make scripts for Fantasy Sports Module -->
!     <antcall target="make-main-scripts">
!       <param name="scripts.cent.script.name" value="fsm" />
  
+       <param name="scripts.cent.class"
+       value="org.fanfoot.gui.ControlCentre" />
+     </antcall>
+ 
+ <!-- Make scripts for CSMS core application -->
+     <antcall target="make-main-scripts">
+       <param name="scripts.cent.script.name" value="csms" />
+ 
+       <param name="scripts.cent.class"
+       value="org.fanfoot.gui.ControlCentre" />
+     </antcall>
+   </target>
  </project>