|
88 | 88 | <delete file="${archive}.zip" failonerror="true"/> |
89 | 89 | <zip basedir="${archive.dir}" destfile="${grails.dist}/${archive}.zip" /> |
90 | 90 | <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> |
100 | 104 | </target> |
101 | 105 |
|
102 | 106 | <target name="create-release-package"> |
103 | 107 | <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}"/> |
105 | 110 | <antcall target="create-tmp-release-dir"> |
106 | 111 | <param name="dir.location" value="${grails.release.dir}"/> |
107 | 112 | </antcall> |
|
112 | 117 | <antcall target="create-archives"> |
113 | 118 | <param name="archive" value="${grails.release}"/> |
114 | 119 | <param name="archive.dir" value="tmp"/> |
| 120 | + <param name="archive.release.dir" value="tmp"/> |
115 | 121 | </antcall> |
116 | 122 | <delete dir="${grails.release.dir}" failonerror="true"/> |
117 | 123 | </target> |
|
0 commit comments