[Osmose-dev-devel] osmose build.xml,1.3,1.4

[Olivier G. <og...@us...>]

Update of /cvsroot/osmose-dev/osmose
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24695/osmose

Modified Files:
	build.xml 
Log Message:
replaced zip format by tar.gz to handle file permissions (bug #1277539).

Index: build.xml
===================================================================
RCS file: /cvsroot/osmose-dev/osmose/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build.xml	17 Nov 2005 22:18:14 -0000	1.3
--- build.xml	25 Nov 2005 22:15:04 -0000	1.4
***************
*** 1,4 ****
  <?xml version="1.0"?>
! <project name="Osmose" default="zip" basedir=".">
  
    <property name="src" location="src"/>
--- 1,4 ----
  <?xml version="1.0"?>
! <project name="Osmose" default="dist" basedir=".">
  
    <property name="src" location="src"/>
***************
*** 45,48 ****
--- 45,53 ----
  		  <fileset dir="launchers/user"/>
  		</copy>
+     <!-- the ant <copy> task loses files permissions -->
+     <chmod file="${dist}/Osmose-${DSTAMP}/osmose_linux" perm="ug+x"/>
+     <chmod
+       file="${dist}/Osmose-${DSTAMP}/Osmose(MacOSX).app/Contents/MacOS/Osmose(MacOSX)"
+       perm="ug+x"/>
   		<copy todir="${dist}/Osmose-${DSTAMP}/config">
   			<fileset dir="config"/>
***************
*** 64,74 ****
  			</fileset>
   		</copy>
! 		<zip destfile="Osmose-${DSTAMP}.zip"
!        			basedir="${dist}"
!   		/> 
!   		<delete dir="${dist}"/>
  	</target>
  
! 	<target name="src_zip" >
   		<delete dir="${dist}"/>
   		<delete dir="${build}"/>
--- 69,89 ----
  			</fileset>
   		</copy>
!     <tar destfile="Osmose-${DSTAMP}.tar.gz" compression="gzip"
!          longfile="gnu">
!       <!-- files that need execution permission -->
!       <tarfileset dir="${dist}" mode="755">
!         <include name="**/osmose_linux"/>
!         <include name="**/Osmose-${DSTAMP}/Osmose(MacOSX).app/Contents/MacOS/Osmose(MacOSX)"/>
!       </tarfileset>
!       <!-- files that don't need execution permission -->
!       <tarfileset dir="${dist}">
!         <exclude name="**/osmose_linux"/>
!         <exclude name="**/Osmose-${DSTAMP}/Osmose(MacOSX).app/Contents/MacOS/Osmose(MacOSX)"/>
!       </tarfileset>
!     </tar>
!     <delete dir="${dist}"/>
  	</target>
  
! 	<target name="src-dist" >
   		<delete dir="${dist}"/>
   		<delete dir="${build}"/>
***************
*** 78,89 ****
  		    <fileset dir=".">
        			<exclude name="Osmose-src-${DSTAMP}"/>
!       			<exclude name="*.zip"/>
!       			<exclude name="vssver.scc"/>
      		</fileset>		
  		</copy>
! 		  <zip destfile="Osmose-src-${DSTAMP}.zip"
! 		       basedir="."
! 		       includes="Osmose-src-${DSTAMP}/**/*"
! 		  />
   		<delete dir="Osmose-src-${DSTAMP}"/>		  
  	</target>
--- 93,101 ----
  		    <fileset dir=".">
        			<exclude name="Osmose-src-${DSTAMP}"/>
! 						<exclude name="*.tar.gz"/>
      		</fileset>		
  		</copy>
!     <tar destfile="Osmose-src-${DSTAMP}.tar.gz"
!          basedir="." compression="gzip" longfile="gnu"/>
   		<delete dir="Osmose-src-${DSTAMP}"/>		  
  	</target>