Skip to content
Browse files

Merge branch 'issue-43-izpack'

  • Loading branch information...
2 parents 8e214a3 + dcda03e commit 9716235b6fb0397e5a706dc58697774d70f6d451 @brazzy committed Oct 2, 2011
View
54 build.xml
@@ -12,6 +12,8 @@
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="util/ant-contrib-1.0b3.jar"/>
<typedef resource="org/jdesktop/deployment/ant/pack200/antlib.xml"
classpath="util/deployment-ant-pack200-1.0-rc1.jar"/>
+ <taskdef name="IzPack" classname="com.izforge.izpack.ant.IzPackTask"
+ classpath="util/izpack_standalone-compiler.jar"/>
<property environment="env"/>
<property name="findbugs.home" value="C:/Programme/Java/findbugs-1.3.9" />
@@ -214,6 +216,7 @@
input="${release.tags}"
regexp=".*release_(.*)$"
select="\1" />
+ <property name="release.file" value="Nikki_${release.id}"/>
<echo message="Release ID: ${release.id}"/>
</target>
@@ -224,20 +227,20 @@
<replace dir="${build.dir}/de/brazzy/nikki/view/" token="@@RELEASE_ID@@" value="${release.id}">
<include name="about*.html"/>
</replace>
- <jar destfile="build/Nikki.jar">
+ <jar destfile="build/${release.file}.jar">
<manifest>
<attribute name="Main-Class" value="de.brazzy.nikki.Launcher"/>
<attribute name="Class-Path" value="
- JavaAPIforKml.jar
- RouteConverterCmdLine.jar
- commons-io-1.4.jar
- groovy-all-1.7.0.jar
- java-image-scaling-0.8.4.jar
- jaxb-api.jar lib/jaxb-impl.jar
- joda-time-1.6.jar
- jsi-1.0b2p1.jar
- mediautil-1.0_patched.jar
- trove-0.1.8.jar
+ lib/JavaAPIforKml.jar
+ lib/RouteConverterCmdLine.jar
+ lib/commons-io-1.4.jar
+ lib/groovy-all-1.7.0.jar
+ lib/java-image-scaling-0.8.4.jar
+ lib/jaxb-api.jar lib/jaxb-impl.jar
+ lib/joda-time-1.6.jar
+ lib/jsi-1.0b2p1.jar
+ lib/mediautil-1.0_patched.jar
+ lib/trove-0.1.8.jar
"/>
<attribute name="Implementation-Version" value="${build.id}"/>
</manifest>
@@ -262,27 +265,27 @@
</if>
</target>
- <target name="prepare_dist_artifacts" depends="create_run_jar,get_keystore_passwords">
+ <target name="create_jws_distribution" depends="create_run_jar,get_keystore_passwords">
<mkdir dir="${dist.dir}"/>
- <copy file="Nikki.jnlp" tofile="${dist.dir}/Nikki_${release.id}.jnlp" />
- <replace file="${dist.dir}/Nikki_${release.id}.jnlp" token="@@RELEASE_ID@@" value="${release.id}" />
+ <copy file="Nikki.jnlp" tofile="${dist.dir}/${release.file}.jnlp" />
+ <replace file="${dist.dir}/${release.file}.jnlp" token="@@RELEASE_ID@@" value="${release.id}" />
<pack200 todir="${dist.dir}" repack="true">
- <fileset file="build/Nikki.jar" />
+ <fileset file="build/${release.file}.jar" />
</pack200 >
<signjar alias="brazzy" keypass="${keystore.keypass}" storepass="${keystore.storepass}">
- <fileset file="${dist.dir}/Nikki.jar"/>
+ <fileset file="${dist.dir}${release.file}.jar"/>
</signjar>
- <move file="${dist.dir}/Nikki.jar" tofile="${dist.dir}/Nikki_${release.id}.jar" />
<pack200 todir="${dist.dir}">
- <fileset file="${dist.dir}/Nikki_${release.id}.jar"/>
+ <fileset file="${dist.dir}/${release.file}.jarr"/>
<mapper type="glob" from="*.jar" to="*.jar.pack.gz"/>
</pack200 >
+
</target>
- <target name="prepare_dist_libs" depends="get_keystore_passwords">
+ <target name="create_jws_libs" depends="get_keystore_passwords">
<mkdir dir="${dist.dir}"/>
<pack200 todir="${dist.dir}" repack="true">
@@ -298,6 +301,17 @@
<mapper type="glob" from="*.jar" to="*.jar.pack.gz"/>
</pack200 >
</target>
+
+ <target name="create_installer" depends="create_run_jar">
+ <mkdir dir="${dist.dir}"/>
+ <copy file="install/installation.xml" tofile="build/installation.xml" />
+ <replace file="build/installation.xml" token="@@RELEASE_ID@@" value="${release.id}" />
+
+ <IzPack input="build/installation.xml"
+ output="${dist.dir}/${release.file}-install.jar"
+ installerType="standard"
+ basedir="."/>
+ </target>
<target name="findbugs" depends="build">
<findbugs home="${findbugs.home}"
@@ -312,6 +326,6 @@
</findbugs>
</target>
- <target name="integration" depends="clean,junit,coverage-report,javadoc,findbugs,create_run_jar,prepare_dist_artifacts" />
+ <target name="integration" depends="clean,junit,coverage-report,javadoc,findbugs,create_run_jar,create_installer" />
</project>
View
1 install/Nikki.bat
@@ -0,0 +1 @@
+javaw -jar Nikki_*.jar
View
2 install/Nikki.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+java -jar Nikki_*.jar
View
1 install/Uninstall.bat
@@ -0,0 +1 @@
+javaw -jar Uninstaller\uninstaller.jar
View
2 install/Uninstall.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+java -jar Uninstaller/uninstaller.jar
View
32 install/Unix_shortcutSpec.xml
@@ -0,0 +1,32 @@
+<shortcuts>
+ <skipIfNotSupported/>
+ <programGroup defaultName="Accessories"
+ location="applications"/>
+ <shortcut
+ name="Start Nikki"
+ type="Application"
+ encoding="UTF-8"
+ target="$INSTALL_PATH\Nikki.sh"
+ commandLine=""
+ workingDirectory="$INSTALL_PATH"
+ description="Start Nikki"
+ iconFile="$INSTALL_PATH\logo_32.png"
+ programGroup="yes"
+ initialState="noShow"
+ desktop="yes">
+ <createForPack name="Nikki"/>
+ </shortcut>
+ <shortcut
+ name="Uninstall Nikki"
+ type="Application"
+ encoding="UTF-8"
+ target="$INSTALL_PATH\Uninstall.sh"
+ commandLine=""
+ workingDirectory="$INSTALL_PATH"
+ description="Uninstall Nikki"
+ programGroup="yes"
+ initialState="noShow"
+ desktop="no">
+ <createForPack name="Nikki"/>
+ </shortcut>
+</shortcuts>
View
28 install/Win_shortcutSpec.xml
@@ -0,0 +1,28 @@
+<shortcuts>
+ <skipIfNotSupported/>
+ <programGroup defaultName="Nikki Photo-GPS"
+ location="applications"/>
+ <shortcut
+ name="Start Nikki"
+ target="$INSTALL_PATH\Nikki.bat"
+ commandLine=""
+ workingDirectory="$INSTALL_PATH"
+ description="Start Nikki"
+ iconFile="$INSTALL_PATH\logo_32.ico"
+ programGroup="yes"
+ initialState="noShow"
+ desktop="yes">
+ <createForPack name="Nikki"/>
+ </shortcut>
+ <shortcut
+ name="Uninstall Nikki"
+ target="$INSTALL_PATH\Uninstall.bat"
+ commandLine=""
+ workingDirectory="$INSTALL_PATH"
+ description="Uninstall Nikki"
+ programGroup="yes"
+ initialState="noShow"
+ desktop="no">
+ <createForPack name="Nikki"/>
+ </shortcut>
+</shortcuts>
View
81 install/installation.xml
@@ -0,0 +1,81 @@
+<installation version="1.0">
+<info>
+ <appname>nikki</appname>
+ <appversion>@@RELEASE_ID@@</appversion>
+ <url>http://www.brazzy.de/nikki/</url>
+ <authors>
+ <author name="Michael Borgwardt" email="brazzy@gmail.com"/>
+ </authors>
+ <uninstaller/>
+ <javaversion>1.6</javaversion>
+ <requiresjdk>no</requiresjdk>
+ <webdir>http://cloud.github.com/downloads/brazzy/nikki_libs/</webdir>
+ <writeinstallationinformation>no</writeinstallationinformation>
+ <run-privileged/>
+ <pack200/>
+</info>
+ <guiprefs width="600" height="480" resizable="no">
+ <modifier key="useHeadingPanel" value="yes"/>
+ <modifier key="useHeadingForSummary" value="yes"/>
+ <modifier key="headingImageOnLeft" value="yes"/>
+ <modifier key="headingLineCount" value="2"/>
+ <modifier key="headingFontSize" value="1.5"/>
+ <modifier key="headingBackgroundColor" value="0x00ffffff"/>
+ <modifier key="headingPanelCounter" value="text"/>
+ <modifier key="headingPanelCounterPos" value="inHeading"/>
+</guiprefs>
+<locale>
+ <langpack iso3="eng" />
+ <langpack iso3="deu"/>
+</locale>
+<resources>
+ <res id="LicencePanel.licence" src="src/Nikki-LICENSE.txt"/>
+ <res id="InfoPanel.splash" src="src/icons/logo_splash.png"/>
+ <res id="Win_shortcutSpec.xml" src="install/Win_shortcutSpec.xml"/>
+ <res id="Unix_shortcutSpec.xml" src="install/Unix_shortcutSpec.xml"/>
+</resources>
+<panels>
+ <panel classname="HelloPanel"/>
+ <panel classname="LicencePanel"/>
+ <panel classname="TargetPanel"/>
+ <panel classname="ShortcutPanel"/>
+ <panel classname="InstallPanel"/>
+ <panel classname="SimpleFinishPanel"/>
+</panels>
+<packs>
+ <pack name="Nikki" id="core" required="yes">
+ <description>Nikki application JARs</description>
+ <fileset dir="/lib" targetdir="$INSTALL_PATH/lib">
+ <include name="*.jar" />
+ </fileset>
+ <fileset dir="/build" targetdir="$INSTALL_PATH">
+ <include name="Nikki_@@RELEASE_ID@@.jar" />
+ </fileset>
+ <fileset dir="/install" targetdir="$INSTALL_PATH">
+ <os family="unix"/>
+ <include name="Nikki.sh" />
+ <include name="Uninstall.sh" />
+ <include name="logo_32.png" />
+ </fileset>
+ <fileset dir="/install" targetdir="$INSTALL_PATH">
+ <os family="mac"/>
+ <include name="Nikki.sh" />
+ <include name="Uninstall.sh" />
+ <include name="logo_32.png" />
+ </fileset>
+ <fileset dir="/install" targetdir="$INSTALL_PATH">
+ <os family="windows"/>
+ <include name="Nikki.bat" />
+ <include name="Uninstall.bat" />
+ <include name="logo_32.ico" />
+ </fileset>
+ <executable targetfile="$INSTALL_PATH/Nikki_@@RELEASE_ID@@.jar" stage="never"/>
+ </pack>
+</packs>
+<native type="izpack" name="ShellLink.dll">
+ <os family="windows" arch="x86"/>
+</native>
+<native type="izpack" name="ShellLink_x64.dll">
+ <os family="windows" arch="amd64"/>
+</native>
+</installation>
View
BIN install/logo_32.ico
Binary file not shown.
View
BIN install/logo_32.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN util/izpack_standalone-compiler.jar
Binary file not shown.

0 comments on commit 9716235

Please sign in to comment.
Something went wrong with that request. Please try again.