Began merge work. DEFECT BUILD.

build.xml

@@ -99,13 +99,6 @@
 
 
     <target name="installer" depends="jar" >
-        <mkdir dir="${build}/images" />
-        <copy file="${resources}/images/itoopie-256.png" tofile="${dist}/images/logo.png"/>
-        <copy file="${resources}/images/itoopie-128.ico" tofile="${dist}/images/logo.ico"/>
-        <copy file="${resources}/images/thrash-128.ico" tofile="${dist}/images/thrash.ico"/>
-	<copy file="LICENSE" tofile="${dist}/license.txt"/>
-	<copy file="history.txt" tofile="${dist}/history.txt"/>
-
         <ant target="doAppEXE" />
 
         <taskdef name="izpack" classpath="${basedir}/installer/lib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />

installer/install.xml

@@ -2,8 +2,8 @@
 <installation version="1.0">
     <info>
         <appname>itoopie</appname>
-        <appversion>0.0.1</appversion>
-        <url>http://where.should.i.put.itoopie.on.the.net</url>
+        <appversion>0.0.2</appversion>
+        <url>http://itoopie.i2p</url>
     </info>
    
     <guiprefs width="590" height="356" resizable="yes">
@@ -53,7 +53,7 @@
     </locale>
    
     <resources>
-        <res id="Installer.image" src="installer/resources/itoopielogo.png" />
+        <res id="Installer.image" src="resources/images/itoopielogo.png" />
 		<res id="shortcutSpec.xml" src="installer/resources/shortcutSpec.xml" />
 		<res src="installer/resources/Unix_shortcutSpec.xml" id="Unix_shortcutSpec.xml"/>
 		<!--<res id="RegistrySpec.xml" src="installer/resources/registry.xml" /> -->
@@ -72,11 +72,12 @@
         <pack name="itoopie" required="yes">
             <description>The easy I2P UI</description>
             <fileset dir="dist/" includes="*.txt" targetdir="$INSTALL_PATH"/>
-	    <fileset dir="dist/lib" includes="**/*" targetdir="$INSTALL_PATH/lib" />
-	    <fileset dir="dist/" includes="*.exe" targetdir="$INSTALL_PATH" os="windows" />
-	    <fileset dir="dist/" includes="*.jar" targetdir="$INSTALL_PATH" os="unix" />
-	    <file src="installer/resources//itoopie.ico" targetdir="$INSTALL_PATH/icons" os="windows" />
-	    <file src="dist/logo.png" targetdir="$INSTALL_PATH/icons" os="unix" />
+	    	<fileset dir="dist/lib" includes="**/*" targetdir="$INSTALL_PATH/lib" />
+	    	<fileset dir="dist/" includes="*.exe" targetdir="$INSTALL_PATH" os="windows" />
+	    	<fileset dir="dist/" includes="*.jar" targetdir="$INSTALL_PATH" os="unix" />
+	    	<file src="resources/images/itoopie-128.ico" targetdir="$INSTALL_PATH/icons" os="windows" />
+	    	<file src="resources/images/thrash-128.ico" targetdir="$INSTALL_PATH/icons" os="windows" />
+	    	<file src="resources/images/itoopie-128.png" targetdir="$INSTALL_PATH/icons" os="unix" />
            
             <!--
 			<executable targetfile="$INSTALL_PATH/bin/startup.sh" />

installer/itoopieinstaller.xml

@@ -1,20 +0,0 @@
-<launch4jConfig>
-  <headerType>0</headerType>
-  <jar>../install.jar</jar>
-  <outfile>../itoopieinstall.exe</outfile>
-  <errTitle>Itoopie Installer</errTitle>
-  <chdir>.</chdir>
-  <customProcName>false</customProcName>
-  <!--<icon>SimpleApp.ico</icon>-->
-  <jre>
-    <minVersion>1.5.0</minVersion>
-  </jre>
-  <!--
-  <splash>
-    <file>splash.bmp</file>
-    <waitForWindow>true</waitForWindow>
-    <timeout>60</timeout>
-    <timeoutErr>true</timeoutErr>
-  </splash>
-  -->
-</launch4jConfig>

installer/resources/Unix_shortcutSpec.xml

@@ -34,5 +34,5 @@
 			workingDirectory=""
 			type="Application"
 			encoding="UTF-8"
-			description="IzPack uninstaller" />
+			description="Uninstall itoopie" />
 </shortcuts>

installer/resources/shortcutSpec.xml

@@ -1,26 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shortcuts>
  <programGroup defaultName="itoopie" location="startMenu" />
- <shortcut name="itoopie" 
+ <shortcut name="itoopie"
+			description="The simple I2P GUI!"
 			target="$INSTALL_PATH\itoopie.exe" 
 			commandLine=""
 			workingDirectory="$INSTALL_PATH"
-			iconFile="$INSTALL_PATH\icons\itoopie.ico"
+			iconFile="$INSTALL_PATH\images\logo.ico"
 			initialState="noShow"
 			programGroup="yes"
 			startMenu="yes"
 			desktop="yes"
 			startup="no" />
-
 <shortcut
-                        name="Uninstaller"
-                        programGroup="yes"
-                        startup="no"
-                        target="java"
-                        commandLine="-jar &quot;$INSTALL_PATH/Uninstaller/uninstaller.jar&quot;"
-                        Categories="Java;Application;Network;"
-                        initialState="noShow"
-                        workingDirectory=""
-                        description="IzPack uninstaller" />
-
+			name="Uninstaller"
+			programGroup="yes"
+			startMenu="yes"
+			desktop="no"
+			startup="no"
+			target="java -jar &quot;$INSTALL_PATH/Uninstaller/uninstaller.jar&quot;"
+			commandLine=""
+			iconFile="$INSTALL_PATH\images\thrash.ico"
+			iconIndex="0"
+			workingDirectory="$INSTALL_PATH"
+			description="Uninstall itoopie" />
 </shortcuts>