[pLog-svn] r5500 - plog/branches/lifetype-1.2/bin-devel

[oscar at devel.lifetype.net]

Author: oscar
Date: 2007-06-06 17:35:53 -0400 (Wed, 06 Jun 2007)
New Revision: 5500

Modified:
   plog/branches/lifetype-1.2/bin-devel/build-svn.sh
Log:
Some changes to the build script, now the nightly snapshots should be installable again.


Modified: plog/branches/lifetype-1.2/bin-devel/build-svn.sh
===================================================================
--- plog/branches/lifetype-1.2/bin-devel/build-svn.sh	2007-06-06 18:24:31 UTC (rev 5499)
+++ plog/branches/lifetype-1.2/bin-devel/build-svn.sh	2007-06-06 21:35:53 UTC (rev 5500)
@@ -1,3 +1,4 @@
+
 #!/bin/bash
 
 # Script to generate distribution builds of pLog
@@ -23,7 +24,7 @@
 # can be used here
 #
 
-TOREMOVE="include_files release/ locale/old/ templates/LifeType/ templates/standard-with-plugins/ templates/grey-sf/ templates/plogworld bin-devel/ docs-devel/ class/gallery/getid3/module.archive.rar.php class/gallery/getid3/module.archive.szip.php class/gallery/getid3/module.audio-video.bink.php class/gallery/getid3/module.audio-video.matroska.php class/gallery/getid3/module.audio-video.nsv.php class/gallery/getid3/module.audio.avr.php class/gallery/getid3/module.audio.bonk.php class/gallery/getid3/module.audio.la.php class/gallery/getid3/module.audio.lpac.php class/gallery/getid3/module.audio.monkey.php class/gallery/getid3/module.audio.optimfrog.php class/gallery/getid3/module.audio.rkau.php class/gallery/getid3/module.audio.shorten.php class/gallery/getid3/module.audio.tta.php class/gallery/getid3/module.audio.voc.php class/gallery/getid3/module.audio.vqf.php class/gallery/getid3/module.graphic.bmp.php class/gallery/getid3/module.graphpc.pcd.php class/gallery/getid3/modu
 le.misc.exe.php class/gallery/getid3/module.misc.iso.php class/gallery/getid3/extension.cache.dbm.php class/gallery/getid3/extension.cache.mysql.php class/gallery/getid3/write.apetag.php class/gallery/getid3/write.id3v1.php class/gallery/getid3/write.id3v2.php class/gallery/getid3/write.lyrics3.php class/gallery/getid3/write.metaflac.php class/gallery/getid3/write.php class/gallery/getid3/write.real.php class/gallery/getid3/write.vorbiscomment.php dbperf.php *.xcode tools/ runtests.php"
+TOREMOVE="include_files release/ locale/old/ templates/LifeType/ templates/standard-with-plugins/ templates/grey-sf/ templates/plogworld docs-devel/ class/gallery/getid3/module.archive.rar.php class/gallery/getid3/module.archive.szip.php class/gallery/getid3/module.audio-video.bink.php class/gallery/getid3/module.audio-video.matroska.php class/gallery/getid3/module.audio-video.nsv.php class/gallery/getid3/module.audio.avr.php class/gallery/getid3/module.audio.bonk.php class/gallery/getid3/module.audio.la.php class/gallery/getid3/module.audio.lpac.php class/gallery/getid3/module.audio.monkey.php class/gallery/getid3/module.audio.optimfrog.php class/gallery/getid3/module.audio.rkau.php class/gallery/getid3/module.audio.shorten.php class/gallery/getid3/module.audio.tta.php class/gallery/getid3/module.audio.voc.php class/gallery/getid3/module.audio.vqf.php class/gallery/getid3/module.graphic.bmp.php class/gallery/getid3/module.graphpc.pcd.php class/gallery/getid3/module.misc.exe
 .php class/gallery/getid3/module.misc.iso.php class/gallery/getid3/extension.cache.dbm.php class/gallery/getid3/extension.cache.mysql.php class/gallery/getid3/write.apetag.php class/gallery/getid3/write.id3v1.php class/gallery/getid3/write.id3v2.php class/gallery/getid3/write.lyrics3.php class/gallery/getid3/write.metaflac.php class/gallery/getid3/write.php class/gallery/getid3/write.real.php class/gallery/getid3/write.vorbiscomment.php dbperf.php *.xcode tools/ runtests.php"
 
 #
 # helper functions to print things in different colors
@@ -51,6 +52,15 @@
 	exit $1
 }
 
+find_phpcli()
+{
+    if [ -x /usr/bin/php5 ]; then
+        PHP=/usr/bin/php5
+    else
+        PHP=/usr/bin/php
+    fi
+}
+
 # check parameters
 if [ $# -lt 1 ]; then
     echo "Makes a build off the latest SVN source code and packages it"
@@ -73,15 +83,15 @@
 fi
 
 message "Using $PACKAGENAME as the package name"
-WORKDIR=$PACKAGENAME
-BUILDLABEL=$PACKAGENAME
+WORKDIR=`basename $PACKAGENAME`
+BUILDLABEL=`basename $PACKAGENAME`
 
 # determine whether code should be fetched from 
 # plog/trunk or plog/tags/xxxx
 if [ $SVNTAG == "HEAD" -o $SVNTAG == "TRUNK" -o $SVNTAG == "head" -o $SVNTAG == "trunk" ]; then
    SVNREPO=${SVNREPO}/trunk
 else
-   SVNREPO=${SVNREPO}/tags/${SVNTAG}
+   SVNREPO=${SVNREPO}/${SVNTAG}
 fi
 
 # call the cvs command with the correct parameters
@@ -115,14 +125,11 @@
 cp -f $WORKDIR/release/userdata.properties.php.dist $WORKDIR/config/userdata.properties.php
 rm -rf $WORKDIR/dist
 
-# generate install/file.properties.php with the MD5 hashes of most core files
-message "Generating MD5 hashes..."
-php $WORKDIR/bin-devel/genmd5.php
-
 # finally, update the version.php file
 message "Updating the version.php file..."
+VERNAME=`basename ${SVNTAG}`
 echo "<?php" > $WORKDIR/version.php
-echo "\$version = \"${SVNTAG}_r${REV}\";" >> $WORKDIR/version.php
+echo "\$version = \"${VERNAME}_r${REV}\";" >> $WORKDIR/version.php
 echo "?>" >> $WORKDIR/version.php
 
 # remove all the annoying CVS/ folders
@@ -137,6 +144,13 @@
   rm -rf $WORKDIR/$i
 done
 
+# generate install/file.properties.php with the MD5 hashes of most core files
+find_phpcli
+message "Generating MD5 hashes (using $PHP)..."
+$PHP $WORKDIR/bin-devel/genmd5.php
+# remove the bin-devel/ folder, we don't need it anymore
+rm -rf $WORKDIR/bin-devel
+
 # and create the .zip, tar.gz and .tar.bz2 packages
 message "Creating .zip package..."
 zip $BUILDLABEL.zip -r $WORKDIR  > /dev/null