Skip to content

Commit 3e38b47

Browse files
author
marcpalmer
committed
GRAILS-1241 - Added Brand 2.0 icons in grails/media/icons
git-svn-id: https://svn.codehaus.org/grails/trunk@4513 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d
1 parent 3bf0420 commit 3e38b47

File tree

1 file changed

+38
-34
lines changed

1 file changed

+38
-34
lines changed

‎ant/build/release.xml‎

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,18 @@
2727
<param name="dir.location" value="ant"/>
2828
<param name="dir.destination" value="${release.dir}/ant"/>
2929
</antcall>
30-
<antcall target="copy-dir">
31-
<param name="dir.location" value="scripts"/>
32-
<param name="dir.destination" value="${release.dir}/scripts"/>
33-
</antcall>
34-
<antcall target="copy-dir">
35-
<param name="dir.location" value="conf"/>
36-
<param name="dir.destination" value="${release.dir}/conf"/>
37-
</antcall>
30+
<antcall target="copy-dir">
31+
<param name="dir.location" value="media"/>
32+
<param name="dir.destination" value="${release.dir}/media"/>
33+
</antcall>
34+
<antcall target="copy-dir">
35+
<param name="dir.location" value="scripts"/>
36+
<param name="dir.destination" value="${release.dir}/scripts"/>
37+
</antcall>
38+
<antcall target="copy-dir">
39+
<param name="dir.location" value="conf"/>
40+
<param name="dir.destination" value="${release.dir}/conf"/>
41+
</antcall>
3842
<antcall target="copy-dir">
3943
<param name="dir.location" value="samples"/>
4044
<param name="dir.destination" value="${release.dir}/samples"/>
@@ -63,19 +67,19 @@
6367
<param name="dir.location" value="src/war"/>
6468
<param name="dir.destination" value="${release.dir}/src/war"/>
6569
</antcall>
66-
<copy todir="${release.dir}/dist">
67-
<fileset dir="${grails.dist}" includes="*.jar">
68-
<exclude name="*.zip"/>
69-
<exclude name="*.tar.gz"/>
70-
</fileset>
71-
</copy>
70+
<copy todir="${release.dir}/dist">
71+
<fileset dir="${grails.dist}" includes="*.jar">
72+
<exclude name="*.zip"/>
73+
<exclude name="*.tar.gz"/>
74+
</fileset>
75+
</copy>
7276
</target>
7377

7478
<target name="copy-exclusive-source-release-content">
7579
<antcall target="copy-dir">
7680
<param name="dir.location" value="cruise/coverage/lib"/>
7781
<param name="dir.destination" value="${release.dir}/cruise/coverage/lib"/>
78-
</antcall>
82+
</antcall>
7983
<antcall target="copy-dir">
8084
<param name="dir.location" value="src"/>
8185
<param name="dir.destination" value="${release.dir}/src"/>
@@ -84,35 +88,35 @@
8488
<param name="dir.location" value="test"/>
8589
<param name="dir.destination" value="${release.dir}/test"/>
8690
</antcall>
87-
<copy todir="${release.dir}/dist">
88-
<fileset dir="${grails.dist}" includes="*.jar">
89-
<exclude name="*.zip"/>
90-
<exclude name="*.tar.gz"/>
91-
</fileset>
92-
</copy>
91+
<copy todir="${release.dir}/dist">
92+
<fileset dir="${grails.dist}" includes="*.jar">
93+
<exclude name="*.zip"/>
94+
<exclude name="*.tar.gz"/>
95+
</fileset>
96+
</copy>
9397
</target>
9498

9599
<target name="create-archives">
96100
<delete file="${archive}.zip" failonerror="true"/>
97-
<zip basedir="${archive.dir}" destfile="${grails.dist}/${archive}.zip" />
101+
<zip basedir="${archive.dir}" destfile="${grails.dist}/${archive}.zip"/>
98102
<delete file="${archive}.tar.gz" failonerror="true"/>
99103
<tar destfile="dist/${archive}.tar.gz" compression="gzip" longfile="gnu">
100104
<!-- Here we need to base on archive.dir so the tar has the grails-VERSION/ prefix dir
101105
but need to include/exclude files relative to this prefix dir or they don't
102106
get found, obviously -->
103107
<tarfileset dir="${archive.dir}">
104108
<exclude name="${grails.release.base.dir.name}/bin/grails"/>
105-
<exclude name="${grails.release.base.dir.name}/bin/grails-0.4"/>
106-
<exclude name="${grails.release.base.dir.name}/bin/startGrails"/>
109+
<exclude name="${grails.release.base.dir.name}/bin/grails-0.4"/>
110+
<exclude name="${grails.release.base.dir.name}/bin/startGrails"/>
107111
<exclude name="${grails.release.base.dir.name}/ant/bin/ant"/>
108112
</tarfileset>
109113
<tarfileset dir="${archive.dir}" mode="755">
110114
<include name="${grails.release.base.dir.name}/bin/grails"/>
111115
<include name="${grails.release.base.dir.name}/ant/bin/ant"/>
112-
<include name="${grails.release.base.dir.name}/bin/grails-0.4"/>
113-
<include name="${grails.release.base.dir.name}/bin/startGrails"/>
116+
<include name="${grails.release.base.dir.name}/bin/grails-0.4"/>
117+
<include name="${grails.release.base.dir.name}/bin/startGrails"/>
114118
</tarfileset>
115-
</tar>
119+
</tar>
116120
</target>
117121

118122
<target name="create-release-package">
@@ -125,7 +129,7 @@
125129
<antcall target="copy-common-release-content">
126130
<param name="release.dir" value="${grails.release.dir}"/>
127131
</antcall>
128-
<antcall target="create-release-package:extra-target" />
132+
<antcall target="create-release-package:extra-target"/>
129133
<antcall target="create-archives">
130134
<param name="archive" value="${grails.release}"/>
131135
<param name="archive.dir" value="tmp"/>
@@ -134,12 +138,12 @@
134138
<delete dir="${grails.release.dir}" failonerror="true"/>
135139
</target>
136140

137-
<target name="create-release-package:extra-target" if="extra.target">
138-
<echo>Copying extra binary release content</echo>
139-
<antcall target="${extra.target}">
140-
<param name="release.dir" value="${grails.release.dir}"/>
141-
</antcall>
142-
</target>
141+
<target name="create-release-package:extra-target" if="extra.target">
142+
<echo>Copying extra binary release content</echo>
143+
<antcall target="${extra.target}">
144+
<param name="release.dir" value="${grails.release.dir}"/>
145+
</antcall>
146+
</target>
143147

144148
<target name="create-binary-release">
145149
<antcall target="create-release-package">

0 commit comments

Comments
 (0)