Changeset 23493 for main/trunk/release-kits
- Timestamp:
- 2010-12-16T11:49:57+13:00 (13 years ago)
- Location:
- main/trunk/release-kits
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/release-kits/bin/rk
r21652 r23493 41 41 42 42 #make sure ant has enough memory 43 export ANT_OPTS=-Xmx 800M43 export ANT_OPTS=-Xmx1000M 44 44 45 45 #create the command -
main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml
r23186 r23493 158 158 159 159 <mkdir dir="products"/> 160 <copy file="${basedir}/compiled/server.exe" tofile="${basedir}/products/server-${version} .exe"/>160 <copy file="${basedir}/compiled/server.exe" tofile="${basedir}/products/server-${version}${version-extra}.exe"/> 161 161 <move file="${basedir}/compiled/server.exe" todir="${basedir}/compiled/bin/windows"/> 162 162 -
main/trunk/release-kits/kits/rk2/ant-scripts/create-cdrom-components.xml
r22325 r23493 136 136 </exec> 137 137 <exec executable="link" dir="cdrom/build"> 138 <arg line="/OUT:../dist/Greenstone-${version} -windows.exe gdi32.lib advapi32.lib shell32.lib user32.lib wrapper.obj wrapper.RES"/>138 <arg line="/OUT:../dist/Greenstone-${version}${version-extra}-windows.exe gdi32.lib advapi32.lib shell32.lib user32.lib wrapper.obj wrapper.RES"/> 139 139 </exec> 140 140 … … 150 150 <echo level="info">link the compiled code</echo> 151 151 <exec executable="g++" dir="cdrom/build"> 152 <arg line="-static -static-libgcc -o ../dist/Greenstone-${version} -linux wrapper.o"/>152 <arg line="-static -static-libgcc -o ../dist/Greenstone-${version}${version-extra}-linux wrapper.o"/> 153 153 </exec> 154 154 … … 158 158 <mkdir dir="wrapped-installer/cdrom"/> 159 159 <!-- create app for cdrom installer --> 160 <copy todir="cdrom/dist/Greenstone-${version} -MacOS.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy>161 <copy todir="cdrom/dist/Greenstone-${version} -MacOS.app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/>162 <chmod file="cdrom/dist/Greenstone-${version} -MacOS.app/Contents/MacOS/JavaApplicationStub" perm="+x"/>160 <copy todir="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy> 161 <copy todir="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/> 162 <chmod file="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/MacOS/JavaApplicationStub" perm="+x"/> 163 163 164 164 <!-- copy bundled files --> 165 <copy todir="cdrom/dist/Greenstone-${version} -MacOS.app/Contents/Resources/Java" file="${basedir}/installer/cdrom.jar"/>165 <copy todir="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/Resources/Java" file="${basedir}/installer/cdrom.jar"/> 166 166 167 167 <!-- substitute in real values --> 168 <rsr file="cdrom/dist/Greenstone-${version} -MacOS.app/Contents/Info.plist" pattern="@jar@" replacement="cdrom.jar"/>169 <rsr file="cdrom/dist/Greenstone-${version} -MacOS.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/>168 <rsr file="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/Info.plist" pattern="@jar@" replacement="cdrom.jar"/> 169 <rsr file="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/> 170 170 171 171 </if></else></if></else></if> … … 176 176 <!-- (windows) --> 177 177 <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool> 178 <tar destfile="products/cdrom-components-${version} -windows.tar.gz" compression="gzip">178 <tar destfile="products/cdrom-components-${version}${version-extra}-windows.tar.gz" compression="gzip"> 179 179 <tarfileset dir="cdrom/dist"> 180 180 <include name="**/*"/> … … 183 183 </tarfileset> 184 184 </tar> 185 <tar destfile="products/cdrom-components-${version} -full-windows.tar.gz" compression="gzip">185 <tar destfile="products/cdrom-components-${version}${version-extra}-full-windows.tar.gz" compression="gzip"> 186 186 <tarfileset dir="cdrom/dist"> 187 187 <include name="**/*"/> … … 195 195 <exec dir="cdrom/dist" executable="bash"> 196 196 <arg value="-c"/> 197 <arg value="tar -czf ../../products/cdrom-components-${version} -${rk.os}.tar.gz *"/>197 <arg value="tar -czf ../../products/cdrom-components-${version}${version-extra}-${rk.os}.tar.gz *"/> 198 198 </exec> 199 199 </if></else></if> -
main/trunk/release-kits/shared/core/ant-scripts/create-installer.xml
r22356 r23493 120 120 <rsr> 121 121 <fileset dir="${basedir}/installer" includes="*.xml"/> 122 <job pattern="@version@" replacement="${version} "/>122 <job pattern="@version@" replacement="${version}${version-extra}"/> 123 123 <job pattern="@component.size.core@" replacement="${component.size.core}"/> 124 124 <job pattern="@component.size.tomcat@" replacement="${component.size.tomcat}"/> … … 142 142 <rsr> 143 143 <fileset dir="${basedir}/installer/classes/resources" includes="*.properties"/> 144 <job pattern="@version@" replacement="${version} "/>144 <job pattern="@version@" replacement="${version}${version-extra}"/> 145 145 <job pattern="@version.major@" replacement="${version.major}"/> 146 146 <job pattern="@java.min.version@" replacement="${java.min.version}"/> … … 167 167 168 168 <!-- create insaller jar with ant-installer's ant task --> 169 <installer file="installer/Greenstone-${version} -${os.suffix}.jar"169 <installer file="installer/Greenstone-${version}${version-extra}-${os.suffix}.jar" 170 170 compress="true" 171 171 extractType="NonExtractor" -
main/trunk/release-kits/shared/core/ant-scripts/shared.xml
r23242 r23493 95 95 <property name="branch.tag.version" value="" /> 96 96 97 <property name="version-extra" value="" /> 98 97 99 <if><bool><equals arg1="${branch.tag.name}" arg2="trunk" /></bool> 98 100 … … 188 190 189 191 <!-- show important properties --> 190 <echo level="info">Version (version): ${version} </echo>192 <echo level="info">Version (version): ${version}${version-extra}</echo> 191 193 <echo level="info">Major Version (version.major): ${version.major}</echo> 192 194 <echo level="info">Branch Path (branch.path): ${branch.path}</echo> … … 270 272 271 273 <if><bool><available file="${gsdl.basedir}/common-src/src/lib/gsdlconf.h"/></bool> 272 <rsr file="${gsdl.basedir}/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) ".*"" replacement="$1 "${version} "" />274 <rsr file="${gsdl.basedir}/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) ".*"" replacement="$1 "${version}${version-extra}"" /> 273 275 </if> 274 276 275 277 <if><bool><available file="${gsdl.basedir}/etc/VERSION"/></bool> 276 <rsr file="${gsdl.basedir}/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version} " />278 <rsr file="${gsdl.basedir}/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}${version-extra}" /> 277 279 </if> 278 280 279 281 <if><bool><available file="${gsdl.basedir}/lib/java/server.properties"/></bool> 280 <rsr file="${gsdl.basedir}/lib/java/server.properties" pattern="^(Server2Control.Version[:=]).*" replacement="$1${version} " />282 <rsr file="${gsdl.basedir}/lib/java/server.properties" pattern="^(Server2Control.Version[:=]).*" replacement="$1${version}${version-extra}" /> 281 283 </if> 282 284 … … 296 298 <rsr file="${gsdl.basedir}/READMEen.txt"> 297 299 <job pattern="^(Date\s*)(.*)" replacement="$1${month.default} ${current.year}" /> 298 <job pattern="^(Version\s*)(.*)" replacement="$1${version} " />300 <job pattern="^(Version\s*)(.*)" replacement="$1${version}${version-extra}" /> 299 301 </rsr> 300 302 </if> … … 304 306 <rsr file="${gsdl.basedir}/READMEar.txt"> 305 307 <job pattern="(اÙتارÙØ® : \s*)(.*)" replacement="$1${month.ar} ${current.year}"/> 306 <job pattern="(اÙÙسخ٠: \s*)(.*)" replacement="$1${version} "/>308 <job pattern="(اÙÙسخ٠: \s*)(.*)" replacement="$1${version}${version-extra}"/> 307 309 </rsr> 308 310 </if> … … 312 314 <rsr file="${gsdl.basedir}/READMEes.txt"> 313 315 <job pattern="^(Fecha\s*)(.*)" replacement="$1${month.es} de ${current.year}"/> 314 <job pattern="^(Versi.?n\s*)(.*)" replacement="$1${version} "/>316 <job pattern="^(Versi.?n\s*)(.*)" replacement="$1${version}${version-extra}"/> 315 317 </rsr> 316 318 </if> … … 320 322 <rsr file="${gsdl.basedir}/READMEfr.txt"> 321 323 <job pattern="^(Date\s*)(.*)" replacement="$1${month.fr} ${current.year}"/> 322 <job pattern="^(Version\s*)(.*)" replacement="$1${version} "/>324 <job pattern="^(Version\s*)(.*)" replacement="$1${version}${version-extra}"/> 323 325 </rsr> 324 326 </if> … … 328 330 <rsr file="${gsdl.basedir}/READMEru.txt"> 329 331 <job pattern="^(ÐаÑа\s*)(.*)" replacement="$1${month.ru} ${current.year}"/> 330 <job pattern="^(ÐеÑÑОÑ\s*)(.*)" replacement="$1${version} "/>332 <job pattern="^(ÐеÑÑОÑ\s*)(.*)" replacement="$1${version}${version-extra}"/> 331 333 </rsr> 332 334 </if> … … 355 357 <!-- GLI GATHERER --> 356 358 <echo level="info">Changing version number in gli Gatherer</echo> 357 <rsr file="${glibasedir}/src/org/greenstone/gatherer/Gatherer.java" pattern="^(.*)String\s*PROGRAM_VERSION\s*=\s*"(.*)"" replacement="$1String PROGRAM_VERSION = "${version} ""/>359 <rsr file="${glibasedir}/src/org/greenstone/gatherer/Gatherer.java" pattern="^(.*)String\s*PROGRAM_VERSION\s*=\s*"(.*)"" replacement="$1String PROGRAM_VERSION = "${version}${version-extra}""/> 358 360 359 361 <!-- CONFIG XML FILES --> 360 362 <echo level="info">Changing configuration version in classes/xml/config.xml</echo> 361 <rsr file="${glibasedir}/classes/xml/config.xml" pattern="^(\s*<Configuration.* version=")[^"]*(".*>)" replacement="$1${version}$ 2"/>363 <rsr file="${glibasedir}/classes/xml/config.xml" pattern="^(\s*<Configuration.* version=")[^"]*(".*>)" replacement="$1${version}${version-extra}$2"/> 362 364 363 365 <echo level="info">Changing configuration version in gli/classes/xml/configRemote.xml</echo> 364 <rsr file="${glibasedir}/classes/xml/configRemote.xml" pattern="^(\s*<Configuration.* version=")[^"]*(".*>)" replacement="$1${version}$ 2"/>366 <rsr file="${glibasedir}/classes/xml/configRemote.xml" pattern="^(\s*<Configuration.* version=")[^"]*(".*>)" replacement="$1${version}${version-extra}$2"/> 365 367 366 368 </target> -
main/trunk/release-kits/shared/core/ant-scripts/wrap.xml
r21725 r23493 40 40 chunkSize="${resources.chunksize}"/> 41 41 <rsplit 42 resource="installer/Greenstone-${version} -${os.suffix}.jar"42 resource="installer/Greenstone-${version}${version-extra}-${os.suffix}.jar" 43 43 outputDir="wrapped-installer" 44 44 resourceScript="wrapped-installer/wrapper.rc" … … 63 63 <!-- link wrapper --> 64 64 <exec executable="link" dir="wrapped-installer"> 65 <arg line="/OUT:..\products\Greenstone-${version} -${os.suffix}.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/>65 <arg line="/OUT:..\products\Greenstone-${version}${version-extra}-${os.suffix}.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/> 66 66 </exec> 67 67 … … 79 79 <!-- copy bundled files into place --> 80 80 <copy todir="wrapped-installer" file="${rk.home}/shared/linux/${linux-java.installer}"/> 81 <copy tofile="wrapped-installer/greenstone.jar" file="installer/Greenstone-${version} -${os.suffix}.jar"/>81 <copy tofile="wrapped-installer/greenstone.jar" file="installer/Greenstone-${version}${version-extra}-${os.suffix}.jar"/> 82 82 83 83 <!-- substitute in real values --> … … 122 122 <!-- link the compiled code and bundled files --> 123 123 <exec executable="g++" dir="wrapped-installer"> 124 <arg line="-static -static-libgcc -o ../products/Greenstone-${version} -linux wrapper.o libsearch4j.o greenstone.jar.o java.o"/>124 <arg line="-static -static-libgcc -o ../products/Greenstone-${version}${version-extra}-linux wrapper.o libsearch4j.o greenstone.jar.o java.o"/> 125 125 </exec> 126 126 … … 133 133 134 134 <!-- create app for main installer --> 135 <copy todir="wrapped-installer/Greenstone${version} .app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy>136 <copy todir="wrapped-installer/Greenstone${version} .app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/>137 <chmod file="wrapped-installer/Greenstone${version} .app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/>135 <copy todir="wrapped-installer/Greenstone${version}${version-extra}.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy> 136 <copy todir="wrapped-installer/Greenstone${version}${version-extra}.app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/> 137 <chmod file="wrapped-installer/Greenstone${version}${version-extra}.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/> 138 138 139 139 <!-- copy bundled files --> 140 <copy todir="wrapped-installer/Greenstone${version} .app/Contents/Resources/Java" file="installer/Greenstone-${version}-${os.suffix}.jar"/>140 <copy todir="wrapped-installer/Greenstone${version}${version-extra}.app/Contents/Resources/Java" file="installer/Greenstone-${version}${version-extra}-${os.suffix}.jar"/> 141 141 142 142 <!-- substitute in real values --> 143 <rsr file="wrapped-installer/Greenstone${version} .app/Contents/Info.plist">144 <job pattern="@jar@" replacement="Greenstone-${version} -${os.suffix}.jar"/>145 <job pattern="@version@" replacement="${version} "/>143 <rsr file="wrapped-installer/Greenstone${version}${version-extra}.app/Contents/Info.plist"> 144 <job pattern="@jar@" replacement="Greenstone-${version}${version-extra}-${os.suffix}.jar"/> 145 <job pattern="@version@" replacement="${version}${version-extra}"/> 146 146 </rsr> 147 147 … … 149 149 150 150 <!-- get size of app --> 151 <exec executable="du" dir="wrapped-installer" outputproperty="app.du"><arg line="-ks Greenstone${version} .app"/></exec>151 <exec executable="du" dir="wrapped-installer" outputproperty="app.du"><arg line="-ks Greenstone${version}${version-extra}.app"/></exec> 152 152 <exec executable="sed" inputstring="${app.du}" outputproperty="app.size"><arg line="-e 's/^\([0-9]*\).*$/\1/g'"/></exec> 153 153 <math result="dmg.size" operand1="${app.size}" operation="+" operand2="${dmg.overhead}" datatype="int"/> 154 154 155 155 <!-- create disk image --> 156 <property name="dmg.name" value="Greenstone-${version} -${os.suffix}"/>156 <property name="dmg.name" value="Greenstone-${version}${version-extra}-${os.suffix}"/> 157 157 <exec dir="products" executable="hdiutil" failonerror="true"><arg line="create -ov -size ${dmg.size}k -fs HFS+ -volname ${dmg.name} ${dmg.name}.dmg"/></exec> 158 158 <!-- mount it --> 159 159 <exec executable="hdiutil" dir="products" failonerror="true"><arg line="attach ${dmg.name}.dmg"/></exec> 160 160 <!-- copy file into it --> 161 <exec executable="cp"><arg line="-r wrapped-installer/Greenstone${version} .app /Volumes/${dmg.name}"/></exec>161 <exec executable="cp"><arg line="-r wrapped-installer/Greenstone${version}${version-extra}.app /Volumes/${dmg.name}"/></exec> 162 162 <!-- unmount it--> 163 163 <exec executable="hdiutil" failonerror="true"><arg line="detach /Volumes/${dmg.name}"/></exec>
Note:
See TracChangeset
for help on using the changeset viewer.