Author: nextgens
Date: 2006-05-06 13:48:21 +0000 (Sat, 06 May 2006)
New Revision: 8623
Added:
trunk/apps/installer/installclasspath/windows/CreateFreenetShortcut.vbs
trunk/apps/installer/installclasspath/windows/CreateFrostShortcut.vbs
trunk/apps/installer/installclasspath/windows/CreatejSiteShortcut.vbs
Removed:
trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
Modified:
trunk/apps/installer/build.xml
Log:
installer: We have set up icons correctly on windows now.
Modified: trunk/apps/installer/build.xml
===================================================================
--- trunk/apps/installer/build.xml 2006-05-06 13:36:41 UTC (rev 8622)
+++ trunk/apps/installer/build.xml 2006-05-06 13:48:21 UTC (rev 8623)
@@ -173,7 +173,7 @@
<copy file="${basedir}/windows/freenet.ico"
tofile="${installDir}/freenet.ico"/>
<echo message="Creating shortcuts"/>
<exec executable="cscript" dir="${basedir}/windows" >
- <arg value="CreateDesktopShortcut.vbs"/>
+ <arg value="CreateFreenetShortcut.vbs"/>
<arg value=""${installDir}""/>
<arg value="${freenetWorkingMode}"/>
<arg value="${fproxyport}"/>
@@ -286,6 +286,12 @@
<replacefilter token="nodePort=26000"
value="nodePort=${fcpport}"/>
<replacefilter token="availableNodes=127.0.0.1:9481"
value="availableNodes=127.0.0.1:${fcpport}"/>
</replace>
+ <exec executable="cscript" dir="${basedir}/windows" >
+ <arg value="CreateFrostShortcut.vbs"/>
+ <arg value=""${installDir}""/>
+ <arg value="${freenetWorkingMode}"/>
+ <arg value="${fproxyport}"/>
+ </exec>
</target>
<target name="jSite" unless="skip_jSite">
@@ -295,6 +301,13 @@
<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=""${installDir}""/>
+ <arg value="${freenetWorkingMode}"/>
+ <arg value="${fproxyport}"/>
+ </exec>
</target>
<target name="tgmain" unless="offline">
Deleted: trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
===================================================================
--- trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
2006-05-06 13:36:41 UTC (rev 8622)
+++ trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
2006-05-06 13:48:21 UTC (rev 8623)
@@ -1,46 +0,0 @@
-set args = WScript.Arguments
-
-INSTALL_PATH = args.Item(0)
-KIND = args.Item(1)
-PORT = args.Item(2)
-
-'Set link = Shell.CreateShortcut(DesktopPath & "\frost.lnk")
-'link.Arguments = ""
-'link.Description = "FROST"
-'link.HotKey = ""
-'link.IconLocation = INSTALL_PATH & "\frost\jtc.ico"
-'link.TargetPath = "frost.bat"
-'link.WindowStyle = 1
-'link.WorkingDirectory = INSTALL_PATH & "\frost"
-'link.Save
-
-Set WshShell = CreateObject("WScript.Shell")
-'Define the folder as StartMenu
-sStartMenu = WshShell.SpecialFolders("Programs")
-'Define the folder as Desktop
-sDesktop = WshShell.SpecialFolders("Desktop")
-
-'Create Desktop shortcut:
-
-Set oShellLink = WshShell.CreateShortcut(sDesktop & "\Freenet-" & KIND &
"-Main Page.lnk")
-oShellLink.Arguments = ""
-oShellLink.Description = "The Free Network Project"
-oShellLink.HotKey = "CTRL+ALT+SHIFT+F"
-oShellLink.IconLocation = INSTALL_PATH & "\freenet.ico"
-oShellLink.TargetPath = "http://127.0.0.1:"; & PORT
-oShellLink.WindowStyle = 1
-oShellLink.WorkingDirectory = INSTALL_PATH
-oShellLink.Save
-
-'Create ShortCut in Start Menu.
-Set fso = CreateObject("Scripting.FileSystemObject")
-Set f = fso.CreateFolder(sStartMenu & "/Freenet")
-Set oShellLink = WshShell.CreateShortcut(sStartMenu & "/Freenet/Freenet-" &
KIND & "-Main Page.lnk")
-oShellLink.Arguments = ""
-oShellLink.Description = "The Free Network Project"
-oShellLink.HotKey = "CTRL+ALT+SHIFT+F"
-oShellLink.IconLocation = INSTALL_PATH & "\freenet.ico"
-oShellLink.TargetPath = "http://127.0.0.1:"; & PORT
-oShellLink.WindowStyle = 1
-oShellLink.WorkingDirectory = INSTALL_PATH
-oShellLink.Save
Copied: trunk/apps/installer/installclasspath/windows/CreateFreenetShortcut.vbs
(from rev 8622,
trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs)
===================================================================
--- trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
2006-05-06 13:36:41 UTC (rev 8622)
+++ trunk/apps/installer/installclasspath/windows/CreateFreenetShortcut.vbs
2006-05-06 13:48:21 UTC (rev 8623)
@@ -0,0 +1,46 @@
+set args = WScript.Arguments
+
+INSTALL_PATH = args.Item(0)
+KIND = args.Item(1)
+PORT = args.Item(2)
+
+Set WshShell = CreateObject("WScript.Shell")
+'Define the folder as StartMenu
+sStartMenu = WshShell.SpecialFolders("Programs")
+'Define the folder as Desktop
+sDesktop = WshShell.SpecialFolders("Desktop")
+
+'Create Desktop shortcut:
+
+Set oShellLink = WshShell.CreateShortcut(sDesktop & "\Freenet-" & KIND &
"-Main Page.lnk")
+oShellLink.Arguments = ""
+oShellLink.Description = "The Free Network Project"
+oShellLink.HotKey = "CTRL+ALT+SHIFT+F"
+oShellLink.IconLocation = INSTALL_PATH & "\freenet.ico"
+oShellLink.TargetPath = "http://127.0.0.1:"; & PORT
+oShellLink.WindowStyle = 1
+oShellLink.WorkingDirectory = INSTALL_PATH
+oShellLink.Save
+
+'Create ShortCut in Start Menu.
+Set fso = CreateObject("Scripting.FileSystemObject")
+Set f = fso.CreateFolder(sStartMenu & "/Freenet")
+Set oShellLink = WshShell.CreateShortcut(sStartMenu & "/Freenet/Freenet-" &
KIND & "-Main Page.lnk")
+oShellLink.Arguments = ""
+oShellLink.Description = "The Free Network Project"
+oShellLink.HotKey = "CTRL+ALT+SHIFT+F"
+oShellLink.IconLocation = INSTALL_PATH & "\freenet.ico"
+oShellLink.TargetPath = "http://127.0.0.1:"; & PORT
+oShellLink.WindowStyle = 1
+oShellLink.WorkingDirectory = INSTALL_PATH
+oShellLink.Save
+
+
+Set oShellLink = WshShell.CreateShortcut(sStartMenu & "/Freenet/The Free
Network Project home page.lnk")
+oShellLink.Arguments = ""
+oShellLink.Description = "The Free Network Project"
+oShellLink.IconLocation = INSTALL_PATH & "\freenet.ico"
+oShellLink.TargetPath = "http://freenetproject.org";
+oShellLink.WindowStyle = 1
+oShellLink.WorkingDirectory = INSTALL_PATH
+oShellLink.Save
Added: trunk/apps/installer/installclasspath/windows/CreateFrostShortcut.vbs
===================================================================
--- trunk/apps/installer/installclasspath/windows/CreateFrostShortcut.vbs
2006-05-06 13:36:41 UTC (rev 8622)
+++ trunk/apps/installer/installclasspath/windows/CreateFrostShortcut.vbs
2006-05-06 13:48:21 UTC (rev 8623)
@@ -0,0 +1,19 @@
+set args = WScript.Arguments
+
+INSTALL_PATH = args.Item(0)
+KIND = args.Item(1)
+PORT = args.Item(2)
+
+Set WshShell = CreateObject("WScript.Shell")
+'Define the folder as StartMenu
+sStartMenu = WshShell.SpecialFolders("Programs")
+
+'Create ShortCut in Start Menu.
+Set oShellLink = WshShell.CreateShortcut(sStartMenu & "/Freenet/Frost-" & KIND
& ".lnk")
+oShellLink.Arguments = ""
+oShellLink.Description = "FROST"
+oShellLink.IconLocation = INSTALL_PATH & "\frost\jtc.ico"
+oShellLink.TargetPath = "frost.bat"
+oShellLink.WindowStyle = 1
+oShellLink.WorkingDirectory = INSTALL_PATH & "\frost"
+oShellLink.Save
Added: trunk/apps/installer/installclasspath/windows/CreatejSiteShortcut.vbs
===================================================================
--- trunk/apps/installer/installclasspath/windows/CreatejSiteShortcut.vbs
2006-05-06 13:36:41 UTC (rev 8622)
+++ trunk/apps/installer/installclasspath/windows/CreatejSiteShortcut.vbs
2006-05-06 13:48:21 UTC (rev 8623)
@@ -0,0 +1,17 @@
+set args = WScript.Arguments
+
+INSTALL_PATH = args.Item(0)
+KIND = args.Item(1)
+PORT = args.Item(2)
+
+Set WshShell = CreateObject("WScript.Shell")
+'Define the folder as StartMenu
+sStartMenu = WshShell.SpecialFolders("Programs")
+
+'Create ShortCut in Start Menu.
+Set oShellLink = WshShell.CreateShortcut(sStartMenu & "/Freenet/jSite-" & KIND
& ".lnk")
+oShellLink.Arguments = "-jar jSite.jar"
+oShellLink.Description = "jSite"
+oShellLink.TargetPath = "java"
+oShellLink.WorkingDirectory = INSTALL_PATH
+oShellLink.Save
