|
From: <man...@us...> - 2010-04-24 16:38:40
|
Revision: 5587
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5587&view=rev
Author: manningr
Date: 2010-04-24 16:38:34 +0000 (Sat, 24 Apr 2010)
Log Message:
-----------
2981691 (Installer does not make sure a JRE is available (Windows 7)): We now prefer the JRE that was used to launcher the IzPack installer, and if that is not available, we choose whatever javaw happens to be in the PATH. Using JAVA_HOME is now difficult since the installer wants to replace %JAVA_HOME with it's JRE path; and so referencing %JAVA_HOME% in the script is bad because it get's partially replaced during the installation filtering. That isn't a terrible loss given that in some cases people have complained about this being set (for whatever reason) to an older or incompatible version of Java.
Modified Paths:
--------------
trunk/sql12/build/snapshot/izpack-super.xml.template
Modified: trunk/sql12/build/snapshot/izpack-super.xml.template
===================================================================
--- trunk/sql12/build/snapshot/izpack-super.xml.template 2010-04-24 15:40:38 UTC (rev 5586)
+++ trunk/sql12/build/snapshot/izpack-super.xml.template 2010-04-24 16:38:34 UTC (rev 5587)
@@ -120,11 +120,8 @@
<exclude
name="squirrel-sql_*.jar" />
</fileset>
- <parsable
- targetfile="$INSTALL_PATH/squirrel-sql.bat" />
- <parsable
- targetfile="$INSTALL_PATH/squirrel-sql.sh"
- type="shell" />
+ <parsable targetfile="$INSTALL_PATH/squirrel-sql.bat" type="shell" />
+ <parsable targetfile="$INSTALL_PATH/squirrel-sql.sh" type="shell" />
<!-- Make Unix script executable. -->
<executable
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
