Changeset 23525 for main/trunk
- Timestamp:
- 2011-01-05T12:56:10+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/compile.xml
r23493 r23525 7 7 <bool> 8 8 <or> 9 <equals arg1="${branch.path}" arg2="trunk"/> 10 <equals arg1="${branch.path}" arg2="tags/stable"/> 11 <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/> 9 <equals arg1="${post.2.83.version}" arg2="true"/> 12 10 </or> 13 11 </bool> … … 53 51 <!-- checkout the gnome support library extension--> 54 52 <if><bool><or> 55 <equals arg1="${branch.path}" arg2="trunk"/> 56 <equals arg1="${branch.path}" arg2="tags/stable"/> 57 <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/> 53 <equals arg1="${post.2.83.version}" arg2="true"/> 58 54 </or></bool> 59 55 <!-- Check out the pre-compiled version of the gnome-lib extension rather than compiling it from scratch --> … … 61 57 <exec executable="svn"> 62 58 <arg value="export"/> 63 <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/gnome-lib-${os.shell} .tar.gz"/>59 <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/gnome-lib-${os.shell}${extension-x64}.tar.gz"/> 64 60 <arg value="${basedir}/compiled/ext/gnome-lib-${os.shell}.tar.gz"/> 65 61 </exec> … … 86 82 <!-- unzip expat if the version is less that 2.84 --> 87 83 <if><bool><and> 88 <not><equals arg1="${branch.path}" arg2="trunk"/></not> 89 <not><equals arg1="${branch.path}" arg2="tags/stable"/></not> 90 <islessthan arg1="${branch.tag.version}" arg2="2.84"/> 84 <equals arg1="${post.2.83.version}" arg2="false"/> 91 85 </and></bool> 92 86 <unzip src="${basedir}/compiled/common-src/packages/windows/expat/expat.zip" dest="${basedir}/compiled/common-src/packages/windows/expat"/> … … 100 94 <if><bool><not><available file="${basedir}/compiled/bin/windows"/></not></bool> 101 95 <if><bool><and> 102 <not><equals arg1="${branch.path}" arg2="trunk"/></not> 103 <not><equals arg1="${branch.path}" arg2="tags/stable"/></not> 104 <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/> 96 <equals arg1="${post.2.83.version}" arg2="true"/> 105 97 </and></bool> 106 98 … … 384 376 <else><if><bool><equals arg1="${rk.os}" arg2="linux"/></bool> 385 377 386 <!-- grab imagemagick and wv binaries -->378 <!-- grab imagemagick and wv (if less than 2.84) binaries --> 387 379 <delete dir="compiled/bin/linux/imagemagick"/> 388 380 389 381 <if><bool><or> 390 <equals arg1="${branch.path}" arg2="trunk"/> 391 <equals arg1="${branch.path}" arg2="tags/stable"/> 392 <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/> 382 <equals arg1="${post.2.83.version}" arg2="true"/> 393 383 </or></bool> 394 384 <exec executable="svn"> … … 428 418 429 419 <if><bool><and> 430 <not><equals arg1="${branch.path}" arg2="trunk"/></not> 431 <not><equals arg1="${branch.path}" arg2="tags/stable"/></not> 432 <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/> 420 <equals arg1="${post.2.83.version}" arg2="true"/> 433 421 </and></bool> 434 422 … … 480 468 481 469 <if><bool><and> 482 <not><equals arg1="${branch.path}" arg2="trunk"/></not> 483 <not><equals arg1="${branch.path}" arg2="tags/stable"/></not> 484 <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/> 470 <equals arg1="${post.2.83.version}" arg2="true"/> 485 471 </and></bool> 486 472 <get src="${svn.root}/main/${branch.path}/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/> -
main/trunk/release-kits/shared/core/ant-scripts/shared.xml
r23493 r23525 11 11 <property environment="env"/> 12 12 13 <!-- CONSTANTS (overridable in build.properties) -->14 15 <!-- svn root -->16 <property name="svn.root" value="http://svn.greenstone.org" />17 18 <!-- the minimum version of java which the installer should be run with (this gets used in search4j) -->19 <property name="java.min.version" value="1.4.0_00"/>20 21 <!-- create a localised basedir property -->22 <path id="basedir.path"><pathelement location="${basedir}"/></path>23 <property name="basedir.local" refid="basedir.path"/>24 25 <!-- size of resource chunks (windows wrapper) -->26 <property name="resources.chunksize" value="8388608"/>27 28 <!-- the extra space for the dmg image in KB (mac wrapper) -->29 <property name="dmg.overhead" value="2048"/>30 31 <!-- current date and time -->32 <tstamp>33 <format property="current.month" pattern="MMM"/>34 <format property="current.year" pattern="yyyy"/>35 <format property="date" pattern="yyyy.MM.dd"/>36 </tstamp>37 38 <!-- BUNDLED JAVA INFO -->39 <!-- the bundled javas are kept in shared/linux/wrapper and shared/windows/wrapper in the repository -->40 <!-- change this info when the bundled version changes -->41 <property name="java.extracted" value="jre"/> <!-- set this to the name of the top level directory in the above archive -->42 43 <!-- linux -->44 <property name="linux-java.installer" value="jre_bin"/>45 <property name="bundled.version.linux-java" value="1.6.0_05"/> <!-- set this to the version number of java in the above archive -->46 <property name="component.bytesize.linux-java" value="101245987"/> <!-- set this to the size of the extract archive -->47 48 <!-- windows -->49 <property name="windows-java.installer" value="jre.exe"/>50 <property name="bundled.version.windows-java" value="1.6.0_07"/> <!-- set this to the version number of java in the above archive -->51 <property name="component.bytesize.windows-java" value="75000000"/> <!-- set this to the size of the extract archive -->52 53 <!-- version numbers of other bundled things -->54 <property name="bundled.version.imagemagick" value="6.4.3"/>55 <property name="bundled.version.ghostscript" value="8.63"/>56 <property name="bundled.version.tomcat" value="6.0.20"/>57 58 13 <!-- CLASSPATH --> 59 14 <path id="project.classpath"> … … 90 45 <typedef name="get-property-value" classname="org.greenstone.anttasks.GetPropertyValue" classpathref="project.classpath"/> 91 46 47 <!-- CONSTANTS (overridable in build.properties) --> 48 49 <!-- svn root --> 50 <property name="svn.root" value="http://svn.greenstone.org" /> 51 52 <!-- the minimum version of java which the installer should be run with (this gets used in search4j) --> 53 <property name="java.min.version" value="1.4.0_00"/> 54 55 <!-- create a localised basedir property --> 56 <path id="basedir.path"><pathelement location="${basedir}"/></path> 57 <property name="basedir.local" refid="basedir.path"/> 58 59 <!-- size of resource chunks (windows wrapper) --> 60 <property name="resources.chunksize" value="8388608"/> 61 62 <!-- the extra space for the dmg image in KB (mac wrapper) --> 63 <property name="dmg.overhead" value="2048"/> 64 65 <!-- current date and time --> 66 <tstamp> 67 <format property="current.month" pattern="MMM"/> 68 <format property="current.year" pattern="yyyy"/> 69 <format property="date" pattern="yyyy.MM.dd"/> 70 </tstamp> 71 72 <!-- extra features --> 73 <property name="version-extra" value="" /> 74 <property name="post.2.83.version" value="true" /> 75 <property name="x64" value="false" /> 76 77 <if> 78 <bool><equals arg1="${x64}" arg2="true"/></bool> 79 <property name="extension-x64" value="-x64" /> 80 <property name="extension_x64" value="_x64" /> 81 <else> 82 <property name="extension-x64" value="" /> 83 <property name="extension_x64" value="" /> 84 </else> 85 </if> 86 87 <!-- BUNDLED JAVA INFO --> 88 <!-- the bundled javas are kept in shared/linux/wrapper and shared/windows/wrapper in the repository --> 89 <!-- change this info when the bundled version changes --> 90 <property name="java.extracted" value="jre"/> <!-- set this to the name of the top level directory in the above archive --> 91 92 <!-- linux --> 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 --> 95 <property name="component.bytesize.linux-java" value="101245987"/> <!-- set this to the size of the extract archive --> 96 97 <!-- windows --> 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 --> 100 <property name="component.bytesize.windows-java" value="75000000"/> <!-- set this to the size of the extract archive --> 101 102 <!-- version numbers of other bundled things --> 103 <property name="bundled.version.imagemagick" value="6.4.3"/> 104 <property name="bundled.version.ghostscript" value="8.63"/> 105 <property name="bundled.version.tomcat" value="6.0.20"/> 106 92 107 <!-- default revision and branch path --> 93 108 <property name="branch.revision" value="HEAD" /> 94 <property name="branch.tag.name" value="trunk" /> 95 <property name="branch.tag.version" value="" /> 96 97 <property name="version-extra" value="" /> 98 99 <if><bool><equals arg1="${branch.tag.name}" arg2="trunk" /></bool> 100 101 <property name="branch.path" value="${branch.tag.name}" /> 102 103 <else> 104 <if> 105 <bool> 106 <not><equals arg1="${branch.tag.version}" arg2="" /></not> 107 </bool> 108 <property name="branch.path" value="${branch.tag.name}/${branch.tag.version}" /> 109 <else> 110 <fail>Cannot use use a branch.tag.name that is not 'trunk' without also defining branch.tag.version</fail> 111 </else> 112 </if> 113 </else> 114 </if> 115 109 <property name="branch.path" value="trunk" /> 110 116 111 <!-- DATES IN DIFFERENT LANGUAGES --> 117 112 <get-property-value propertiesFile="${rk.home}/shared/core/lib/dates.properties" propertyName="ar.Dates.${current.month}" outputProperty="month.ar"/> -
main/trunk/release-kits/shared/core/ant-scripts/wrap.xml
r23493 r23525 89 89 90 90 <!-- create an object file (extension .o) for each file to bundle --> 91 <if><bool><equals arg1="${x64}" arg2="true"/></bool> 91 92 <exec executable="/usr/bin/objcopy" dir="wrapped-installer"> 92 <arg line="-I binary -O elf32-i386-B i386 --redefine-sym _binary_greenstone_jar_start=greenstonejar --readonly-text greenstone.jar greenstone.jar.o"/>93 <arg line="-I binary -O elf64-x86-64 -B i386 --redefine-sym _binary_greenstone_jar_start=greenstonejar --readonly-text greenstone.jar greenstone.jar.o"/> 93 94 </exec> 94 95 <exec executable="/usr/bin/objcopy" dir="wrapped-installer"> 95 <arg line="-I binary -O elf32-i386-B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/>96 <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"/> 96 97 </exec> 98 99 <else> 100 <exec executable="/usr/bin/objcopy" dir="wrapped-installer"> 101 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone_jar_start=greenstonejar --readonly-text greenstone.jar greenstone.jar.o"/> 102 </exec> 103 <exec executable="/usr/bin/objcopy" dir="wrapped-installer"> 104 <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 </exec> 106 </else> 107 </if> 97 108 98 109 <!-- compile libsearch4j -->
Note:
See TracChangeset
for help on using the changeset viewer.