|
From: <man...@us...> - 2010-08-07 00:45:05
|
Revision: 5766
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5766&view=rev
Author: manningr
Date: 2010-08-07 00:44:59 +0000 (Sat, 07 Aug 2010)
Log Message:
-----------
Filter the absolute path to the build dir into the auto-install.xml so that squirrel-sql.sh has absolute path for SQUIRREL_HOME.
Modified Paths:
--------------
trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml
trunk/sql12/installer/squirrelsql-macosx-installer/src/test/resources/auto-install.xml
trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/auto-install.xml
Modified: trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2010-08-07 00:44:39 UTC (rev 5765)
+++ trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2010-08-07 00:44:59 UTC (rev 5766)
@@ -353,6 +353,12 @@
<filtering>true</filtering>
</resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
<plugins>
<!-- prepare dependencies so that izpack jar tag to pickup at compile time -->
@@ -480,8 +486,8 @@
<executable>java</executable>
<arguments>
<argument>-jar</argument>
- <argument>target/squirrelsql-macosx-installer-${project.version}-standard.jar</argument>
- <argument>src/test/resources/auto-install.xml</argument>
+ <argument>${project.build.directory}/squirrelsql-macosx-installer-${project.version}-standard.jar</argument>
+ <argument>${project.build.directory}/test-classes/auto-install.xml</argument>
</arguments>
</configuration>
<executions>
Modified: trunk/sql12/installer/squirrelsql-macosx-installer/src/test/resources/auto-install.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-macosx-installer/src/test/resources/auto-install.xml 2010-08-07 00:44:39 UTC (rev 5765)
+++ trunk/sql12/installer/squirrelsql-macosx-installer/src/test/resources/auto-install.xml 2010-08-07 00:44:59 UTC (rev 5766)
@@ -3,7 +3,7 @@
<com.izforge.izpack.panels.HelloPanel id="UNKNOWN (com.izforge.izpack.panels.HelloPanel)"/>
<com.izforge.izpack.panels.HTMLInfoPanel id="UNKNOWN (com.izforge.izpack.panels.HTMLInfoPanel)"/>
<com.izforge.izpack.panels.TargetPanel id="UNKNOWN (com.izforge.izpack.panels.TargetPanel)">
-<installpath>target/squirrel-install-from-maven</installpath>
+<installpath>${project.build.directory}/squirrel-install-from-maven</installpath>
</com.izforge.izpack.panels.TargetPanel>
<com.izforge.izpack.panels.PacksPanel id="UNKNOWN (com.izforge.izpack.panels.PacksPanel)">
<pack index="0" name="Base" selected="true"/>
Modified: trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/auto-install.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/auto-install.xml 2010-08-07 00:44:39 UTC (rev 5765)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/auto-install.xml 2010-08-07 00:44:59 UTC (rev 5766)
@@ -3,7 +3,7 @@
<com.izforge.izpack.panels.HelloPanel id="UNKNOWN (com.izforge.izpack.panels.HelloPanel)"/>
<com.izforge.izpack.panels.HTMLInfoPanel id="UNKNOWN (com.izforge.izpack.panels.HTMLInfoPanel)"/>
<com.izforge.izpack.panels.TargetPanel id="UNKNOWN (com.izforge.izpack.panels.TargetPanel)">
-<installpath>target/squirrel-install-from-maven</installpath>
+<installpath>${project.build.directory}/squirrel-install-from-maven</installpath>
</com.izforge.izpack.panels.TargetPanel>
<com.izforge.izpack.panels.PacksPanel id="UNKNOWN (com.izforge.izpack.panels.PacksPanel)">
<pack index="0" name="Base" selected="true"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
