[Squirrel-sql-commits] sql12/build/plainzip build.sh,1.15,1.16

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/build/plainzip
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30732

Modified Files:
	build.sh 
Log Message:
Update to put the version in the install path

Index: build.sh
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/build/plainzip/build.sh,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** build.sh	1 Mar 2010 01:23:43 -0000	1.15
--- build.sh	3 Mar 2010 02:07:48 -0000	1.16
***************
*** 1,6 ****
  
! export VERSION=3.1.0
  
! export INSTALL_JAR=/home/manningr/squirrel_builds/squirrel_$VERSION_build/squirrel-sql-dist/squirrel-sql-$VERSION-install.jar
  
  
--- 1,7 ----
+ #! /bin/bash
  
! export VERSION=3.1
  
! export INSTALL_JAR=/home/manningr/squirrel-sql-$VERSION-install.jar
  
  
***************
*** 9,24 ****
  rm -rf tmp
  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
  
! cp squirrel-sql.sh "tmp/SQuirreL SQL Client/"
  
  cd tmp
  
! tar -cvf squirrel-sql-$VERSION-base.tar "SQuirreL SQL Client"
  
  gzip squirrel-sql-$VERSION-base.tar
--- 10,26 ----
  rm -rf tmp
  mkdir tmp
+ rm *.xml
  
! perl -p -e 's/\@squirrel_version\@/$ENV{VERSION}/g' auto_install_base.xml.template > auto_install_base.xml
! perl -p -e 's/\@squirrel_version\@/$ENV{VERSION}/g' auto_install_standard.xml.template > auto_install_standard.xml
! perl -p -e 's/\@squirrel_version\@/$ENV{VERSION}/g' auto_install_optional.xml.template > auto_install_optional.xml
  
  java -jar $INSTALL_JAR auto_install_base.xml
  
! cp squirrel-sql.sh "tmp/squirrel-sql-$VERSION/"
  
  cd tmp
  
! tar -cvf squirrel-sql-$VERSION-base.tar "squirrel-sql-$VERSION"
  
  gzip squirrel-sql-$VERSION-base.tar
***************
*** 33,41 ****
  java -jar $INSTALL_JAR auto_install_standard.xml
  
! cp squirrel-sql.sh "tmp/SQuirreL SQL Client/"
  
  cd tmp
  
! tar -cvf squirrel-sql-$VERSION-standard.tar "SQuirreL SQL Client"
  
  gzip squirrel-sql-$VERSION-standard.tar
--- 35,43 ----
  java -jar $INSTALL_JAR auto_install_standard.xml
  
! cp squirrel-sql.sh "tmp/squirrel-sql-$VERSION/"
  
  cd tmp
  
! tar -cvf squirrel-sql-$VERSION-standard.tar "squirrel-sql-$VERSION"
  
  gzip squirrel-sql-$VERSION-standard.tar
***************
*** 50,58 ****
  java -jar $INSTALL_JAR auto_install_optional.xml
  
! cp squirrel-sql.sh "tmp/SQuirreL SQL Client/"
  
  cd tmp
  
! tar -cvf squirrel-sql-$VERSION-optional.tar "SQuirreL SQL Client"
  
  gzip squirrel-sql-$VERSION-optional.tar
--- 52,60 ----
  java -jar $INSTALL_JAR auto_install_optional.xml
  
! cp squirrel-sql.sh "tmp/squirrel-sql-$VERSION/"
  
  cd tmp
  
! tar -cvf squirrel-sql-$VERSION-optional.tar "squirrel-sql-$VERSION"
  
  gzip squirrel-sql-$VERSION-optional.tar
***************
*** 63,64 ****
--- 65,67 ----
  
  rm -rf tmp
+ rm *.xml