diff -r 7b4d47633e9e updateObPackage --- a/updateObPackage Mon Feb 22 19:11:05 2010 +0100 +++ b/updateObPackage Mon Feb 22 19:38:02 2010 +0100 @@ -34,7 +34,7 @@ echo -n $(hg id -i -r $TAG) > ../openbravo-erp/usr/share/openbravo-erp/src/config/instance.revision ## Although in sources the file permission should be ok, to be sure :) -cd ../openbravo-erp/usr/share/openbravo-erp +cd ../openbravo-erp/usr/share/openbravo-erp/src find * -type f | xargs chmod 644 find * -type d | xargs chmod 755 chmod 755 web/js/dojotoolkit/dojox/storage/buildFlashStorage.sh @@ -68,9 +68,9 @@ done CURRENT_PATH=$(pwd) -../../../setprop openbravo-erp/config/Openbravo.properties "deploy.mode" "war" -../../../setprop openbravo-erp/config/Openbravo.properties "source.path" "$CURRENT_PATH/openbravo-erp" -../../../setprop openbravo-erp/config/Openbravo.properties "bbdd.url" "jdbc:postgresql://localhost:5832" +../../../setprop openbravo-erp/src/config/Openbravo.properties "deploy.mode" "war" +../../../setprop openbravo-erp/src/config/Openbravo.properties "source.path" "$CURRENT_PATH/openbravo-erp" +../../../setprop openbravo-erp/src/config/Openbravo.properties "bbdd.url" "jdbc:postgresql://localhost:5832" if [ ! -d sampledata ] then @@ -81,8 +81,8 @@ cd .. fi -rm -f openbravo-erp/referencedata/sampledata/SmallBazaar.xml -cp sampledata/*.xml openbravo-erp/referencedata/sampledata/ +rm -f openbravo-erp/src/referencedata/sampledata/SmallBazaar.xml +cp sampledata/*.xml openbravo-erp/src/referencedata/sampledata/ cd openbravo-erp export ANT_OPTS="-Xmx2048M -XX:MaxPermSize=256M" @@ -90,16 +90,16 @@ ant install.source -Dbuild.maxmemory=1024M cd .. -rm -f openbravo-erp/config/Openbravo.properties +rm -f openbravo-erp/src/config/Openbravo.properties $PGENGINE/vacuumdb -U tad -d openbravo -h localhost -f -z -p $PGPORT $PGENGINE/pg_dump -U tad -h localhost -F c -b -v -f tad_pgsql.dmp openbravo -p $PGPORT $PGENGINE/pg_ctl stop -s -D ${PGDATA} -o "-p ${PGPORT}" -mv tad_pgsql.dmp openbravo-erp/ +mv tad_pgsql.dmp openbravo-erp/src/ -rm -f openbravo-erp/lib/openbravo.war -rm -rf openbravo-erp/WebContent/* +rm -f openbravo-erp/src/lib/openbravo.war +rm -rf openbravo-erp/src/WebContent/* rm -rf postgresql rm -rf sampledata