- Timestamp:
- 2013-11-28T17:49:20+13:00 (11 years ago)
- Location:
- other-projects/expeditee-release-kits/kits/rke/ant-scripts
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
other-projects/expeditee-release-kits/kits/rke/ant-scripts/create-installer.xml
r28695 r28717 61 61 62 62 <!-- calculate the size of: core --> 63 <length property="component.bytesize.core-without-jre" mode="all"><fileset file="${basedir}/components/core.comp"/></length> 64 <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool> 65 <math result="component.bytesize.core" operand1="${component.bytesize.core-without-jre}" operation="+" operand2="${component.bytesize.windows-java}" datatype="int"/> 66 <else><if><bool><equals arg1="${rk.os}" arg2="linux"/></bool> 67 <math result="component.bytesize.core" operand1="${component.bytesize.core-without-jre}" operation="+" operand2="${component.bytesize.linux-java}" datatype="int"/> 68 <else> 69 <property name="component.bytesize.core" value="${component.bytesize.core-without-jre}"/> 70 </else></if></else></if> 63 <length property="component.bytesize.core" mode="all"><fileset file="${basedir}/components/core.comp"/></length> 71 64 <math result="component.megabytesize.core" operand1="${component.bytesize.core}" operation="/" operand2="1048576" datatype="int"/> 72 65 <property name="component.size.core" value="${component.megabytesize.core} MB"/> 73 66 74 <!-- calculate the size of: imagemagick --> 75 <length property="component.bytesize.imagemagick" mode="all"><fileset file="${basedir}/components/imagemagick.comp"/></length> 76 <math result="component.megabytesize.imagemagick" operand1="${component.bytesize.imagemagick}" operation="/" operand2="1048576" datatype="int"/> 77 <property name="component.size.imagemagick" value="${component.megabytesize.imagemagick} MB"/> 67 <!-- calculate the size of: jre --> 68 <math result="component.megabytesize.java" operand1="${component.bytesize.java}" operation="/" operand2="1048576" datatype="int"/> 69 <property name="component.size.java" value="${component.megabytesize.java} MB"/> 78 70 79 <!-- calculate the size of: ghostscript -->80 <length property="component.bytesize.ghostscript" mode="all"><fileset file="${basedir}/components/ghostscript.comp"/></length>81 <math result="component.megabytesize.ghostscript" operand1="${component.bytesize.ghostscript}" operation="/" operand2="1048576" datatype="int"/>82 <property name="component.size.ghostscript" value="${component.megabytesize.ghostscript} MB"/>83 84 <!-- calculate the size of: apache httpd -->85 <length property="component.bytesize.httpd" mode="all"><fileset file="${basedir}/components/apachehttpd.comp"/></length>86 <math result="component.megabytesize.httpd" operand1="${component.bytesize.httpd}" operation="/" operand2="1048576" datatype="int"/>87 <property name="component.size.httpd" value="${component.megabytesize.httpd} MB"/>88 89 <!-- calculate the size of: tomcat -->90 <length property="component.bytesize.tomcat" mode="all"><fileset file="${basedir}/components/tomcat.comp"/></length>91 <math result="component.megabytesize.tomcat" operand1="${component.bytesize.tomcat}" operation="/" operand2="1048576" datatype="int"/>92 <property name="component.size.tomcat" value="${component.megabytesize.tomcat} MB"/>93 94 <!-- EXT -->95 <!-- calculate the size of: amp (and put it into the components directory) -->96 <if><bool><and><equals arg1="${amp.enabled}" arg2="true"/><not><available file="${rk.home}/ext/amp.lzma"/></not></and></bool>97 <fail>amp.lzma file not found in the release kit ext directory</fail>98 </if>99 100 <if><bool><and><equals arg1="${amp.enabled}" arg2="true"/></and></bool>101 <echo>Copying amp.lzma to compontents directory</echo>102 <copy file="${rk.home}/ext/amp.lzma" todir="${basedir}/components"/>103 <property name="component.size.amp" value="257 MB"/>104 </if>105 <!-- /EXT -->106 71 107 72 <echo>**** OS: ${rk.os}</echo> … … 111 76 <dcff file="installer/build.xml" startTag="<!--\s*if\s*(?!.*${rk.os})[^ ]+\s*-->" endTag="<!--\s*/if\s*-->" /> 112 77 113 <!-- EXT -->114 <if><bool><not><equals arg1="${amp.enabled}" arg2="true"/></not></bool>115 116 <dcff file="installer/antinstall-config.xml" startTag="<!-- start amp -->" endTag="<!-- end amp -->" />117 <dcff file="installer/build.xml" startTag="<!-- start amp -->" endTag="<!-- end amp -->" />118 </if>119 <!-- /EXT -->120 78 <!-- put the concrete values of things in the config --> 121 79 <rsr> 122 80 <fileset dir="${basedir}/installer" includes="*.xml"/> 123 <!-- <job pattern="@projectname@" replacement="${projectname}"/> 124 --> 81 <job pattern="@projectname@" replacement="${projectname}"/> 125 82 <job pattern="@version@" replacement="${version}${version-extra}"/> 126 83 <job pattern="@component.size.core@" replacement="${component.size.core}"/> 127 <job pattern="@component.size.tomcat@" replacement="${component.size.tomcat}"/> 128 <job pattern="@component.size.imagemagick@" replacement="${component.size.imagemagick}"/> 129 <job pattern="@component.size.ghostscript@" replacement="${component.size.ghostscript}"/> 130 <job pattern="@component.size.httpd@" replacement="${component.size.httpd}"/> 84 <job pattern="@component.size.java@" replacement="${component.size.java}"/> 131 85 <job pattern="@java.min.version@" replacement="${java.min.version}"/> 132 86 <job pattern="@java.extracted@" replacement="${java.extracted}"/> … … 149 103 </if> 150 104 151 <!-- EXT -->152 <if><bool><equals arg1="${amp.enabled}" arg2="true"/></bool>153 <rsr>154 <fileset dir="${basedir}/installer" includes="*.xml"/>155 <job pattern="@component.size.amp@" replacement="${component.size.amp}"/>156 </rsr>157 </if>158 <!-- /EXT -->159 160 105 <!-- put the concrete values of things in the text --> 161 106 <rsr> … … 165 110 <job pattern="@version.major@" replacement="${version.major}"/> 166 111 <job pattern="@java.min.version@" replacement="${java.min.version}"/> 167 <job pattern="@bundled.version.imagemagick@" replacement="${bundled.version.imagemagick}"/>168 <job pattern="@bundled.version.ghostscript@" replacement="${bundled.version.ghostscript}"/>169 <job pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>170 112 <job pattern="@bundled.version.windows-java@" replacement="${bundled.version.windows-java}"/> 171 113 <job pattern="@bundled.version.linux-java@" replacement="${bundled.version.linux-java}"/> -
other-projects/expeditee-release-kits/kits/rke/ant-scripts/wrap.xml
r28695 r28717 22 22 <rsr file="wrapped-installer/wrapper.cpp"> 23 23 <job pattern="@projectname@" replacement="${projectname}"/> 24 <job pattern="@java.installer@" replacement="${ windows-java.installer}"/>24 <job pattern="@java.installer@" replacement="${java.installer}"/> 25 25 <job pattern="@java.min.version@" replacement="${java.min.version}"/> 26 26 <job pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/> … … 33 33 <!-- split the resources into chunks, creating a resource script of the chunks --> 34 34 <rsplit 35 resource="${rk.home}/shared/windows/wrapper/${ windows-java.installer}"35 resource="${rk.home}/shared/windows/wrapper/${java.installer}" 36 36 outputDir="wrapped-installer" 37 37 resourceScript="wrapped-installer/wrapper.rc" … … 78 78 79 79 <!-- copy bundled files into place --> 80 <copy todir="wrapped-installer" file="${rk.home}/shared/linux/${ linux-java.installer}"/>80 <copy todir="wrapped-installer" file="${rk.home}/shared/linux/${java.installer}"/> 81 81 <copy tofile="wrapped-installer/${projectname}.jar" file="installer/${projectname}-${version}${version-extra}-${os.suffix}.jar"/> 82 82 … … 84 84 <rsr file="wrapped-installer/wrapper.cpp"> 85 85 <job pattern="@projectname@" replacement="${projectname}"/> 86 <job pattern="@java.installer@" replacement="${ linux-java.installer}"/>86 <job pattern="@java.installer@" replacement="${java.installer}"/> 87 87 <job pattern="@java.extracted@" replacement="${java.extracted}"/> 88 88 <job pattern="@java.min.version@" replacement="${java.min.version}"/> … … 95 95 </exec> 96 96 <exec executable="/usr/bin/objcopy" dir="wrapped-installer"> 97 <arg line="-I binary -O elf64-x86-64 -B i386 --redefine-sym _binary_${ linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/>97 <arg line="-I binary -O elf64-x86-64 -B i386 --redefine-sym _binary_${java.installer}_start=java --readonly-text ${java.installer} java.o"/> 98 98 </exec> 99 99 … … 103 103 </exec> 104 104 <exec executable="/usr/bin/objcopy" dir="wrapped-installer" failonerror="true"> 105 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${ linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/>105 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${java.installer}_start=java --readonly-text ${java.installer} java.o"/> 106 106 </exec> 107 107 </else> … … 118 118 119 119 <!-- figure out java size --> 120 <exec executable="ls" dir="wrapped-installer" outputproperty="java.ls"><arg line="-l ${ linux-java.installer}"/></exec>120 <exec executable="ls" dir="wrapped-installer" outputproperty="java.ls"><arg line="-l ${java.installer}"/></exec> 121 121 <exec executable="sed" inputstring="${java.ls}" outputproperty="java.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 122 122
Note:
See TracChangeset
for help on using the changeset viewer.