Changeset 23587 for main/trunk/release-kits
- Timestamp:
- 2011-01-14T15:42:08+13:00 (13 years ago)
- Location:
- main/trunk/release-kits
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/release-kits/kits/rk2/ant-scripts/components.xml
r23585 r23587 24 24 </patternset> 25 25 26 <if><bool><equals arg1="${x64}" arg2="false"/></bool> 27 <!-- imagemagick --> 28 <patternset id="greenstone2.imagemagick.component"> 29 <include name="bin/**/imagemagick"/> 30 <include name="bin/**/imagemagick/**/*"/> 31 </patternset> 32 <else> 33 <!-- imagemagick x64 --> 34 <patternset id="greenstone2.imagemagick.component"> 35 <include name="ext/imagemagick"/> 36 <include name="ext/imagemagick/**/*"/> 37 </patternset> 38 </else> 39 </if> 26 <!-- imagemagick --> 27 <patternset id="greenstone2.imagemagick.component"> 28 <include name="bin/**/imagemagick"/> 29 <include name="bin/**/imagemagick/**/*"/> 30 </patternset> 31 32 <!-- imagemagick --> 33 <patternset id="greenstone2.imagemagick-x64.component"> 34 <include name="ext/imagemagick"/> 35 <include name="ext/imagemagick/**/*"/> 36 </patternset> 40 37 41 38 <!-- ghostscript --> -
main/trunk/release-kits/kits/rk2/ant-scripts/create-components.xml
r23585 r23587 5 5 6 6 <!-- imagemagick --> 7 <antcall target="create-component"><param name="component" value="imagemagick"/></antcall> 7 <antcall target="create-component"> 8 <param name="component" value="imagemagick"/> 9 <param name="ext-x64" value="-x64"/> 10 </antcall> 8 11 9 12 <!-- apache httpd --> 10 <antcall target="create-component"><param name="component" value="apachehttpd"/></antcall> 13 <antcall target="create-component"> 14 <param name="component" value="apachehttpd"/> 15 <param name="ext-x64" value=""/> 16 </antcall> 11 17 12 18 <!-- windows and mac only --> 13 19 <if><bool><or><equals arg1="${rk.os}" arg2="windows"/><equals arg1="${rk.os}" arg2="mac"/></or></bool> 14 20 <!-- ghostscript --> 15 <antcall target="create-component"><param name="component" value="ghostscript"/></antcall> 21 <antcall target="create-component"> 22 <param name="component" value="ghostscript"/> 23 <param name="ext-x64" value=""/> 24 </antcall> 16 25 </if> 17 26 18 27 <!-- core --> 19 <antcall target="create-component"><param name="component" value="core"/></antcall> 28 <antcall target="create-component"> 29 <param name="component" value="core"/> 30 <param name="ext-x64" value=""/> 31 </antcall> 20 32 21 33 </target> -
main/trunk/release-kits/shared/core/ant-scripts/shared.xml
r23525 r23587 377 377 <target name="create-component"> 378 378 <mkdir dir="components"/> 379 379 380 380 <!-- the PatternSet To File task takes one or more patternsets and outputs to a file all of the files it includes --> 381 381 <pstf dir="compiled" outfile="compiled/uninstall/${component}.uninstall" toplevelonly="true"> 382 <patternset refid="greenstone${version.major}.${component} .component"/>382 <patternset refid="greenstone${version.major}.${component}${ext-x64}.component"/> 383 383 </pstf> 384 384 385 385 <zip destfile="components/${component}.comp" compress="false"> 386 386 <zipfileset dir="compiled"> 387 <patternset refid="greenstone${version.major}.${component} .component"/>387 <patternset refid="greenstone${version.major}.${component}${ext-x64}.component"/> 388 388 </zipfileset> 389 389 </zip> … … 402 402 403 403 </else></if></else></if> 404 </target> 404 </target> 405 405 406 406 </project>
Note:
See TracChangeset
for help on using the changeset viewer.