From ea5921a2c303d0d29216306f54b5428f21eb7699 Mon Sep 17 00:00:00 2001
From: Pierre-Luc Paour <paour@users.sourceforge.net>
Date: Sun, 7 Sep 2003 22:49:16 +0000
Subject: [PATCH] Merge from branch 1.1

---
 build.xml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index 6c31a0f..9733600 100644
--- a/build.xml
+++ b/build.xml
@@ -147,14 +147,17 @@
 
 	<target name="upload" depends="installer"
 		description="Upload to SF.net" >
-		<move file="${install}/Windows/NoVM/InstallGalleryRemote.exe" tofile="${install}/staging/InstallGalleryRemote.Win32.NoVM.exe" />
-		<move file="${install}/Windows/VM/InstallGalleryRemote.exe" tofile="${install}/staging/InstallGalleryRemote.Win32.VM.exe" />
+
+		<loadproperties srcfile="defaults.properties" />
+
+		<move file="${install}/Windows/NoVM/InstallGalleryRemote.exe" tofile="${install}/staging/GalleryRemote.${version}.Win32.NoVM.exe" />
+		<move file="${install}/Windows/VM/InstallGalleryRemote.exe" tofile="${install}/staging/GalleryRemote.${version}.Win32.VM.exe" />
 		<!--move file="${install}/MacOSX/InstallGalleryRemote.zip" tofile="${install}/staging/InstallGalleryRemote.MacOSX.NoVM.zip" /-->
-		<move file="${install}/Linux/NoVM/InstallGalleryRemote.bin" tofile="${install}/staging/InstallGalleryRemote.Linux.NoVM.bin" />
-		<move file="${install}/Linux/VM/InstallGalleryRemote.bin" tofile="${install}/staging/InstallGalleryRemote.Linux.VM.bin" />
-		<move file="${install}/Solaris/NoVM/InstallGalleryRemote.bin" tofile="${install}/staging/InstallGalleryRemote.Solaris.NoVM.bin" />
-		<move file="${install}/GenericUnix/InstallGalleryRemote.bin" tofile="${install}/staging/InstallGalleryRemote.Unix.NoVM.bin" />
-		<move file="${install}/Java/InstallGalleryRemote.jar" tofile="${install}/staging/InstallGalleryRemote.jar" />
+		<move file="${install}/Linux/NoVM/InstallGalleryRemote.bin" tofile="${install}/staging/GalleryRemote.${version}.Linux.NoVM.bin" />
+		<move file="${install}/Linux/VM/InstallGalleryRemote.bin" tofile="${install}/staging/GalleryRemote.${version}.Linux.VM.bin" />
+		<move file="${install}/Solaris/NoVM/InstallGalleryRemote.bin" tofile="${install}/staging/GalleryRemote.${version}.Solaris.NoVM.bin" />
+		<move file="${install}/GenericUnix/InstallGalleryRemote.bin" tofile="${install}/staging/GalleryRemote.${version}.Unix.NoVM.bin" />
+		<move file="${install}/Java/InstallGalleryRemote.jar" tofile="${install}/staging/GalleryRemote.${version}.jar" />
 	</target>
 </project>