Index: main/trunk/release-kits/shared/core/ant-scripts/wrap.xml
===================================================================
--- main/trunk/release-kits/shared/core/ant-scripts/wrap.xml	(revision 21725)
+++ main/trunk/release-kits/shared/core/ant-scripts/wrap.xml	(revision 23493)
@@ -40,5 +40,5 @@
 				chunkSize="${resources.chunksize}"/>
 			<rsplit
-				resource="installer/Greenstone-${version}-${os.suffix}.jar"
+				resource="installer/Greenstone-${version}${version-extra}-${os.suffix}.jar"
 				outputDir="wrapped-installer"
 				resourceScript="wrapped-installer/wrapper.rc"
@@ -63,5 +63,5 @@
 			<!-- link wrapper -->
 			<exec executable="link" dir="wrapped-installer">
-				<arg line="/OUT:..\products\Greenstone-${version}-${os.suffix}.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/>
+				<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"/>
 			</exec>
 
@@ -79,5 +79,5 @@
 			<!-- copy bundled files into place -->
 			<copy todir="wrapped-installer" file="${rk.home}/shared/linux/${linux-java.installer}"/>
-			<copy tofile="wrapped-installer/greenstone.jar" file="installer/Greenstone-${version}-${os.suffix}.jar"/>
+			<copy tofile="wrapped-installer/greenstone.jar" file="installer/Greenstone-${version}${version-extra}-${os.suffix}.jar"/>
 
 			<!-- substitute in real values -->
@@ -122,5 +122,5 @@
 			<!-- link the compiled code and bundled files -->
 			<exec executable="g++" dir="wrapped-installer">
-				<arg line="-static -static-libgcc -o ../products/Greenstone-${version}-linux wrapper.o libsearch4j.o greenstone.jar.o java.o"/>
+				<arg line="-static -static-libgcc -o ../products/Greenstone-${version}${version-extra}-linux wrapper.o libsearch4j.o greenstone.jar.o java.o"/>
 			</exec>
 
@@ -133,15 +133,15 @@
 
 			<!-- create app for main installer -->
-			<copy todir="wrapped-installer/Greenstone${version}.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy>
-			<copy todir="wrapped-installer/Greenstone${version}.app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/>
-			<chmod file="wrapped-installer/Greenstone${version}.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/>
+			<copy todir="wrapped-installer/Greenstone${version}${version-extra}.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy>
+			<copy todir="wrapped-installer/Greenstone${version}${version-extra}.app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/>
+			<chmod file="wrapped-installer/Greenstone${version}${version-extra}.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/>
 
 			<!-- copy bundled files -->
-			<copy todir="wrapped-installer/Greenstone${version}.app/Contents/Resources/Java" file="installer/Greenstone-${version}-${os.suffix}.jar"/>
+			<copy todir="wrapped-installer/Greenstone${version}${version-extra}.app/Contents/Resources/Java" file="installer/Greenstone-${version}${version-extra}-${os.suffix}.jar"/>
 
 			<!-- substitute in real values -->
-			<rsr file="wrapped-installer/Greenstone${version}.app/Contents/Info.plist">
-				<job pattern="@jar@" replacement="Greenstone-${version}-${os.suffix}.jar"/>
-				<job pattern="@version@" replacement="${version}"/>
+			<rsr file="wrapped-installer/Greenstone${version}${version-extra}.app/Contents/Info.plist">
+				<job pattern="@jar@" replacement="Greenstone-${version}${version-extra}-${os.suffix}.jar"/>
+				<job pattern="@version@" replacement="${version}${version-extra}"/>
 			</rsr>
 
@@ -149,15 +149,15 @@
 
 			<!-- get size of app -->
-			<exec executable="du" dir="wrapped-installer" outputproperty="app.du"><arg line="-ks Greenstone${version}.app"/></exec>
+			<exec executable="du" dir="wrapped-installer" outputproperty="app.du"><arg line="-ks Greenstone${version}${version-extra}.app"/></exec>
 			<exec executable="sed" inputstring="${app.du}" outputproperty="app.size"><arg line="-e 's/^\([0-9]*\).*$/\1/g'"/></exec>
 			<math result="dmg.size" operand1="${app.size}" operation="+" operand2="${dmg.overhead}" datatype="int"/>
 
 			<!-- create disk image -->
-			<property name="dmg.name" value="Greenstone-${version}-${os.suffix}"/>
+			<property name="dmg.name" value="Greenstone-${version}${version-extra}-${os.suffix}"/>
 			<exec dir="products" executable="hdiutil" failonerror="true"><arg line="create -ov -size ${dmg.size}k -fs HFS+ -volname ${dmg.name} ${dmg.name}.dmg"/></exec>
 			<!-- mount it -->
 			<exec executable="hdiutil" dir="products" failonerror="true"><arg line="attach ${dmg.name}.dmg"/></exec>
 			<!-- copy file into it -->
-			<exec executable="cp"><arg line="-r wrapped-installer/Greenstone${version}.app /Volumes/${dmg.name}"/></exec>
+			<exec executable="cp"><arg line="-r wrapped-installer/Greenstone${version}${version-extra}.app /Volumes/${dmg.name}"/></exec>
 			<!-- unmount it-->
 			<exec executable="hdiutil" failonerror="true"><arg line="detach /Volumes/${dmg.name}"/></exec>
