|
From: <man...@us...> - 2010-08-10 23:56:30
|
Revision: 5785
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5785&view=rev
Author: manningr
Date: 2010-08-10 23:56:24 +0000 (Tue, 10 Aug 2010)
Log Message:
-----------
new test resources which are also used to build the plain zip distribution files generated from the installer.
Added Paths:
-----------
trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/base-auto-install.xml
trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/build-plainzips.sh
trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/optional-auto-install.xml
trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/squirrel-sql.sh
trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/standard-auto-install.xml
Added: trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/base-auto-install.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/base-auto-install.xml (rev 0)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/base-auto-install.xml 2010-08-10 23:56:24 UTC (rev 5785)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<AutomatedInstallation langpack="eng">
+<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>${project.build.directory}/squirrel-sql-${squirrelsql.version}-base</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"/>
+<pack index="0" name="Standard" selected="false"/>
+</com.izforge.izpack.panels.PacksPanel>
+<com.izforge.izpack.panels.InstallPanel id="UNKNOWN (com.izforge.izpack.panels.InstallPanel)"/>
+<com.izforge.izpack.panels.ShortcutPanel id="UNKNOWN (com.izforge.izpack.panels.ShortcutPanel)"/>
+<com.izforge.izpack.panels.FinishPanel id="UNKNOWN (com.izforge.izpack.panels.FinishPanel)"/>
+</AutomatedInstallation>
Added: trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/build-plainzips.sh
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/build-plainzips.sh (rev 0)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/build-plainzips.sh 2010-08-10 23:56:24 UTC (rev 5785)
@@ -0,0 +1,18 @@
+#! /bin/bash
+
+
+cp ${project.build.directory}/test-classes/squirrel-sql.sh ${project.build.directory}/squirrel-sql-${squirrelsql.version}-base/squirrel-sql.sh
+cp ${project.build.directory}/test-classes/squirrel-sql.sh ${project.build.directory}/squirrel-sql-${squirrelsql.version}-standard/squirrel-sql.sh
+cp ${project.build.directory}/test-classes/squirrel-sql.sh ${project.build.directory}/squirrel-sql-${squirrelsql.version}-optional/squirrel-sql.sh
+
+
+cd ${project.build.directory}
+
+tar -cvf squirrel-sql-${squirrelsql.version}-base.tar squirrel-sql-${squirrelsql.version}-base
+gzip squirrel-sql-${squirrelsql.version}-base.tar
+
+tar -cvf squirrel-sql-${squirrelsql.version}-standard.tar squirrel-sql-${squirrelsql.version}-standard
+gzip squirrel-sql-${squirrelsql.version}-standard.tar
+
+tar -cvf squirrel-sql-${squirrelsql.version}-optional.tar squirrel-sql-${squirrelsql.version}-optional
+gzip squirrel-sql-${squirrelsql.version}-optional.tar
Property changes on: trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/build-plainzips.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/optional-auto-install.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/optional-auto-install.xml (rev 0)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/optional-auto-install.xml 2010-08-10 23:56:24 UTC (rev 5785)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<AutomatedInstallation langpack="eng">
+<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>${project.build.directory}/squirrel-sql-${squirrelsql.version}-optional</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"/>
+<pack index="1" name="Standard" selected="true"/>
+<pack index="2" name="Optional Plugin - Data import" selected="true"/>
+<pack index="3" name="Optional Plugin - DBCopy" selected="true"/>
+<pack index="4" name="Optional Plugin - DBDiff" selected="true"/>
+<pack index="5" name="Optional Plugin - DB2" selected="true"/>
+<pack index="6" name="Optional Plugin - Derby" selected="true"/>
+<pack index="7" name="Optional Plugin - Firebird " selected="true"/>
+<pack index="8" name="Optional Plugin - Firebird Manager" selected="true"/>
+<pack index="9" name="Optional Plugin - H2 " selected="true"/>
+<pack index="10" name="Optional Plugin - Hibernate " selected="true"/>
+<pack index="11" name="Optional Plugin - Informix " selected="true"/>
+<pack index="12" name="Optional Plugin - Microsoft SQL Server " selected="true"/>
+<pack index="13" name="Optional Plugin - MySQL " selected="true"/>
+<pack index="14" name="Optional Plugin - Netezza" selected="true"/>
+<pack index="15" name="Optional Plugin - Oracle" selected="true"/>
+<pack index="16" name="Optional Plugin - PostgreSQL " selected="true"/>
+<pack index="17" name="Optional Plugin - Refactoring" selected="true"/>
+<pack index="18" name="Optional Plugin - Session Scripts" selected="true"/>
+<pack index="19" name="Optional Plugin - Smart Tools " selected="true"/>
+<pack index="20" name="Optional Plugin - SQL Parametrisation " selected="true"/>
+<pack index="21" name="Optional Plugin - SQL Replace " selected="true"/>
+<pack index="22" name="Optional Plugin - SQL Validator " selected="true"/>
+<pack index="23" name="Optional Plugin - Sybase " selected="true"/>
+<pack index="24" name="Optional Plugin - Internationalization " selected="true"/>
+<pack index="25" name="Optional Translation - Brazilian Portuguese" selected="true"/>
+<pack index="26" name="Optional Translation - Bulgarian" selected="true"/>
+<pack index="27" name="Optional Translation - Czech" selected="true"/>
+<pack index="28" name="Optional Translation - Simplified Chinese" selected="true"/>
+<pack index="29" name="Optional Translation - French" selected="true"/>
+<pack index="30" name="Optional Translation - German" selected="true"/>
+<pack index="31" name="Optional Translation - Italian" selected="true"/>
+<pack index="32" name="Optional Translation - Korean" selected="true"/>
+<pack index="33" name="Optional Translation - Polish" selected="true"/>
+<pack index="34" name="Optional Translation - Russian" selected="true"/>
+<pack index="35" name="Optional Translation - Spanish" selected="true"/>
+</com.izforge.izpack.panels.PacksPanel>
+<com.izforge.izpack.panels.InstallPanel id="UNKNOWN (com.izforge.izpack.panels.InstallPanel)"/>
+<com.izforge.izpack.panels.ShortcutPanel id="UNKNOWN (com.izforge.izpack.panels.ShortcutPanel)"/>
+<com.izforge.izpack.panels.FinishPanel id="UNKNOWN (com.izforge.izpack.panels.FinishPanel)"/>
+</AutomatedInstallation>
Added: trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/squirrel-sql.sh
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/squirrel-sql.sh (rev 0)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/squirrel-sql.sh 2010-08-10 23:56:24 UTC (rev 5785)
@@ -0,0 +1,108 @@
+#! /bin/sh
+
+# IZPACK_JAVA_HOME is filtered in by the IzPack installer when this script is installed
+IZPACK_JAVA_HOME=%JAVA_HOME
+
+# We detect the java executable to use according to the following algorithm:
+#
+# 1. If it is located in JAVA_HOME, then we use that; or
+# 2. If the one used by the IzPack installer is available then use that, otherwise
+# 3. Use the java that is in the command path.
+#
+if [ -d "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then
+ JAVACMD="$JAVA_HOME/bin/java"
+elif [ -d "$IZPACK_JAVA_HOME" -a -x "$IZPACK_JAVA_HOME/bin/java" ]; then
+ JAVACMD="$IZPACK_JAVA_HOME/bin/java"
+else
+ JAVACMD=java
+fi
+
+# Are we running within Cygwin on some version of Windows or on Mac OS X?
+cygwin=false;
+macosx=false;
+case "`uname -s`" in
+ CYGWIN*)
+ cygwin=true
+ ;;
+ Darwin*)
+ macosx=true
+ ;;
+esac
+
+# SQuirreL home. This is the plain zip version of squirrel-sql.sh, so the installer isn't run. In this case
+# the script cannot be modified by the installer to hard-code the install path. We prefer to specify squirrel
+# home as an absolute path, so that the command will work when exec'd from any location. So we attempt to
+# detect the absolute path using dirname "$0", which should work in most cases.
+if $macosx ; then
+ SQUIRREL_SQL_HOME=`dirname "$0"`/Contents/Resources/Java
+else
+ SQUIRREL_SQL_HOME=`dirname "$0"`
+fi
+
+# SQuirreL home in Unix format.
+if $cygwin ; then
+ UNIX_STYLE_HOME=`cygpath "$SQUIRREL_SQL_HOME"`
+else
+ UNIX_STYLE_HOME="$SQUIRREL_SQL_HOME"
+fi
+
+cd "$UNIX_STYLE_HOME"
+
+# Check to see if the JVM meets the minimum required to run SQuirreL and inform the user if not and skip
+# launch. versioncheck.jar is a special jar file which has been compiled with javac version 1.2.2, which
+# should be able to be run by that version or higher. The arguments to JavaVersionChecker below specify the
+# minimum acceptable version (first arg) and any other acceptable subsequent versions. <MAJOR>.<MINOR> should
+# be all that is necessary for the version form.
+$JAVACMD -cp "$UNIX_STYLE_HOME/lib/versioncheck.jar" JavaVersionChecker 1.6 1.7
+if [ "$?" = "1" ]; then
+ exit
+fi
+
+# First entry in classpath is the Squirrel application.
+TMP_CP="$UNIX_STYLE_HOME/squirrel-sql.jar"
+
+# Then add all library jars to the classpath.
+for a in "$UNIX_STYLE_HOME"/lib/*; do
+ TMP_CP="$TMP_CP":"$a"
+done
+
+# Set the update app's classpath to use jars in download area first, then the installed jars
+UPDATE_CP=$TMP_CP
+for a in "$UNIX_STYLE_HOME"/update/downloads/core/*; do
+ UPDATE_CP="$a":"$UPDATE_CP"
+done
+
+
+# Now add the system classpath to the classpath. If running
+# Cygwin we also need to change the classpath to Windows format.
+if $cygwin ; then
+ TMP_CP=`cygpath -w -p $TMP_CP`
+ UPDATE_CP=`cygpath -w -p $UPDATE_CP`
+ TMP_CP=$TMP_CP';'$CLASSPATH
+ UPDATE_CP=$UPDATE_CP';'$CLASSPATH
+else
+ TMP_CP=$TMP_CP:$CLASSPATH
+ UPDATE_CP=$UPDATE_CP:$CLASSPATH
+fi
+
+if $macosx ; then
+ # Define mac-specific system properties if running on Mac OS X
+ MACOSX_UPDATER_PROPS="-Dapple.laf.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name=SQuirreLSQLUpdater"
+ MACOSX_SQUIRREL_PROPS="-Dapple.laf.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name=SQuirreLSQL"
+ NATIVE_LAF_PROP="--native-laf"
+fi
+
+# Check for updates and prompt to apply if any are available
+if [ -f "$UNIX_STYLE_HOME/update/downloads/core/squirrel-sql.jar" -a -f "$UNIX_STYLE_HOME/update/changeList.xml" ]; then
+ $JAVACMD -cp "$UPDATE_CP" $MACOSX_UPDATER_PROPS -Dlog4j.defaultInitOverride=true -Dprompt=true net.sourceforge.squirrel_sql.client.update.gui.installer.PreLaunchUpdateApplication -l "$UNIX_STYLE_HOME/update-log4j.properties"
+fi
+
+if $macosx ; then
+ # macosx provides unknown args to the script, causing SQuirreL to bail..
+ SCRIPT_ARGS=""
+else
+ SCRIPT_ARGS="$1 $2 $3 $4 $5 $6 $7 $8 $9"
+fi
+
+# Launch SQuirreL application
+$JAVACMD -Xmx256m -cp "$TMP_CP" $MACOSX_SQUIRREL_PROPS net.sourceforge.squirrel_sql.client.Main --log-config-file "$UNIX_STYLE_HOME"/log4j.properties --squirrel-home "$UNIX_STYLE_HOME" $NATIVE_LAF_PROP $SCRIPT_ARGS
Property changes on: trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/squirrel-sql.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/standard-auto-install.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/standard-auto-install.xml (rev 0)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/standard-auto-install.xml 2010-08-10 23:56:24 UTC (rev 5785)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<AutomatedInstallation langpack="eng">
+<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>${project.build.directory}/squirrel-sql-${squirrelsql.version}-standard</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"/>
+<pack index="1" name="Standard" selected="true"/>
+</com.izforge.izpack.panels.PacksPanel>
+<com.izforge.izpack.panels.InstallPanel id="UNKNOWN (com.izforge.izpack.panels.InstallPanel)"/>
+<com.izforge.izpack.panels.ShortcutPanel id="UNKNOWN (com.izforge.izpack.panels.ShortcutPanel)"/>
+<com.izforge.izpack.panels.FinishPanel id="UNKNOWN (com.izforge.izpack.panels.FinishPanel)"/>
+</AutomatedInstallation>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
