[freenet-cvs] r8347 - trunk/apps/installer

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-03-28 22:43:58 +0000 (Tue, 28 Mar 2006)
New Revision: 8347

Modified:
   trunk/apps/installer/build.xml
Log:
wasn't the latest version :$

Modified: trunk/apps/installer/build.xml
===================================================================
--- trunk/apps/installer/build.xml      2006-03-28 22:40:25 UTC (rev 8346)
+++ trunk/apps/installer/build.xml      2006-03-28 22:43:58 UTC (rev 8347)
@@ -70,32 +70,16 @@
                <copy file="${basedir}/windows/start.cmd"  
tofile="${installDir}/start.cmd"/>
                <copy file="${basedir}/windows/stop.cmd"  
tofile="${installDir}/stop.cmd"/>
                <echo message="Creating shortcuts"/>
-               <exec os="Windows 2003" executable="cscript" 
dir="${basedir}/windows" >
+               <exec executable="cscript" dir="${basedir}/windows" >
                        <arg value="CreateDesktopShortcut.vbs"/>
                        <arg value="&quot;${installDir}&quot;"/>
                </exec>
-               <exec os="Windows 2000" executable="cscript" 
dir="${basedir}/windows" >
-                       <arg value="CreateDesktopShortcut.vbs"/>
-                       <arg value="&quot;${installDir}&quot;"/>
-               </exec>
-               <exec os="Windows XP" executable="cscript" 
dir="${basedir}/windows" >
-                       <arg value="CreateDesktopShortcut.vbs"/>
-                       <arg value="&quot;${installDir}&quot;"/>
-               </exec>

                <echo message="Registering as a system service if possible"/>
-               <exec os="Windows 2003" executable="cmd" dir="${installDir}/" >
+               <exec executable="cmd" dir="${installDir}/" >
                        <arg value="/c"/>
                        <arg value="run.cmd"/>
                </exec>
-               <exec os="Windows 2000" executable="cmd" dir="${installDir}/">
-                       <arg value="/c"/>
-                       <arg value="run.cmd"/>
-               </exec>
-               <exec os="Windows XP" executable="cmd" dir="${installDir}/" >
-                       <arg value="/c"/>
-                       <arg value="run.cmd"/>
-               </exec>
        </target>

        <target name="unix" if="is_unix">
@@ -105,14 +89,14 @@

                <echo message="Creating shortcuts"/>
                <chmod file="${basedir}/linux/CreateDesktopShortcut.sh" 
perm="775"/>
-               <exec os="Linux" executable="sh" dir="${basedir}/linux/">
+               <exec executable="sh" dir="${basedir}/linux/">
                        <arg value="CreateDesktopShortcut.sh"/>
                        <arg value="&quot;${installDir}&quot;"/>
                </exec>

                <echo message="Registering as a system service if possible"/>

-               <exec os="Linux" executable="sh" dir="${installDir}">
+               <exec executable="sh" dir="${installDir}">
                        <arg value="run.sh"/>
                        <arg value="start"/>
                </exec>