dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2337
committer: jason-p-pickering
branch nick: dhis2
timestamp: Fri 2010-10-08 10:18:53 +0200
message:
  Altered DHIS Live mutex definition on its pom.
modified:
  dhis-live/pom.xml
  dhis2-live-installer/pom.xml
  dhis2-live-installer/src/bitrock/DHIS2_live_embedded_en.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-27 07:14:56 +0000
+++ dhis-live/pom.xml	2010-10-08 08:18:53 +0000
@@ -96,10 +96,10 @@
                             <stayAlive>false</stayAlive>
                             <manifest></manifest>
                             <icon>${basedir}/util/launch4j/favicon.ico</icon>
-                            <singleInstance>
-                                <mutexName>dhis-live.mutex</mutexName>
-                                <windowTitle></windowTitle>
-                            </singleInstance>
+                            <singleInstance
+                                mutexName="dhis-live"
+                                windowTitle="DHIS2"
+                            />
                             <jre>
                                 <minVersion>1.6.0_14</minVersion>
                                 <opts>
@@ -135,10 +135,10 @@
                             <stayAlive>false</stayAlive>
                             <manifest></manifest>
                             <icon>${basedir}/util/launch4j/favicon.ico</icon>
-                            <singleInstance>
-                                <mutexName>dhis-live.mutex</mutexName>
-                                <windowTitle></windowTitle>
-                            </singleInstance>
+                            <singleInstance
+                                mutexName="dhis-live"
+                                windowTitle="DHIS2"
+                            />
                             <jre>
 								<path>jre6</path>
                                 <minVersion>1.6.0_14</minVersion>

=== modified file 'dhis2-live-installer/pom.xml'
--- dhis2-live-installer/pom.xml	2010-09-19 07:11:28 +0000
+++ dhis2-live-installer/pom.xml	2010-10-08 08:18:53 +0000
@@ -16,7 +16,7 @@
         <artifactId>exec-maven-plugin</artifactId>
         <version>1.1</version>
         <executions>
--          <execution>
+<!--          <execution>
 	     <id>DHIS2 Windows Live</id>
              <phase>package</phase>
                <configuration>
@@ -30,7 +30,7 @@
              <goals>
               <goal>exec</goal>
             </goals>
-          </execution> 
+          </execution> -->
           <execution>
              <id>DHIS2 Windows Embedded JRE</id>
              <phase>package</phase>
@@ -60,7 +60,7 @@
              <goals>
               <goal>exec</goal>
             </goals>
-          </execution> --> 
+          </execution> 
           <execution>
              <id>DHIS2 Linux Demo</id>
              <phase>package</phase>
@@ -75,7 +75,7 @@
              <goals>
               <goal>exec</goal>
             </goals>
-          </execution>
+          </execution> -->
         </executions>
       </plugin>
     </plugins>

=== modified file 'dhis2-live-installer/src/bitrock/DHIS2_live_embedded_en.xml'
--- dhis2-live-installer/src/bitrock/DHIS2_live_embedded_en.xml	2010-09-19 07:07:39 +0000
+++ dhis2-live-installer/src/bitrock/DHIS2_live_embedded_en.xml	2010-10-08 08:18:53 +0000
@@ -26,6 +26,14 @@
             <destination>${build_project_directory}/temp/</destination>
             <origin>${env(DHIS2_DOCS)}/target/site/en/pdf/dhis2_user_manual_en.pdf</origin>
         </copyFile>
+        <propertiesFileGet>
+            <abortOnError>0</abortOnError>
+            <file>/home/jason/dhis2/dhis2/dhis2-live-installer/resources/installer.properites</file>
+            <key>includedemodb</key>
+            <show>0</show>
+            <showMessageOnError>0</showMessageOnError>
+            <variable>includedemodb</variable>
+        </propertiesFileGet>
     </preBuildActionList>
     <readyToInstallActionList>
         <createDirectory>
@@ -242,6 +250,11 @@
                     </distributionFileList>
                 </folder>
             </folderList>
+            <shouldPackRuleList>
+                <fileExists>
+                    <path>../../resources/browser/FirefoxPortable/FirefoxPortable.exe</path>
+                </fileExists>
+            </shouldPackRuleList>
         </component>
         <component>
             <name>demodb</name>
@@ -267,6 +280,11 @@
                 <fileExists>
                     <path>../../resources/demodb/demo.h2.db</path>
                 </fileExists>
+                <compareText>
+                    <logic>equals</logic>
+                    <text>${includedemodb}</text>
+                    <value>1</value>
+                </compareText>
             </shouldPackRuleList>
         </component>
     </componentList>