[Coefficient-commits] coefficient modules-common.ent,1.13,1.14 build.xml,1.28,1.29 changelog.txt,1.29,1.30

[Pieter v. Z. <pv...@us...>]

Update of /cvsroot/coefficient/coefficient
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27105

Modified Files:
	modules-common.ent build.xml changelog.txt 
Log Message:
include new release ant target

Index: modules-common.ent
===================================================================
RCS file: /cvsroot/coefficient/coefficient/modules-common.ent,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** modules-common.ent	1 Jul 2005 07:26:53 -0000	1.13
--- modules-common.ent	7 Jul 2005 14:10:43 -0000	1.14
***************
*** 18,21 ****
--- 18,24 ----
    <property name="aspects.container"        value="${coefficient.path}/build/lib/coefficient-ejb.jar" />
    <property name="jboss.deploy.dir"         value="${jboss.dir}/server/default/deploy" />
+   <property name="release.ejb.file"       	value="${project.name}-ejb-${version}" />
+   <property name="release.src.file" 		value="${project.name}-src-${version}" />
+ <property name="release.jar.file" 			value="${project.name}-jar-${version}" />
  
    <taskdef 
***************
*** 316,317 ****
--- 319,432 ----
        </hibernatedoclet>
     </target>
+ 
+ <!-- =================================================================== -->
+ 	<!-- G E N E R A T E   R E L E A S E  B I N A R Y                        -->
+ 	<!-- =================================================================== -->
+ 	<target name="release_ejb_gz" depends="docs">
+ 
+ 		<delete failonerror="false">
+ 			<fileset dir="${distribution.dir}">
+ 				<include name="**/*ejb*gz" />
+ 				<include name="**/*ejb*zip" />
+ 			</fileset>
+ 		</delete>
+ 
+ 		<tar destfile="${distribution.dir}/${release.ejb.file}.tar.gz" compression="gzip">
+ 			<tarfileset dir="${build.dest}" prefix="${project.name}">
+ 				<include name="lib/*.ear" />
+ 			</tarfileset>
+ 			<tarfileset dir="." prefix="${project.name}">
+ 				<include name="INSTALL*" />
+ 				<include name="README*" />
+ 			</tarfileset>
+ 		</tar>
+ 
+ 		<zip destfile="${distribution.dir}/${release.ejb.file}.zip">
+ 			<zipfileset dir="${build.dest}" prefix="${project.name}">
+ 				<include name="lib/*.ear" />
+ 			</zipfileset>
+ 			<zipfileset dir="." prefix="${project.name}">
+ 				<include name="INSTALL*" />
+ 			</zipfileset>
+ 		</zip>
+ 	</target>
+ 
+ 	<!-- =================================================================== -->
+ 	<!-- G E N E R A T E   R E L E A S E  S R C                              -->
+ 	<!-- =================================================================== -->
+ 	<target name="release_src_gz" depends="docs">
+ 
+ 
+ 		<delete failonerror="false">
+ 			<fileset dir="${distribution.dir}">
+ 				<include name="**/*src*gz" />
+ 				<include name="**/*src*zip" />
+ 			</fileset>
+ 		</delete>
+ 
+ 		<tar destfile="${distribution.dir}/${release.src.file}.tar.gz" compression="gzip">
+ 			<tarfileset dir="." prefix="${project.name}">
+ 				<include name="*.txt" />
+ 				<include name="build*" />
+ 				<include name="conf/*" />
+ 				<include name="src/**" />
+ 				<include name="lib/**" />
+ 			</tarfileset>
+ 			<tarfileset dir="${docs.dir}/" prefix="${project.name}">
+ 				<include name="**/*" />
+ 			</tarfileset>
+ 		</tar>
+ 
+ 		<zip destfile="${distribution.dir}/${release.src.file}.zip">
+ 			<zipfileset dir="." prefix="${project.name}">
+ 				<include name="*.txt" />
+ 				<include name="build*" />
+ 				<include name="conf/*" />
+ 				<include name="src/**" />
+ 				<include name="lib/**" />
+ 			</zipfileset>
+ 			<zipfileset dir="${docs.dir}/" prefix="${project.name}">
+ 				<include name="**/*" />
+ 			</zipfileset>
+ 		</zip>
+ 	</target>
+ 
+ 	<!-- =================================================================== -->
+ 	<!-- G E N E R A T E   R E L E A S E  J A R                              -->
+ 	<!-- =================================================================== -->
+ 	<target name="release_jar_gz" depends="docs">
+ 
+ 
+ 		<delete failonerror="false">
+ 			<fileset dir="${distribution.dir}">
+ 				<include name="**/*jar*gz" />
+ 				<include name="**/*jar*zip" />
+ 			</fileset>
+ 		</delete>
+ 
+ 		<tar destfile="${distribution.dir}/${release.jar.file}.tar.gz" compression="gzip">
+ 			<tarfileset dir="${build.dest}" prefix="${project.name}">
+ 				<include name="lib/*.jar" />
+ 			</tarfileset>
+ 			<tarfileset dir="." prefix="${project.name}">
+ 				<include name="INSTALL*" />
+ 				<include name="README*" />		
+ 			</tarfileset>
+ 		</tar>
+ 
+ 		<zip destfile="${distribution.dir}/${release.jar.file}.zip">
+ 			<zipfileset dir="${build.dest}" prefix="${project.name}">
+ 				<include name="lib/*.jar" />
+ 			</zipfileset>
+ 			<zipfileset dir="." prefix="${project.name}">
+ 				<include name="INSTALL*" />
+ 			</zipfileset>
+ 		</zip>
+ 	</target>
+ 
+ 	<!-- =================================================================== -->
+ 	<!-- M A K E  R E L E A S E                                              -->
+ 	<!-- =================================================================== -->
+ 	<target name="release" depends="deploy,release_jar_gz,release_src_gz,release_ejb_gz">
+ 	</target>
+ 

Index: changelog.txt
===================================================================
RCS file: /cvsroot/coefficient/coefficient/changelog.txt,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** changelog.txt	7 Jun 2005 11:38:21 -0000	1.29
--- changelog.txt	7 Jul 2005 14:10:44 -0000	1.30
***************
*** 1,4 ****
--- 1,16 ----
  Coefficient Changelog
  =====================
+ 
+ 
+ version 0.9.6:
+ -----------------
+ 07/07/2005
+ pvz: added Install.txt and Readme.txt to all modules.
+ pvz: added cat-readmeInstall-txt-of-modules target to build.xml file
+ pvz: added release-* tasks to the modules-common.ent for building the gz and zip files
+ 
+ 30/06/2005
+ pvz: updating version numbers in: all Install.txt, Install_web_app.txt, changes.xml, the bat and sh scripts
+ 
  07/06/2005
  pvz: updated comments in updateAllProperties.sh and updateAllPropertiesWeb.sh
***************
*** 25,30 ****
  
  29/04/2005
! pvz: Changed view-projects.vm. Added check: if !MostActiveProject (meanin recent) then add a project/workspace description
! pvz: added a null check for firs time startup in Configuration.canExecuteForRole
          
  Changes in version 0.9.5-1
--- 37,42 ----
  
  29/04/2005
! pvz: Changed view-projects.vm. Added check: if !MostActiveProject (meaning recent) then add a project/workspace description
! pvz: added a null check for first time startup in Configuration.canExecuteForRole
          
  Changes in version 0.9.5-1

Index: build.xml
===================================================================
RCS file: /cvsroot/coefficient/coefficient/build.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** build.xml	19 Apr 2005 08:12:28 -0000	1.28
--- build.xml	7 Jul 2005 14:10:43 -0000	1.29
***************
*** 3,924 ****
  <project name="${project.name}" default="deploy" basedir=".">
  
!   <property file="build.properties"/>
!   <property name="version"                  value="0.9.5-1"/>
!   <property name="lib.dir"                  value="lib"/>
!   <property name="dir.jalopy"               value="jalopyLib"/>
!   <property name="ear.file"                 value="${project.name}-${version}.ear"/>
!   <property name="ejb.jar.file"             value="${project.name}-ejb.jar"/>
!   <property name="war.file"                 value="${project.name}.war"/>
!   <property name="src.misc"                 value="${src.dir}/misc"/>
[...1796 lines suppressed...]
! 		</tar>
! 	</target>
! 	
! 	<!-- =================================================================== -->
! 	<!--CONCAT README FILES OF MODULES                                       -->
! 	<!-- =================================================================== -->
! 	<target name="cat-readmeInstall-txt-of-modules">
! 		<delete file="${distribution.dir}/modules/README.txt" />
! 		<delete file="${distribution.dir}/nodules/INSTALL.txt" />
! 		<concat destfile="${distribution.dir}/modules/README.txt" append="true" fixlastline="true">	
! 			<fileset dir="modules" 
! 			         includes="**/README*" />
! 		</concat>
! 		<concat destfile="${distribution.dir}/modules/INSTALL.txt" append="true" fixlastline="true">	
! 			<fileset dir="modules" 
! 					includes="**/INSTALL.*" />
! 		</concat>
! 	</target>
  
  </project>