[snofyre] r1809 committed - Commit with changes for creating a FAT installer. Please do a diff for...

0 views

Skip to first unread message

sno...@googlecode.com

unread,

Feb 7, 2011, 2:24:27 AM2/7/11

to snofy...@googlegroups.com

Revision: 1809
Author: jay.kola
Date: Sun Feb 6 23:24:06 2011
Log: Commit with changes for creating a FAT installer. Please do a diff for
changed files with previous commit which creates the online installer
http://code.google.com/p/snofyre/source/detail?r=1809

Modified:
/tags/srth-osgi/srth-osgi-1.8/distribution/pom.xml
/tags/srth-osgi/srth-osgi-1.8/distribution/src/izpack/install.xml
/tags/srth-osgi/srth-osgi-1.8/distribution/src/izpack/processPanelSpec.xml
/tags/srth-osgi/srth-osgi-1.8/distribution/src/izpack/userInputSpec.xml

=======================================
--- /tags/srth-osgi/srth-osgi-1.8/distribution/pom.xml Wed Feb 2 23:53:21
2011
+++ /tags/srth-osgi/srth-osgi-1.8/distribution/pom.xml Sun Feb 6 23:24:06
2011
@@ -36,6 +36,12 @@
<api.code.site>http://code.google.com/p/snofyre/</api.code.site>

<api.contact.email>snofyr...@googlegroups.com</api.contact.email>

<installation.guide.location>https://snofyre.googlecode.com/svn/docs/installationmanual/index.html</installation.guide.location>
+ <snomed.data.file.name>snomed-data.zip</snomed.data.file.name>
+ <snomed.index.file.name>index.zip</snomed.index.file.name>
+ <snofyre.data.file.name>snofyre-data.zip</snofyre.data.file.name>
+ <snofyre.javadoc.file.name>apidocs.zip</snofyre.javadoc.file.name>
+ <snomed.mrcm.file.name>mrcm.zip</snomed.mrcm.file.name>
+ <snofyre.osx.app.zip>snofyre.osx.app.zip</snofyre.osx.app.zip>
</properties>

<modelVersion>4.0.0</modelVersion>
=======================================
--- /tags/srth-osgi/srth-osgi-1.8/distribution/src/izpack/install.xml Wed
Feb 2 23:53:21 2011
+++ /tags/srth-osgi/srth-osgi-1.8/distribution/src/izpack/install.xml Sun
Feb 6 23:24:06 2011
@@ -74,17 +74,14 @@
<name>install.type.selection</name>
<value>lite</value>
</condition>
- <condition type="java" id="installonwindows">
- <java>
- <class>com.izforge.izpack.util.OsVersion</class>
- <field>IS_WINDOWS</field>
- </java>
- <returnvalue type="boolean">true</returnvalue>
- </condition>
<condition type="or" id="need.trud.access">
<condition type="ref" refid="fullinstallation"/>
<condition type="ref" refid="custominstallation" />
</condition>
+ <condition type="or" id="need.snofyre.data">
+ <condition type="ref" refid="fullinstallation"/>
+ <condition type="ref" refid="custominstallation" />
+ </condition>
</conditions>

+ 
+ 
<panel classname="TargetPanel" />
<panel classname="PacksPanel" />
<panel classname="SummaryPanel" />
@@ -175,45 +172,61 @@
<file src="${packs.folder}/${tech.arch.man.name}"
targetdir="$INSTALL_PATH/docs" />
<file src="${packs.folder}/${user.man.name}"
targetdir="$INSTALL_PATH/docs" />
</pack>
+ <pack name="SNOMED CT MySQL Data" required="no"
condition="fullinstallation">
+ <description>The MySQL data containing SNOMED CT</description>
+ <file src="${packs.folder}/${snomed.data.file.name}"
targetdir="$INSTALL_PATH/data-import/" unpack="true" />
+ </pack>
+ <pack name="${application.name} Test Data" required="no"
condition="need.snofyre.data">
+ <description>Test data for ${application.name} </description>
+ <file src="${packs.folder}/${snofyre.data.file.name}"
targetdir="$INSTALL_PATH/data-import/" unpack="true" />
+ </pack>
+ <pack name="MRCM Data" required="yes">
+ <description>The Machine Readable Concept Model</description>
+ <file src="${packs.folder}/${snomed.mrcm.file.name}"
targetdir="$INSTALL_PATH/${executable.name}/data/DB/" unpack="true"/>
+ </pack>
+ <pack name="Index files" required="yes">
+ <description>The index files used for search</description>
+ <file src="${packs.folder}/${snomed.index.file.name}"
targetdir="$INSTALL_PATH/${executable.name}" unpack="true"/>
+ </pack>
<pack name="${application.name}-${project.version}" required="yes">
- <loose>true</loose>
<description>The application</description>
<file src="${executable.name}.zip" targetdir="$INSTALL_PATH/"
unpack="true"/>
</pack>
- <pack name="Snofyre FTP scripts" required="yes">
- <description>Post-installation scripts that download Snofyre
Data from TRUD</description>
- <file src="bin/ftp-get.sh" targetdir="$INSTALL_PATH" os="mac"/>
- <file src="bin/ftp-get.sh" targetdir="$INSTALL_PATH"
os="unix"/>
- <file src="bin/ftp-get.bat" targetdir="$INSTALL_PATH"
os="windows"/>
- <file src="bin/extract-pack.sh"
targetdir="$INSTALL_PATH/configurator" os="mac"/>
- <file src="bin/extract-pack.sh"
targetdir="$INSTALL_PATH/configurator" os="unix"/>
- <file src="bin/extract-pack.bat"
targetdir="$INSTALL_PATH/configurator" os="windows"/>
- <file src="bin/ftp_info.txt" targetdir="$INSTALL_PATH"
os="windows"/>
- <file src="bin/packextract.properties"
targetdir="$INSTALL_PATH/configurator"/>
-
- <parsable type="shell"
targetfile="$INSTALL_PATH/configurator/extract-pack.sh" os="mac"
encoding="utf-8"/>
- <parsable type="shell"
targetfile="$INSTALL_PATH/configurator/extract-pack.sh" os="unix"
encoding="utf-8"/>
- <parsable type="plain"
targetfile="$INSTALL_PATH/configurator/extract-pack.bat" os="windows"
encoding="utf-8"/>
- <parsable type="shell" targetfile="$INSTALL_PATH/ftp-get.sh"
os="mac" encoding="utf-8"/>
- <parsable type="shell" targetfile="$INSTALL_PATH/ftp-get.sh"
os="unix" encoding="utf-8"/>
- <parsable type="plain" targetfile="$INSTALL_PATH/ftp-get.bat"
os="windows" encoding="utf-8"/>
- <parsable type="plain" targetfile="$INSTALL_PATH/ftp_info.txt"
os="windows" encoding="utf-8"/>
- <parsable type="javaprop"
targetfile="$INSTALL_PATH/configurator/packextract.properties"
encoding="utf-8"/>
-
- <executable
targetfile="$INSTALL_PATH/configurator/extract-pack.sh" stage="never"
keep="true" os="mac"/>
- <executable
targetfile="$INSTALL_PATH/configurator/extract-pack.sh" stage="never"
keep="true" os="unix"/>
- <executable
targetfile="$INSTALL_PATH/configurator/extract-pack.bat" stage="never"
keep="true" os="windows"/>
- <executable targetfile="$INSTALL_PATH/ftp-get.sh"
stage="never" keep="false" os="mac"/>
- <executable targetfile="$INSTALL_PATH/ftp-get.sh"
stage="never" keep="false" os="unix"/>
- <executable targetfile="$INSTALL_PATH/ftp-get.bat"
stage="never" keep="false" os="windows"/>
- <executable targetfile="$INSTALL_PATH/ftp_info.txt"
stage="never" keep="false" os="windows"/>
- </pack>
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
<pack name="Application Launch scripts" required="yes">
<description>Application Launch and other scripts</description>
<file src="bin/run.sh" targetdir="$INSTALL_PATH/bin" os="mac"/>
<file src="bin/run.sh" targetdir="$INSTALL_PATH/bin"
os="unix"/>
<file src="bin/run.bat" targetdir="$INSTALL_PATH/bin"
os="windows"/>
<file src="${application.name}.exe"
targetdir="$INSTALL_PATH/bin" os="windows"/>
+ <file src="${packs.folder}/${snofyre.osx.app.zip}"
targetdir="$INSTALL_PATH/bin" os="mac" unpack="true"/>
<file src="dependencies.html"
targetdir="$INSTALL_PATH/bin/settings" override="true"/>

<file src="temp/${app.configurator.name}.jar"
targetdir="$INSTALL_PATH/configurator"/>
<file
src="temp/${app.configurator.name}.dir/${app.configurator.name}/lib/commons-dbcp.jar"
=======================================
---
/tags/srth-osgi/srth-osgi-1.8/distribution/src/izpack/processPanelSpec.xml
Wed Feb 2 23:53:21 2011
+++
/tags/srth-osgi/srth-osgi-1.8/distribution/src/izpack/processPanelSpec.xml
Sun Feb 6 23:24:06 2011
@@ -19,22 +19,22 @@

- <job name="Download TRUD Data">
- <os family="windows" />
- <executefile name="$INSTALL_PATH/ftp-get.bat">
- </executefile>
- </job>
- <job name="Download TRUD Data">
- <os family="mac" />
- <executefile name="$INSTALL_PATH/ftp-get.sh">
- </executefile>
- </job>
- <job name="Download TRUD Data">
- <os family="unix" />
- <executefile name="$INSTALL_PATH/ftp-get.sh">
- 
- </executefile>
- </job>
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+

+ 
+ 



@@ -49,18 +49,18 @@

- <job name="Downloading IHTSDO Licensed Data">
- <executeclass
name="uk.nhs.cfh.dsp.srth.distribution.ProcessExecutor">
- <arg>${trud.pack.path}</arg>
- <arg>${trud.pack.name}</arg>
- <arg>$trud.user.name</arg>
- <arg>$trud.password</arg>
- <arg>${packs.folder}</arg>
- <arg>$install.type.selection</arg>
- <arg>$INSTALL_PATH</arg>
- <arg>${trud.url}</arg>
- </executeclass>
- </job>
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+

<job name="Opening Installation Manual">
<executeclass
name="uk.nhs.cfh.dsp.srth.distribution.DocumentationLauncher">
=======================================
--- /tags/srth-osgi/srth-osgi-1.8/distribution/src/izpack/userInputSpec.xml
Wed Feb 2 23:53:21 2011
+++ /tags/srth-osgi/srth-osgi-1.8/distribution/src/izpack/userInputSpec.xml
Sun Feb 6 23:24:06 2011
@@ -35,34 +35,34 @@
<field type="staticText" align="left" txt="Please note that you
need to have a TRUD account and must be registered for the NHSSNOFYRE
packs."/>
</panel>

- <panel order="1" id="trud.connection.parameters" border="false">
- <field type="staticText" align="left"
- text="You selected $install.type.selection installation.
Please provide your TRUD FTP access credentials. The installer will
automatically download relevant data for you from TRUD. This is NOT your
email address."/>
- <field type="space"/>
- <field type="title" txt="Specify credentials for accessing TRUD"
bold="true" size="1" />
- <field type="divider" align="top"/>
- <field type="staticText" align="left" txt="Please note that you
need to have an TRUD account and must have registered for the NHSSNOFYRE
packs."/>
- <field type="space"/>
-
- 
- <field type="text" align="left" variable="trud.user.name">
- <spec txt="Enter User Name:" size="25" set=""/>
- <validator class="com.izforge.izpack.util.NotEmptyValidator"
- txt="User name is mandatory!" />
- </field>
- <field type="space"/>
- 
- <field type="password" align="left" variable="trud.password">
- <spec>
- <pwd txt="Enter Password :" size="25" set=""/>
- </spec>
- <validator class="com.izforge.izpack.util.NotEmptyValidator"
- txt="Password can not be empty."/>
- </field>
- <field type="divider" align="bottom"/>
- </panel>
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 

- <panel order="2" id="verify.configuration" layout="left"
border="false" column_width="40">
+ <panel order="1" id="verify.configuration" layout="left"
border="false" column_width="40">
<field type="title" txt="Verify Configuration for accessing MySQL
server" bold="true" size="1" />
<field type="staticText" align="left"
txt="Please follow all the steps described in the
${application.name} Installation Manual that the installer automatically
opened for you. The installation manual describes how to import
${application.name} and SNOMED CT data into the local installation of MySQL
server."/>
@@ -102,7 +102,7 @@
txt="Please move to the next screen only if you have
configured the above settings properly!"/>
</panel>

- <panel order="3" id="jdbc.connection.parameters" border="false">
+ <panel order="2" id="jdbc.connection.parameters" border="false">
<field type="staticText" align="left"
txt="You must have followed all the previous steps and
imported ${application.name} and SNOMED CT data imto the local installation
of MySQL server. In this step, please enter the password that you've
specified for the ${application.name}'s MySQL server account."/>
<field type="space"/>

Reply all

Reply to author

Forward

0 new messages