|
From: Rob M. <man...@us...> - 2010-03-01 01:24:12
|
Update of /cvsroot/squirrel-sql/sql12/build/plainzip In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv15242/build/plainzip Modified Files: auto_install_optional.xml auto_install_standard.xml build.sh auto_install_base.xml Log Message: 2933874 (make distributables follow industry conventions) following guidelines given in this ticket. Index: auto_install_standard.xml =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/build/plainzip/auto_install_standard.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** auto_install_standard.xml 9 Dec 2006 22:06:56 -0000 1.4 --- auto_install_standard.xml 1 Mar 2010 01:23:43 -0000 1.5 *************** *** 4,8 **** <com.izforge.izpack.panels.LicencePanel/> <com.izforge.izpack.panels.TargetPanel> ! <installpath>./tmp/SQuirreL SQL Client</installpath> </com.izforge.izpack.panels.TargetPanel> <com.izforge.izpack.panels.PacksPanel> --- 4,8 ---- <com.izforge.izpack.panels.LicencePanel/> <com.izforge.izpack.panels.TargetPanel> ! <installpath>./tmp/squirrel-sql-@squirrel-version@</installpath> </com.izforge.izpack.panels.TargetPanel> <com.izforge.izpack.panels.PacksPanel> Index: build.sh =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/build/plainzip/build.sh,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** build.sh 23 Mar 2009 10:07:31 -0000 1.14 --- build.sh 1 Mar 2010 01:23:43 -0000 1.15 *************** *** 1,5 **** - export INSTALL_JAR=/home/manningr/squirrel_builds/squirrel_3_0_1_build/squirrel-sql-dist/squirrel-sql-3.0.1-install.jar ! export VERSION=3.0.1 rm -f *.gz --- 1,8 ---- ! export VERSION=3.1.0 ! ! export INSTALL_JAR=/home/manningr/squirrel_builds/squirrel_$VERSION_build/squirrel-sql-dist/squirrel-sql-$VERSION-install.jar ! ! rm -f *.gz *************** *** 7,10 **** --- 10,17 ---- mkdir tmp + perl -pi -e 's/\@squirrel-version\@/$VERSION/' auto_install_base.xml + perl -pi -e 's/\@squirrel-version\@/$VERSION/' auto_install_standard.xml + perl -pi -e 's/\@squirrel-version\@/$VERSION/' auto_install_optional.xml + java -jar $INSTALL_JAR auto_install_base.xml Index: auto_install_optional.xml =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/build/plainzip/auto_install_optional.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** auto_install_optional.xml 26 Jul 2008 11:51:10 -0000 1.13 --- auto_install_optional.xml 1 Mar 2010 01:23:43 -0000 1.14 *************** *** 4,8 **** <com.izforge.izpack.panels.LicencePanel/> <com.izforge.izpack.panels.TargetPanel> ! <installpath>./tmp/SQuirreL SQL Client</installpath> </com.izforge.izpack.panels.TargetPanel> <com.izforge.izpack.panels.PacksPanel> --- 4,8 ---- <com.izforge.izpack.panels.LicencePanel/> <com.izforge.izpack.panels.TargetPanel> ! <installpath>./tmp/squirrel-sql-@squirrel-version@</installpath> </com.izforge.izpack.panels.TargetPanel> <com.izforge.izpack.panels.PacksPanel> *************** *** 11,39 **** <pack name="Optional Plugin - Data import" index="2" selected="true"/> <pack name="Optional Plugin - DBCopy" index="3" selected="true"/> ! <pack name="Optional Plugin - DB2" index="4" selected="true"/> ! <pack name="Optional Plugin - Derby" index="5" selected="true"/> ! <pack name="Optional Plugin - Firebird" index="6" selected="true"/> ! <pack name="Optional Plugin - Firebird Manager" index="7" selected="true"/> ! <pack name="Optional Plugin - H2" index="8" selected="true"/> ! <pack name="Optional Plugin - Informix" index="9" selected="true"/> ! <pack name="Optional Plugin - Microsoft SQL Server " index="10" selected="true"/> ! <pack name="Optional Plugin - MySQL " index="11" selected="true"/> ! <pack name="Optional Plugin - Oracle" index="12" selected="true"/> ! <pack name="Optional Plugin - PostgreSQL" index="13" selected="true"/> ! <pack name="Optional Plugin - Refactoring" index="14" selected="true"/> ! <pack name="Optional Plugin - Session Scripts" index="15" selected="true"/> ! <pack name="Optional Plugin - Smart Tools" index="16" selected="true"/> ! <pack name="Optional Plugin - SQL Parametrization" index="17" selected="true"/> ! <pack name="Optional Plugin - SQL Validator " index="18" selected="true"/> ! <pack name="Optional Plugin - Sybase " index="19" selected="true"/> ! <pack name="Optional Plugin - Internationalization " index="20" selected="true"/> ! <pack name="Optional Translation - Brazilian Portuguese" index="21" selected="true"/> ! <pack name="Optional Translation - Bulgarian" index="22" selected="true"/> ! <pack name="Optional Translation - Czech" index="23" selected="true"/> ! <pack name="Optional Translation - Simplified Chinese" index="24" selected="true"/> ! <pack name="Optional Translation - French" index="25" selected="true"/> ! <pack name="Optional Translation - German" index="26" selected="true"/> ! <pack name="Optional Translation - Italian" index="27" selected="true"/> ! <pack name="Optional Translation - Spanish" index="28" selected="true"/> </com.izforge.izpack.panels.PacksPanel> <com.izforge.izpack.panels.InstallPanel/> --- 11,41 ---- <pack name="Optional Plugin - Data import" index="2" selected="true"/> <pack name="Optional Plugin - DBCopy" index="3" selected="true"/> ! <pack name="Optional Plugin - DBDiff" index="4" selected="true"/> ! <pack name="Optional Plugin - DB2" index="5" selected="true"/> ! <pack name="Optional Plugin - Derby" index="6" selected="true"/> ! <pack name="Optional Plugin - Firebird" index="7" selected="true"/> ! <pack name="Optional Plugin - Firebird Manager" index="8" selected="true"/> ! <pack name="Optional Plugin - H2" index="9" selected="true"/> ! <pack name="Optional Plugin - Informix" index="10" selected="true"/> ! <pack name="Optional Plugin - Microsoft SQL Server " index="11" selected="true"/> ! <pack name="Optional Plugin - MySQL " index="12" selected="true"/> ! <pack name="Optional Plugin - Oracle" index="13" selected="true"/> ! <pack name="Optional Plugin - PostgreSQL" index="14" selected="true"/> ! <pack name="Optional Plugin - Refactoring" index="15" selected="true"/> ! <pack name="Optional Plugin - Session Scripts" index="16" selected="true"/> ! <pack name="Optional Plugin - Smart Tools" index="17" selected="true"/> ! <pack name="Optional Plugin - SQL Parametrization" index="18" selected="true"/> ! <pack name="Optional Plugin - SQL Validator " index="19" selected="true"/> ! <pack name="Optional Plugin - Sybase " index="20" selected="true"/> ! <pack name="Optional Plugin - Internationalization " index="21" selected="true"/> ! <pack name="Optional Translation - Brazilian Portuguese" index="22" selected="true"/> ! <pack name="Optional Translation - Bulgarian" index="23" selected="true"/> ! <pack name="Optional Translation - Czech" index="24" selected="true"/> ! <pack name="Optional Translation - Simplified Chinese" index="25" selected="true"/> ! <pack name="Optional Translation - French" index="26" selected="true"/> ! <pack name="Optional Translation - German" index="27" selected="true"/> ! <pack name="Optional Translation - Italian" index="28" selected="true"/> ! <pack name="Optional Translation - Polish" index="29" selected="true"/> ! <pack name="Optional Translation - Spanish" index="30" selected="true"/> </com.izforge.izpack.panels.PacksPanel> <com.izforge.izpack.panels.InstallPanel/> Index: auto_install_base.xml =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/build/plainzip/auto_install_base.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** auto_install_base.xml 9 Dec 2006 22:06:56 -0000 1.4 --- auto_install_base.xml 1 Mar 2010 01:23:43 -0000 1.5 *************** *** 4,8 **** <com.izforge.izpack.panels.LicencePanel/> <com.izforge.izpack.panels.TargetPanel> ! <installpath>./tmp/SQuirreL SQL Client</installpath> </com.izforge.izpack.panels.TargetPanel> <com.izforge.izpack.panels.PacksPanel> --- 4,8 ---- <com.izforge.izpack.panels.LicencePanel/> <com.izforge.izpack.panels.TargetPanel> ! <installpath>./tmp/squirrel-sql-@squirrel-version@</installpath> </com.izforge.izpack.panels.TargetPanel> <com.izforge.izpack.panels.PacksPanel> |
