bug 225128 - launcher is not executable

1 files changed, 23 insertions, 28 deletions

diff --git a/bundles/org.eclipse.equinox.executable/target.build.xml b/bundles/org.eclipse.equinox.executable/target.build.xml
index 6b1409245..45e115939 100644
--- a/bundles/org.eclipse.equinox.executable/target.build.xml
+++ b/bundles/org.eclipse.equinox.executable/target.build.xml
@@ -55,7 +55,7 @@
 				<include name="launcher.exe"/>
 			</fileset>
 		</copy>
-		<chmod perm="755" dir="${feature.base}/win32.win32.x86/${collectingFolder}" includes="${launcherName}" /> 
+		<chmod perm="755" dir="${feature.base}/win32.win32.x86/${collectingFolder}" includes="launcher.exe" /> 
 	</target>
 	
 	<target name="rootFileswin32_win32_x86_64">
@@ -65,7 +65,7 @@
 				<include name="launcher.exe"/>
 			</fileset>
 		</copy>
-		<chmod perm="755" dir="${feature.base}/win32.win32.x86_64/${collectingFolder}" includes="${launcherName}" /> 
+		<chmod perm="755" dir="${feature.base}/win32.win32.x86_64/${collectingFolder}" includes="launcher.exe" /> 
 	</target>
 	
 	<target name="rootFileswin32_win32_ia64">
@@ -75,7 +75,7 @@
 				<include name="launcher.exe"/>
 			</fileset>
 		</copy>
-		<chmod perm="755" dir="${feature.base}/win32.win32.ia64/${collectingFolder}" includes="${launcherName}" /> 
+		<chmod perm="755" dir="${feature.base}/win32.win32.ia64/${collectingFolder}" includes="launcher.exe" /> 
 	</target>
 			
 	<target name="rootFileswin32_wpf_x86">
@@ -85,7 +85,7 @@
 				<include name="launcher.exe"/>
 			</fileset>
 		</copy>
-		<chmod perm="755" dir="${feature.base}/win32.wpf.x86/${collectingFolder}" includes="${launcherName}" /> 
+		<chmod perm="755" dir="${feature.base}/win32.wpf.x86/${collectingFolder}" includes="launcher.exe" /> 
 	</target>
 		
 	<target name="rootFilesmacosx_carbon_ppc">
@@ -94,8 +94,7 @@
 			<fileset dir="${basedir}/bin/carbon/macosx/ppc" includes="**"			/>
 		</copy>
 		<chmod perm="755" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" includes="${launcherName}" /> 
-		<chmod perm="755" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" includes="${launcherName}.app/Contents/MacOS/${launcherName}" /> 
-		<chmod perm="755" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" includes="${launcherName}.app/Contents/Resources/Splash.app/Contents/MacOS/${launcherName}"/>
+		<chmod perm="755" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" /> 
 	</target>
 	<target name="rootFilesmacosx_carbon_x86">
 		<mkdir dir="${feature.base}/macosx.carbon.x86/${collectingFolder}"/>
@@ -103,8 +102,7 @@
 			<fileset dir="${basedir}/bin/carbon/macosx/x86" includes="**"			/>
 		</copy>
 		<chmod perm="755" dir="${feature.base}/macosx.carbon.x86/${collectingFolder}" includes="${launcherName}" /> 
-		<chmod perm="755" dir="${feature.base}/macosx.carbon.x86/${collectingFolder}" includes="${launcherName}.app/Contents/MacOS/${launcherName}" /> 
-		<chmod perm="755" dir="${feature.base}/macosx.carbon.x86/${collectingFolder}" includes="${launcherName}.app/Contents/Resources/Splash.app/Contents/MacOS/${launcherName}"/>
+		<chmod perm="755" dir="${feature.base}/macosx.carbon.x86/${collectingFolder}" includes="Elcipse.app/Contents/MacOS/launcher" /> 
 	</target>
 	<target name="rootFilesmacosx_cocoa_ppc">
 		<mkdir dir="${feature.base}/macosx.cocoa.ppc/${collectingFolder}"/>
@@ -112,8 +110,7 @@
 			<fileset dir="${basedir}/bin/cocoa/macosx/ppc" includes="**"			/>
 		</copy>
 		<chmod perm="755" dir="${feature.base}/macosx.cocoa.ppc/${collectingFolder}" includes="${launcherName}" /> 
-		<chmod perm="755" dir="${feature.base}/macosx.cocoa.ppc/${collectingFolder}" includes="${launcherName}.app/Contents/MacOS/${launcherName}" /> 
-		<chmod perm="755" dir="${feature.base}/macosx.cocoa.ppc/${collectingFolder}" includes="${launcherName}.app/Contents/Resources/Splash.app/Contents/MacOS/${launcherName}"/>
+		<chmod perm="755" dir="${feature.base}/macosx.cocoa.ppc/${collectingFolder}" includes="Elcipse.app/Contents/MacOS/launcher" /> 
 	</target>
 	<target name="rootFilesmacosx_cocoa_x86">
 		<mkdir dir="${feature.base}/macosx.cocoa.x86/${collectingFolder}"/>
@@ -121,8 +118,7 @@
 			<fileset dir="${basedir}/bin/cocoa/macosx/x86" includes="**"			/>
 		</copy>
 		<chmod perm="755" dir="${feature.base}/macosx.cocoa.x86/${collectingFolder}" includes="${launcherName}" /> 
-		<chmod perm="755" dir="${feature.base}/macosx.cocoa.x86/${collectingFolder}" includes="${launcherName}.app/Contents/MacOS/${launcherName}" /> 
-		<chmod perm="755" dir="${feature.base}/macosx.cocoa.x86/${collectingFolder}" includes="${launcherName}.app/Contents/Resources/Splash.app/Contents/MacOS/${launcherName}"/>
+		<chmod perm="755" dir="${feature.base}/macosx.cocoa.x86/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" /> 
 	</target>
 	<target name="rootFilesmacosx_cocoa_x86_64">
 		<mkdir dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}"/>
@@ -130,8 +126,7 @@
 			<fileset dir="${basedir}/bin/cocoa/macosx/x86_64" includes="**"			/>
 		</copy>
 		<chmod perm="755" dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}" includes="${launcherName}" /> 
-		<chmod perm="755" dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}" includes="${launcherName}.app/Contents/MacOS/${launcherName}" /> 
-		<chmod perm="755" dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}" includes="${launcherName}.app/Contents/Resources/Splash.app/Contents/MacOS/${launcherName}"/>
+		<chmod perm="755" dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" /> 
 	</target>
 	<target name="rootFileslinux_gtk_x86">
 		<mkdir dir="${feature.base}/linux.gtk.x86/${collectingFolder}"/>
@@ -139,7 +134,7 @@
 			<fileset dir="${basedir}/bin/gtk/linux/x86" includes="**"			/>
 			<fileset dir="${basedir}/gtk_root" includes="**"			/>
 		</copy>
-		<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="${launcherName}" /> 
+		<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="launcher" /> 
 		<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="libcairo-swt.so" /> 
 	</target>
 	<target name="rootFileslinux_gtk_ppc">
@@ -148,14 +143,14 @@
 			<fileset dir="${basedir}/bin/gtk/linux/ppc" includes="**"			/>
 			<fileset dir="${basedir}/gtk_root" includes="**"			/>
 		</copy>
-		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${collectingFolder}" includes="${launcherName}" />
+		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${collectingFolder}" includes="launcher" />
 		<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="libcairo-swt.so" />
 	</target>
 	<target name="rootFileslinux_gtk_ppc64">
 		<mkdir dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}"/>
 		<copy todir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" failonerror="true" overwrite="true">
 		</copy>
-		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="${launcherName}" /> 
+		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="launcher" /> 
 	</target>
 	<target name="rootFileslinux_gtk_x86_64">
 		<mkdir dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}"/>
@@ -163,14 +158,14 @@
 			<fileset dir="${basedir}/bin/gtk/linux/x86_64" includes="**"			/>
 			<fileset dir="${basedir}/gtk_root" includes="**"			/>
 		</copy>
-		<chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="${launcherName}" /> 
+		<chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="launcher" /> 
 		<chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="libcairo-swt.so" /> 
 	</target>
 	<target name="rootFileslinux_gtk_ia64">
 		<mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}"/>
 		<copy todir="${feature.base}/linux.gtk.ia64/${collectingFolder}" failonerror="true" overwrite="true">
 		</copy>
-		<chmod perm="755" dir="${feature.base}/linux.gtk.ia64/${collectingFolder}" includes="${launcherName}" /> 
+		<chmod perm="755" dir="${feature.base}/linux.gtk.ia64/${collectingFolder}" includes="launcher" /> 
 	</target>
 	<target name="rootFileslinux_motif_x86">
 		<mkdir dir="${feature.base}/linux.motif.x86/${collectingFolder}"/>
@@ -179,62 +174,62 @@
 			<fileset dir="${basedir}/motif_root" includes="**"			/>
 		</copy>
 		<chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="libXm.so.2,libcairo-swt.so" /> 
-		<chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="${launcherName}" /> 
+		<chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="launcher" /> 
 	</target>
 	<target name="rootFilessolaris_gtk_sparc">
 		<mkdir dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}"/>
 		<copy todir="${feature.base}/solaris.gtk.sparc/${collectingFolder}" failonerror="true" overwrite="true">
 			<fileset dir="${basedir}/bin/gtk/solaris/sparc" includes="**"			/>
 		</copy>
-		<chmod perm="755" dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}" includes="${launcherName}" /> 
+		<chmod perm="755" dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}" includes="launcher" /> 
 	</target>
 	<target name="rootFilessolaris_gtk_x86">
 		<mkdir dir="${feature.base}/solaris.gtk.x86/${collectingFolder}"/>
 		<copy todir="${feature.base}/solaris.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true">
 			<fileset dir="${basedir}/bin/gtk/solaris/x86" includes="**"			/>
 		</copy>
-		<chmod perm="755" dir="${feature.base}/solaris.gtk.x86/${collectingFolder}" includes="${launcherName}" /> 
+		<chmod perm="755" dir="${feature.base}/solaris.gtk.x86/${collectingFolder}" includes="launcher" /> 
 	</target>
 	<target name="rootFilessolaris_motif_sparc">
 		<mkdir dir="${feature.base}/solaris.motif.sparc/${collectingFolder}"/>
 		<copy todir="${feature.base}/solaris.motif.sparc/${collectingFolder}" failonerror="true" overwrite="true">
 			<fileset dir="${basedir}/contributed/motif/solaris/sparc" includes="**"			/>
 		</copy>
-		<chmod perm="755" dir="${feature.base}/solaris.motif.sparc/${collectingFolder}" includes="${launcherName}" /> 
+		<chmod perm="755" dir="${feature.base}/solaris.motif.sparc/${collectingFolder}" includes="launcher" /> 
 	</target>
 	<target name="rootFilesaix_motif_ppc">
 		<mkdir dir="${feature.base}/aix.motif.ppc/${collectingFolder}"/>
 		<copy todir="${feature.base}/aix.motif.ppc/${collectingFolder}" failonerror="true" overwrite="true">
 			<fileset dir="${basedir}/bin/motif/aix/ppc" includes="**"			/>
 		</copy>
-		<chmod perm="755" dir="${feature.base}/aix.motif.ppc/${collectingFolder}" includes="${launcherName}" /> 
+		<chmod perm="755" dir="${feature.base}/aix.motif.ppc/${collectingFolder}" includes="launcher" /> 
 	</target>
 	<target name="rootFileshpux_motif_PA_RISC">
 		<mkdir dir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}"/>
 		<copy todir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}" failonerror="true" overwrite="true">
 			<fileset dir="${basedir}/bin/motif/hpux/PA_RISC" includes="**"			/>
 		</copy>
-		<chmod perm="755" dir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}" includes="${launcherName}" /> 
+		<chmod perm="755" dir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}" includes="launcher" /> 
 	</target>
 	<target name="rootFileshpux_motif_ia64">
 		<mkdir dir="${feature.base}/hpux.motif.ia64/${collectingFolder}"/>
 		<copy todir="${feature.base}/hpux.motif.ia64/${collectingFolder}" failonerror="true" overwrite="true">
 		</copy>
-		<chmod perm="755" dir="${feature.base}/hpux.motif.ia64/${collectingFolder}" includes="${launcherName}" /> 
+		<chmod perm="755" dir="${feature.base}/hpux.motif.ia64/${collectingFolder}" includes="launcher" /> 
 	</target>
 	<target name="rootFileshpux_motif_ia64_32">
 		<mkdir dir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}"/>
 		<copy todir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}" failonerror="true" overwrite="true">
 			<fileset dir="${basedir}/bin/motif/hpux/ia64_32" includes="**"			/>
 		</copy>
-		<chmod perm="755" dir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}" includes="${launcherName}" /> 
+		<chmod perm="755" dir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}" includes="launcher" /> 
 	</target>
 	<target name="rootFilesqnx_photon_x86">
 		<mkdir dir="${feature.base}/qnx.photon.x86/${collectingFolder}"/>
 		<copy todir="${feature.base}/qnx.photon.x86/${collectingFolder}" failonerror="true" overwrite="true">
 			<fileset dir="${basedir}/bin/photon/qnx/x86" includes="**"			/>
 		</copy>
-		<chmod perm="755" dir="${feature.base}/qnx.photon.x86/${collectingFolder}" includes="${launcherName}" /> 
+		<chmod perm="755" dir="${feature.base}/qnx.photon.x86/${collectingFolder}" includes="launcher" /> 
 	</target>
 	<target name="rootFilesgroup_group_group">
 		<antcall target="rootFileswin32_win32_x86"/>