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

[oscar at devel.lifetype.net]

Author: oscar
Date: 2007-06-08 16:07:06 -0400 (Fri, 08 Jun 2007)
New Revision: 5516

Modified:
   plog/branches/lifetype-1.2/bin-devel/build-diff.sh
Log:
version.php was not being generated properly when creating differential builds, nor was install/files.properties.php.


Modified: plog/branches/lifetype-1.2/bin-devel/build-diff.sh
===================================================================
--- plog/branches/lifetype-1.2/bin-devel/build-diff.sh	2007-06-08 19:39:28 UTC (rev 5515)
+++ plog/branches/lifetype-1.2/bin-devel/build-diff.sh	2007-06-08 20:07:06 UTC (rev 5516)
@@ -19,6 +19,16 @@
 	exit -1
 fi
 
+#
+# array with the files that we are going to remove before
+# making the package... Wildcards, complete paths, whatever
+# can be used here
+#
+# NOTE: the exact same list is also maintained in build-svn.sh, please make sure that
+# changes made here also propagated to the other script
+#
+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"
+
 # parameters with the branches
 BRANCH1=$1
 BRANCH2=$2
@@ -35,9 +45,17 @@
 # switch to the second one
 cd $WORKFOLDER
 echo "Switching to $BRANCH2..."
-svn switch $SVNSERVER$SVNREPO/$BRANCH2 > files
+REV=`svn switch $SVNSERVER$SVNREPO/$BRANCH2 | tee files | tail -n 1 | cut -d ' ' -f 4 | tr -d . `
 cd ..
 
+# and remove all unnecessary files
+echo "Removing unnecessary files...";
+for i in $TOREMOVE
+do
+  echo "  -- removing $i"
+  rm -rf $WORKFOLDER/$i
+done
+
 echo "Generating MD5 hash of files..."
 php $WORKFOLDER/bin-devel/genmd5.php
 
@@ -54,6 +72,13 @@
 	cp $WORKFOLDER/$i $DESTFOLDER/$FOLDER
 done
 
+# finally, update the version.php file
+echo "Updating the version.php file..."
+VERNAME=`basename ${BRANCH2}`
+echo "<?php" > $DESTFOLDER/version.php
+echo "\$version = \"${VERNAME}_r${REV}\";" >> $DESTFOLDER/version.php
+echo "?>" >> $DESTFOLDER/version.php
+
 # make sure that install/files.properties.php is included
 echo "Moving the updated files.properties.php to the destination package..."
 mkdir -p $DESTFOLDER/install