Began merge work. DEFECT BUILD.

This commit is contained in:
dev
2011-08-04 11:09:43 +00:00
parent 07bde46d2d
commit b303edd6e9
9 changed files with 24 additions and 49 deletions

View File

@ -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" />