[Rails-commits] 18xx build.xml, 1.3, 1.4 rails.sh, 1.1, 1.2 rails.bat, 1.1, 1.2

[Brett L. <wak...@us...>]

Update of /cvsroot/rails/18xx
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31014

Modified Files:
	build.xml rails.sh rails.bat 
Log Message:
Update version references to 1.0.7-rc2. Improve build.xml to better automate building a release.

Index: rails.bat
===================================================================
RCS file: /cvsroot/rails/18xx/rails.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rails.bat	9 Nov 2009 16:25:37 -0000	1.1
--- rails.bat	14 Nov 2009 20:21:51 -0000	1.2
***************
*** 1,3 ****
  
! java -jar rails-1.0.7-rc1.jar
!  %1
\ No newline at end of file
--- 1,2 ----
  
! java -jar rails-1.0.7-rc2.jar %1
\ No newline at end of file

Index: rails.sh
===================================================================
RCS file: /cvsroot/rails/18xx/rails.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rails.sh	9 Nov 2009 16:25:37 -0000	1.1
--- rails.sh	14 Nov 2009 20:21:51 -0000	1.2
***************
*** 1,3 ****
  #!/bin/bash
  
! java -jar ./rails-1.0.7-rc1.jar $1
--- 1,3 ----
  #!/bin/bash
  
! java -jar ./rails-1.0.7-rc2.jar $1

Index: build.xml
===================================================================
RCS file: /cvsroot/rails/18xx/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build.xml	8 Nov 2009 01:37:42 -0000	1.3
--- build.xml	14 Nov 2009 20:21:51 -0000	1.4
***************
*** 8,13 ****
      <property environment="env"/>
      <property name="debuglevel" value="source,lines,vars"/>
!     <property name="target" value="1.6"/>
!     <property name="source" value="1.6"/>
      <path id="18xx.classpath">
          <pathelement location="classes"/>
--- 8,14 ----
      <property environment="env"/>
      <property name="debuglevel" value="source,lines,vars"/>
!     <property name="target" value="1.5"/>
!     <property name="source" value="1.5"/>
! 	<property name="version" value="1.0.7-rc2"/>
      <path id="18xx.classpath">
          <pathelement location="classes"/>
***************
*** 27,33 ****
      <target name="clean">
          <delete dir="classes"/>
      </target>
      <target depends="clean" name="cleanall"/>
!     <target depends="build-subprojects,build-project,build-jar" name="build"/>
      <target name="build-subprojects"/>
      <target depends="init" name="build-project">
--- 28,35 ----
      <target name="clean">
          <delete dir="classes"/>
+     	<delete dir="jar"/>
      </target>
      <target depends="clean" name="cleanall"/>
!     <target depends="build-subprojects,build-project,build-release" name="build"/>
      <target name="build-subprojects"/>
      <target depends="init" name="build-project">
***************
*** 52,57 ****
          <antcall target="build"/>
      </target>
! 	<target name="build-jar">
! 		<jar destfile="rails-1.0.7-rc1.jar" basedir="classes" duplicate="preserve">
  			<manifest>
  				<attribute name="Main-Class" value="rails.util.RunGame" />
--- 54,96 ----
          <antcall target="build"/>
      </target>
! 	<target name="build-release">
!         <mkdir dir="jar"/>
!         <copy includeemptydirs="false" todir="jar">
!             <fileset dir="classes">
!                 <exclude name="**/*.launch"/>
!                 <exclude name="**/*.java"/>
!             	<exclude name="rails/test/*"/>
!             	<exclude name="18xx.log"/>
!             	<exclude name="build.xml"/>
!             	<exclude name="buildinfo.xml"/>
!             	<exclude name="manifest"/>
!             	<exclude name="doc/*"/>
!             	<exclude name="html/*"/>
!             	<exclude name="lib/**"/>
!             	<exclude name="rails-${version}/**"/>
!             	<exclude name="rails.bat"/>
!             	<exclude name="rails.sh"/>
!             	<exclude name=".project"/>
!             	<exclude name=".classpath"/>
!             	<exclude name="**/CVS/*"/>
!             	<exclude name="**/.settings/*"/>
!             	<exclude name="**/rails-${version}.jar"/>
!             </fileset>
!         </copy>
! 		<mkdir dir="rails-${version}"/>
! 		<copy includeemptydirs="false" todir="rails-${version}">
! 			<fileset dir=".">
! 				<include name="LICENSE"/>
! 				<include name="README"/>
! 				<include name="AUTHORS"/>
! 				<include name="rails.bat"/>
! 				<include name="rails.sh"/>
! 				<include name="my.properties"/>
! 				<include name="LocalisedText.properties"/>
! 				<include name="games.properties"/>
! 				<include name="lib/**"/>
! 			</fileset>
! 		</copy>
! 		<jar destfile="rails-${version}/rails-${version}.jar" basedir="jar" duplicate="preserve">		
  			<manifest>
  				<attribute name="Main-Class" value="rails.util.RunGame" />