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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-05-07 14:56:25 +0000 (Sun, 07 May 2006)
New Revision: 8642

Modified:
   trunk/apps/installer/build.xml
Log:
installer: We should try to create shortcuts only on windows

Modified: trunk/apps/installer/build.xml
===================================================================
--- trunk/apps/installer/build.xml      2006-05-07 12:15:08 UTC (rev 8641)
+++ trunk/apps/installer/build.xml      2006-05-07 14:56:25 UTC (rev 8642)
@@ -271,7 +271,17 @@
                <property name="skip_jSite" value="true"/>
        </target>

-       <target name="frost" unless="skip_frost">
+       <target name="frost_windows" if="is_windows">
+               <echo message="Creating shortcuts"/>
+               <exec executable="cscript" dir="${basedir}/windows" >
+                       <arg value="CreateFrostShortcut.vbs"/>
+                       <arg value="&quot;${installDir}&quot;"/>
+                       <arg value="${freenetWorkingMode}"/>
+                       <arg value="${fproxyport}"/>
+               </exec>
+       </target>
+       
+       <target name="frost" unless="skip_frost" depends="frost_windows">
                <echo message="Downloading Frost"/>

                <java classpath="${basedir}/sha1test.jar" classname="Sha1Test" 
failonerror="true" fork="true" resultproperty="frost.verified" logError="true">
@@ -286,28 +296,26 @@
                        <replacefilter token="nodePort=26000" 
value="nodePort=${fcpport}"/>
                        <replacefilter token="availableNodes=127.0.0.1:9481" 
value="availableNodes=127.0.0.1:${fcpport}"/>
                </replace>
+       </target>
+
+       <target name="jSite_windows" if="is_windows">
+               <echo message="Creating shortcuts"/>
                <exec executable="cscript" dir="${basedir}/windows" >
-                       <arg value="CreateFrostShortcut.vbs"/>
+                       <arg value="CreatejSiteShortcut.vbs"/>
                        <arg value="&quot;${installDir}&quot;"/>
                        <arg value="${freenetWorkingMode}"/>
                        <arg value="${fproxyport}"/>
                </exec>
        </target>
+

-       <target name="jSite" unless="skip_jSite">
+       <target name="jSite" unless="skip_jSite" depends="jSite_windows">
                <echo message="Downloading jSite"/>

                <java classpath="${basedir}/sha1test.jar" classname="Sha1Test" 
failonerror="true" fork="true" resultproperty="frost.verified" logError="true">
                        <arg value="jSite/jSite.jar"/>
                </java>
                <copy file="${basedir}/jSite.jar"  
tofile="${installDir}/jSite.jar"/>
-               <echo message="Creating shortcuts"/>
-               <exec executable="cscript" dir="${basedir}/windows" >
-                       <arg value="CreatejSiteShortcut.vbs"/>
-                       <arg value="&quot;${installDir}&quot;"/>
-                       <arg value="${freenetWorkingMode}"/>
-                       <arg value="${fproxyport}"/>
-               </exec>
        </target>

        <target name="tgmain" unless="offline">