dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #07437
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2115: Added embedded JRE build back to DHIS Live pom.
------------------------------------------------------------
revno: 2115
committer: jason-p-pickering
branch nick: trunk
timestamp: Wed 2010-09-15 11:44:37 +0200
message:
Added embedded JRE build back to DHIS Live pom.
added:
dhis2-live-installer/src/bitrock/DHIS2_live_embedded_fr.xml
modified:
dhis-live/pom.xml
dhis2-live-installer/pom.xml
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-live/pom.xml'
--- dhis-live/pom.xml 2010-09-14 22:43:21 +0000
+++ dhis-live/pom.xml 2010-09-15 09:44:37 +0000
@@ -113,6 +113,46 @@
</splash>
</configuration>
</execution>
+ <execution>
+ <id>embedded</id>
+ <phase>package</phase>
+ <goals>
+ <goal>launch4j</goal>
+ </goals>
+ <configuration>
+ <dontWrapJar>true</dontWrapJar>
+ <headerType>gui</headerType>
+ <outfile>${project.build.directory}/dhis2-live-embedded.exe</outfile>
+ <jar>dhis2-live-jar-with-dependencies.jar</jar>
+ <errTitle>dhis2</errTitle>
+ <priority>normal</priority>
+ <downloadUrl>http://java.com/download</downloadUrl>
+ <supportUrl>http://dhis2.org</supportUrl>
+ <customProcName>false</customProcName>
+ <initialHeapSize>512MB</initialHeapSize>
+ <maxHeapSize>1024MB</maxHeapSize>
+ <stayAlive>false</stayAlive>
+ <manifest></manifest>
+ <icon>${basedir}/util/launch4j/favicon.ico</icon>
+ <singleInstance>
+ <mutexName>dhis-live.mutex</mutexName>
+ <windowTitle></windowTitle>
+ </singleInstance>
+ <jre>
+ <path>jre6</path>
+ <minVersion>1.6.0_14</minVersion>
+ <opts>
+ <opt>-XX:MaxPermSize=256M</opt>
+ </opts>
+ </jre>
+ <splash>
+ <file>${basedir}/util/launch4j/dhis2-splash.bmp</file>
+ <waitForWindow>false</waitForWindow>
+ <timeout>12</timeout>
+ <timeoutErr>false</timeoutErr>
+ </splash>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
=== modified file 'dhis2-live-installer/pom.xml'
--- dhis2-live-installer/pom.xml 2010-08-20 09:13:09 +0000
+++ dhis2-live-installer/pom.xml 2010-09-15 09:44:37 +0000
@@ -44,6 +44,21 @@
<goal>exec</goal>
</goals>
</execution>
+ <execution>
+ <id>DHIS2 Windows Embedded JRE French Version</id>
+ <phase>package</phase>
+ <configuration>
+ <executable>${env.BITROCK_HOME}/bin/builder</executable>
+ <arguments>
+ <argument>build</argument>
+ <argument>${basedir}/src/bitrock/DHIS2_live_embedded_fr.xml</argument>
+ <argument>windows</argument>
+ </arguments>
+ </configuration>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
<execution>
<id>DHIS2 Linux Demo</id>
<phase>package</phase>
=== added file 'dhis2-live-installer/src/bitrock/DHIS2_live_embedded_fr.xml'
--- dhis2-live-installer/src/bitrock/DHIS2_live_embedded_fr.xml 1970-01-01 00:00:00 +0000
+++ dhis2-live-installer/src/bitrock/DHIS2_live_embedded_fr.xml 2010-09-15 09:44:37 +0000
@@ -0,0 +1,274 @@
+<project>
+ <shortName>DHIS2</shortName>
+ <fullName>DHIS2</fullName>
+ <version>2.0.4</version>
+ <installerFilename>${product_shortname}-${product_version}-${platform_name}-lite-JRE.${platform_exec_suffix}</installerFilename>
+ <readmeFile>../../resources/files/Readme.txt</readmeFile>
+ <licenseFile>../../resources/files/Licence.txt</licenseFile>
+ <leftImage>../../resources/images/dhis2-logo-rotated.png</leftImage>
+ <logoImage>../../resources/images/dhis2-logo.png</logoImage>
+ <splashImage>../../resources/images/dhis2-logo.png</splashImage>
+ <preBuildActionList>
+ <copyFile>
+ <destination>${build_project_directory}/temp/</destination>
+ <origin>${env(DHIS2_SRC)}/dhis-2/dhis-web/dhis-web-portal/target/dhis.war</origin>
+ </copyFile>
+ <copyFile>
+ <destination>${build_project_directory}/temp/dhis2-live.jar</destination>
+ <origin>${env(DHIS2_SRC)}/dhis-live/target/dhis2-live-jar-with-dependencies.jar</origin>
+ </copyFile>
+ <copyFile>
+ <destination>${build_project_directory}/temp/dhis2-live.exe</destination>
+ <origin>${env(DHIS2_SRC)}/dhis-live/target/dhis2-live-embedded.exe</origin>
+ </copyFile>
+ <copyFile>
+ <destination>${build_project_directory}/temp/</destination>
+ <origin>${env(DHIS2_DOCS)}/target/site/en/pdf/dhis2_user_manual_en.pdf</origin>
+ </copyFile>
+ </preBuildActionList>
+ <readyToInstallActionList>
+ <createDirectory>
+ <path>${installdir}/database</path>
+ <progressText>Creating database directory.</progressText>
+ </createDirectory>
+ <createDirectory>
+ <path>${installdir}/log</path>
+ </createDirectory>
+ <createDirectory>
+ <path>${installdir}/webapps</path>
+ </createDirectory>
+ </readyToInstallActionList>
+ <postInstallationActionList>
+ <addEnvironmentVariable>
+ <abortOnError>0</abortOnError>
+ <customErrorMessage>The enviornmenr varaible could not be set.</customErrorMessage>
+ <name>DHIS2_BROWSER</name>
+ <scope>user</scope>
+ <value>${installdir}\FirefoxPortable\FirefoxPortable.exe</value>
+ </addEnvironmentVariable>
+ </postInstallationActionList>
+ <allowComponentSelection>1</allowComponentSelection>
+ <compressionAlgorithm>lzma</compressionAlgorithm>
+ <enableRollback>1</enableRollback>
+ <enableTimestamp>1</enableTimestamp>
+ <requestedExecutionLevel>highestAvailable</requestedExecutionLevel>
+ <saveRelativePaths>1</saveRelativePaths>
+ <vendor>DHIS2</vendor>
+ <componentList>
+ <component>
+ <name>dhis2live</name>
+ <description>DHIS2 Live</description>
+ <canBeEdited>0</canBeEdited>
+ <selected>1</selected>
+ <show>1</show>
+ <folderList>
+ <folder>
+ <description>Program Files</description>
+ <destination>${installdir}</destination>
+ <name>programfiles</name>
+ <platforms>all</platforms>
+ <distributionFileList>
+ <distributionDirectory>
+ <origin>../../resources/conf</origin>
+ </distributionDirectory>
+ <distributionFile>
+ <origin>temp/dhis2-live.jar</origin>
+ </distributionFile>
+ </distributionFileList>
+ <shortcutList>
+ <shortcut>
+ <comment>Uninstall</comment>
+ <exec>${installdir}/${uninstallerName}</exec>
+ <icon></icon>
+ <name>Uninstall ${product_fullname}</name>
+ <path>${installdir}</path>
+ <platforms>all</platforms>
+ <runInTerminal>0</runInTerminal>
+ <windowsExec>${installdir}/${uninstallerName}.exe</windowsExec>
+ <windowsExecArgs></windowsExecArgs>
+ <windowsIcon></windowsIcon>
+ <windowsPath>${installdir}</windowsPath>
+ </shortcut>
+ </shortcutList>
+ </folder>
+ <folder>
+ <description>Program Files</description>
+ <destination>${installdir}</destination>
+ <name>programfileslinux</name>
+ <platforms>linux</platforms>
+ <distributionFileList>
+ <distributionFile>
+ <origin>../../resources/scripts/linux/startup.sh</origin>
+ </distributionFile>
+ </distributionFileList>
+ </folder>
+ <folder>
+ <description>Program Files</description>
+ <destination>${installdir}</destination>
+ <name>programfileswindows</name>
+ <platforms>windows</platforms>
+ <distributionFileList>
+ <distributionFile>
+ <origin>temp/dhis2-live.exe</origin>
+ </distributionFile>
+ </distributionFileList>
+ </folder>
+ <folder>
+ <description>Program Files</description>
+ <destination>${installdir}</destination>
+ <name>programfilesosx</name>
+ <platforms>osx</platforms>
+ </folder>
+ </folderList>
+ <startMenuShortcutList>
+ <startMenuShortcut>
+ <comment>Uninstall ${product_fullname}</comment>
+ <name>Uninstall ${product_fullname}</name>
+ <runInTerminal>0</runInTerminal>
+ <windowsExec>${installdir}/${uninstallerName}.exe</windowsExec>
+ <windowsExecArgs></windowsExecArgs>
+ <windowsIcon></windowsIcon>
+ <windowsPath>${installdir}/</windowsPath>
+ </startMenuShortcut>
+ <startMenuShortcut>
+ <comment>Start DHIS2</comment>
+ <name>Start DHIS2</name>
+ <runInTerminal>0</runInTerminal>
+ <windowsExec>${installdir}/dhis2-live.exe</windowsExec>
+ <windowsExecArgs></windowsExecArgs>
+ <windowsIcon></windowsIcon>
+ <windowsPath></windowsPath>
+ </startMenuShortcut>
+ <startMenuFileShortcut>
+ <comment>DHIS2 Docs</comment>
+ <filePath>${installdir}/docs/dhis2_user_manual_en.pdf</filePath>
+ <name>DHIS2 Documentation</name>
+ <runInTerminal>0</runInTerminal>
+ <windowsIcon></windowsIcon>
+ </startMenuFileShortcut>
+ </startMenuShortcutList>
+ </component>
+ <component>
+ <name>dhis2core</name>
+ <description>DHIS2 Core</description>
+ <canBeEdited>0</canBeEdited>
+ <selected>1</selected>
+ <show>1</show>
+ <folderList>
+ <folder>
+ <description>dhiscore</description>
+ <destination>${installdir}/webapps/dhis</destination>
+ <name>dhiscore</name>
+ <platforms>all</platforms>
+ <distributionFileList>
+ <distributionFile>
+ <origin>temp/dhis.war</origin>
+ </distributionFile>
+ </distributionFileList>
+ </folder>
+ </folderList>
+ <postInstallationActionList>
+ <unzip>
+ <destinationDirectory>${installdir}/webapps/dhis/</destinationDirectory>
+ <explanation>Unzipping DHIS2 core.</explanation>
+ <progressText>Unzipping DHIS2 core.</progressText>
+ <zipFile>${installdir}/webapps/dhis/dhis.war</zipFile>
+ </unzip>
+ <deleteFile>
+ <explanation>Cleaning up DHIS2 war file.</explanation>
+ <path>${installdir}/webapps/dhis/dhis.war</path>
+ <progressText>Cleaning up DHIS2 war file</progressText>
+ </deleteFile>
+ </postInstallationActionList>
+ </component>
+ <component>
+ <name>dhis2docs</name>
+ <description>DHIS2 Docs</description>
+ <canBeEdited>1</canBeEdited>
+ <selected>1</selected>
+ <show>1</show>
+ <folderList>
+ <folder>
+ <description>docs</description>
+ <destination>${installdir}/docs</destination>
+ <name>docs</name>
+ <platforms>all</platforms>
+ <distributionFileList>
+ <distributionFile>
+ <origin>temp/dhis2_user_manual_en.pdf</origin>
+ </distributionFile>
+ </distributionFileList>
+ </folder>
+ </folderList>
+ </component>
+ <component>
+ <name>jre</name>
+ <description>JRE</description>
+ <canBeEdited>0</canBeEdited>
+ <detailedDescription>Embedded JRE</detailedDescription>
+ <selected>1</selected>
+ <show>0</show>
+ <folderList>
+ <folder>
+ <description>jre</description>
+ <destination>${installdir}/</destination>
+ <name>jre</name>
+ <platforms>windows</platforms>
+ <distributionFileList>
+ <distributionDirectory>
+ <origin>../../resources/jre/jre6</origin>
+ </distributionDirectory>
+ </distributionFileList>
+ </folder>
+ </folderList>
+ </component>
+ <component>
+ <name>FirefoxPortable</name>
+ <description>FirefoxPortable</description>
+ <canBeEdited>1</canBeEdited>
+ <selected>1</selected>
+ <show>0</show>
+ <folderList>
+ <folder>
+ <description>FirefoxPortable</description>
+ <destination>${installdir}/</destination>
+ <name>FirefoxPortable</name>
+ <platforms>windows</platforms>
+ <distributionFileList>
+ <distributionDirectory>
+ <origin>../../resources/browser/FirefoxPortable</origin>
+ </distributionDirectory>
+ </distributionFileList>
+ </folder>
+ </folderList>
+ </component>
+ </componentList>
+ <finalPageActionList>
+ <runProgram>
+ <program>${installdir}\dhis2-live.exe</program>
+ <programArguments></programArguments>
+ <progressText>Do you want to launch ${product_fullname} now?</progressText>
+ </runProgram>
+ </finalPageActionList>
+ <parameterList>
+ <directoryParameter>
+ <name>installdir</name>
+ <description>Installer.Parameter.installdir.description</description>
+ <explanation>Installer.Parameter.installdir.explanation</explanation>
+ <value></value>
+ <default>${platform_install_prefix}/${product_shortname}-${product_version}</default>
+ <allowEmptyValue>0</allowEmptyValue>
+ <ask>yes</ask>
+ <cliOptionName>prefix</cliOptionName>
+ <mustBeWritable>yes</mustBeWritable>
+ <mustExist>0</mustExist>
+ <width>40</width>
+ </directoryParameter>
+ </parameterList>
+ <platformOptionsList>
+ <platformOptions>
+ <platform>windows</platform>
+ </platformOptions>
+ </platformOptionsList>
+</project>
+
