Skip to content

Commit 53f20e8

Browse files
author
marcpalmer
committed
Execute permissions now set properly in .tar.gz distributions (GRAILS-409)
git-svn-id: https://svn.codehaus.org/grails/trunk@1714 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d
1 parent 5adbc05 commit 53f20e8

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

ant/build/release.xml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,20 +88,25 @@
8888
<delete file="${archive}.zip" failonerror="true"/>
8989
<zip basedir="${archive.dir}" destfile="${grails.dist}/${archive}.zip" />
9090
<delete file="${archive}.tar.gz" failonerror="true"/>
91-
<tar basedir="${archive.dir}" destfile="dist/${archive}.tar.gz" compression="gzip" longfile="gnu" />
92-
<!-- <tarfileset dir="${archive.dir}" mode="755" username="grails" group="grails">
93-
<include name="${archive.dir}/bin/grails"/>
94-
</tarfileset>
95-
<tarfileset dir="${archive.dir}" username="grails" group="grails">
96-
<include name="${archive.dir}/**"/>
97-
<exclude name="${archive.dir}/bin/grails"/>
98-
</tarfileset>
99-
</tar>-->
91+
<tar destfile="dist/${archive}.tar.gz" compression="gzip" longfile="gnu">
92+
<!-- Here we need to base on archive.dir so the tar has the grails-VERSION/ prefix dir
93+
but need to include/exclude files relative to this prefix dir or they don't
94+
get found, obviously -->
95+
<tarfileset dir="${archive.dir}">
96+
<exclude name="${grails.release.base.dir.name}/bin/grails"/>
97+
<exclude name="${grails.release.base.dir.name}/ant/bin/ant"/>
98+
</tarfileset>
99+
<tarfileset dir="${archive.dir}" mode="755">
100+
<include name="${grails.release.base.dir.name}/bin/grails"/>
101+
<include name="${grails.release.base.dir.name}/ant/bin/ant"/>
102+
</tarfileset>
103+
</tar>
100104
</target>
101105

102106
<target name="create-release-package">
103107
<property name="grails.release" value="${release.name}"/>
104-
<property name="grails.release.dir" location="tmp/grails-${grails.version}"/>
108+
<property name="grails.release.base.dir.name" value="grails-${grails.version}"/>
109+
<property name="grails.release.dir" location="tmp/${grails.release.base.dir.name}"/>
105110
<antcall target="create-tmp-release-dir">
106111
<param name="dir.location" value="${grails.release.dir}"/>
107112
</antcall>
@@ -112,6 +117,7 @@
112117
<antcall target="create-archives">
113118
<param name="archive" value="${grails.release}"/>
114119
<param name="archive.dir" value="tmp"/>
120+
<param name="archive.release.dir" value="tmp"/>
115121
</antcall>
116122
<delete dir="${grails.release.dir}" failonerror="true"/>
117123
</target>

0 commit comments

Comments
 (0)