Changeset 30131 for main/trunk
- Timestamp:
- 2015-08-25T21:47:13+12:00 (9 years ago)
- Location:
- main/trunk/release-kits
- Files:
-
- 6 edited
-
kits/rk2/installer/antinstall-config.xml (modified) (1 diff)
-
kits/rk2/installer/build.xml (modified) (3 diffs)
-
kits/rk3/installer/build.xml (modified) (2 diffs)
-
shared/core/ant-scripts/create-installer.xml (modified) (1 diff)
-
shared/core/ant-scripts/shared.xml (modified) (1 diff)
-
shared/core/ant-scripts/wrap.xml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/release-kits/kits/rk2/installer/antinstall-config.xml
r22325 r30131 66 66 <comment name="choose-components"/> 67 67 68 <!-- if linux|windows -->68 <!-- if linux|windows|mac --> 69 69 <target 70 70 target="Initialising" -
main/trunk/release-kits/kits/rk2/installer/build.xml
r29340 r30131 46 46 <available file="../@java.extracted@/bin/java"/> 47 47 <available file="../@java.extracted@/bin/java.exe"/> 48 <available file="/tmp/jre/bin/java"/> 48 49 </or> 49 50 </condition> … … 69 70 <!-- copy jre --> 70 71 <target name="Initialising" if="bundled.java.exists"> 72 <!-- work out whether a jre was bundled with this installer. If it was, then for a Mac, it would live in /tmp --> 73 <!-- if mac --> 74 <property name="extracted.jre.path" location="/tmp/jre" relative="false" /> 75 <!-- /if --> 76 <!-- if windows|linux --> 77 <property name="extracted.jre.path" location="../@java.extracted@" relative="true" basedir="${basedir}" /> 78 <!-- /if --> 79 80 <mkdir dir="${installDir}/packages"/> 81 <copy todir="${installDir}/packages/jre" failonerror="false"> 82 <fileset dir="${extracted.jre.path}"/> 83 </copy> 84 <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/> 85 <!-- if mac --> 86 <chmod dir="${installDir}/packages/jre/lib" includes="**/*" perm="a+rx"/> 87 <!-- /if --> 88 </target> 89 90 <!-- copy jre --> 91 <!-- 92 <target name="Initialising" if="bundled.java.exists"> 71 93 <mkdir dir="${installDir}/packages"/> 72 94 <copy todir="${installDir}/packages/jre" failonerror="false"> … … 75 97 <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/> 76 98 </target> 99 --> 100 77 101 78 102 <!-- core system --> -
main/trunk/release-kits/kits/rk3/installer/build.xml
r29335 r30131 46 46 <winprops/> 47 47 <!-- /if --> 48 49 <!-- work out whether a jre is bundled with this installer --> 50 <available file="../jre/bin" property="bundled.java.exists"/> 51 48 52 49 <!-- determine if there is an existing installation in the installDir--> 53 50 <available file="${installDir}\installation.properties" property="is.overinstall"/> 51 52 <!-- work out whether a jre was bundled with this installer. If it was, then for a Mac, it would live in /tmp --> 53 <!-- if mac --> 54 <available file="/tmp/jre/bin" property="bundled.java.exists"/> 55 <property name="extracted.jre.path" location="/tmp/jre" relative="false" /> 56 <!-- /if --> 57 <!-- if windows|liunx --> 58 <available file="../jre/bin" property="bundled.java.exists"/> 59 <property name="extracted.jre.path" location="../jre" relative="true" basedir="${basedir}" /> 60 <!-- /if --> 54 61 55 62 <!-- target to copy the bundled jre into place --> … … 57 64 <mkdir dir="${installDir}"/> 58 65 <copy todir="${installDir}/packages/jre" failonerror="false"> 59 <fileset dir=" ../jre"/>66 <fileset dir="${extracted.jre.path}"/> 60 67 </copy> 61 68 <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/> 69 <!-- if mac --> 70 <chmod dir="${installDir}/packages/jre/lib" includes="**/*" perm="a+rx"/> 71 <!-- /if --> 62 72 </target> 63 73 -
main/trunk/release-kits/shared/core/ant-scripts/create-installer.xml
r24438 r30131 67 67 <math result="component.bytesize.core" operand1="${component.bytesize.core-without-jre}" operation="+" operand2="${component.bytesize.linux-java}" datatype="int"/> 68 68 <else> 69 <property name="component.bytesize.core" value="${component.bytesize.core-without-jre}"/> 69 <exec dir="." executable="/bin/sh" outputproperty="bitness.ouput"><arg line="-c "uname -m""/></exec> 70 <if><bool><contains string="${bitness.ouput}" substring="_64"/></bool> 71 <math result="component.bytesize.core" operand1="${component.bytesize.core-without-jre}" operation="+" operand2="${component.bytesize.mac-java}" datatype="int"/> 72 <else><property name="component.bytesize.core" value="${component.bytesize.core-without-jre}"/></else> 73 </if> 70 74 </else></if></else></if> 71 75 <math result="component.megabytesize.core" operand1="${component.bytesize.core}" operation="/" operand2="1048576" datatype="int"/> -
main/trunk/release-kits/shared/core/ant-scripts/shared.xml
r29393 r30131 92 92 <!-- linux --> 93 93 <property name="linux-java.installer" value="jre_bin${extension_x64}"/> 94 <property name="bundled.version.linux-java" value="1. 6.0_05"/> <!-- set this to the version number of java in the above archive -->94 <property name="bundled.version.linux-java" value="1.7.0_72"/> <!-- set this to the version number of java in the above archive --> 95 95 <property name="component.bytesize.linux-java" value="101245987"/> <!-- set this to the size of the extract archive --> 96 96 97 97 <!-- windows --> 98 98 <property name="windows-java.installer" value="jre.exe"/> 99 <property name="bundled.version.windows-java" value="1. 6.0_07"/> <!-- set this to the version number of java in the above archive -->99 <property name="bundled.version.windows-java" value="1.7.0_72"/> <!-- set this to the version number of java in the above archive --> 100 100 <property name="component.bytesize.windows-java" value="75000000"/> <!-- set this to the size of the extract archive --> 101 102 <!-- mac --> 103 <!-- only a jre_bin for 64 bit macs --> 104 <property name="mac-java.installer" value="jre_bin_x64"/> 105 <property name="bundled.version.mac-java" value="1.7.0_79"/> <!-- set this to the version number of java in the above archive --> 106 <property name="component.bytesize.mac-java" value="30688272"/> <!-- set this to the size of the archive, NOT the extracted archive, since we'll extract it into the /tmp folder --> 101 107 102 108 <!-- version numbers of other bundled things --> -
main/trunk/release-kits/shared/core/ant-scripts/wrap.xml
r30130 r30131 151 151 152 152 <!-- copy bundled files --> 153 <!-- Include the self-extracting jre (for 64 bit) if this Mac is a 64 bit OS 154 http://stackoverflow.com/questions/218989/how-to-determine-build-architecture-32bit-64bit-with-ant --> 155 <exec dir="." executable="/bin/sh" outputproperty="bitness.ouput"><arg line="-c "uname -m""/></exec> 156 <if><bool><contains string="${bitness.ouput}" substring="_64"/></bool> 157 <copy tofile="wrapped-installer/Greenstone${version}${version-extra}.app/Contents/Resources/Java/jre_bin" file="${rk.home}/shared/mac/${mac-java.installer}"/> 158 </if> 153 159 <chmod file="wrapped-installer/Greenstone${version}${version-extra}.app/Contents/MacOS/greenstone" perm="ug+x"/> 154 160 <copy todir="wrapped-installer/Greenstone${version}${version-extra}.app/Contents/Resources/Java" file="installer/Greenstone-${version}${version-extra}-${os.suffix}.jar"/>
Note:
See TracChangeset
for help on using the changeset viewer.
