[pLog-svn] r6183 - in plog/trunk: bin-devel class/action js/tinymce/plugins/inlinepopups/langs templates/LifeType/en_UK templates/wizard
mark at devel.lifetype.net
mark at devel.lifetype.net
Mon Jan 28 12:19:03 EST 2008
Author: mark
Date: 2008-01-28 12:19:03 -0500 (Mon, 28 Jan 2008)
New Revision: 6183
Added:
plog/trunk/js/tinymce/plugins/inlinepopups/langs/en.js
Modified:
plog/trunk/bin-devel/build-diff.sh
plog/trunk/bin-devel/build-svn.sh
plog/trunk/bin-devel/build-svn2.sh
plog/trunk/class/action/viewarticleaction.class.php
plog/trunk/templates/LifeType/en_UK/strings.txt
plog/trunk/templates/wizard/checks.template
plog/trunk/templates/wizard/update4.template
Log:
Merge from LifeType 1.2 development branches rev. 6138:6182
Modified: plog/trunk/bin-devel/build-diff.sh
===================================================================
--- plog/trunk/bin-devel/build-diff.sh 2008-01-28 15:58:08 UTC (rev 6182)
+++ plog/trunk/bin-devel/build-diff.sh 2008-01-28 17:19:03 UTC (rev 6183)
@@ -1,5 +1,9 @@
#!/bin/sh
+# This script is for building upgrade tar files, e.g. contain all the files
+# needed to upgrade a 1.2.5 installation to a 1.2.6 installation. The
+# wizard is not included, since this script is only for minor upgrades
+
# where to find the svn repository
SVNSERVER="http://devel.lifetype.net"
SVNREPO="/svn/plog/plog"
@@ -11,11 +15,11 @@
echo " "
echo "Usage: $0 branch1 branch2"
echo " "
- echo "Where branch1 and branch2 are two different branches/folders from the repository"
+ echo "Where branch1 and branch2 are two different branches/tags from the repository"
echo " "
echo "Example:"
echo " "
- echo " $0 tags/plog-1.0.1 branches/plog-1.0.2"
+ echo " $0 tags/lifetype-1.2.5 tags/lifetype-1.2.6"
exit -1
fi
@@ -45,19 +49,23 @@
echo "Checking out $BRANCH1..."
svn checkout $SVNSERVER$SVNREPO/$BRANCH1 $WORKFOLDER > /dev/null
# switch to the second one
-cd $WORKFOLDER
+pushd $WORKFOLDER > /dev/null
echo "Switching to $BRANCH2..."
REV=`svn switch $SVNSERVER$SVNREPO/$BRANCH2 | tee files | tail -n 1 | cut -d ' ' -f 4 | tr -d . `
-cd ..
+popd > /dev/null
# and remove all unnecessary files
echo "Removing unnecessary files...";
for i in $TOREMOVE
do
- echo " -- removing $i"
+# echo " -- removing $i"
rm -rf $WORKFOLDER/$i
done
+# remove files that shouldn't be included in upgrades
+rm -f $WORKFOLDER/wizard*
+rm -rf $WORKFOLDER/config/
+
echo "Generating MD5 hash of files..."
php $WORKFOLDER/bin-devel/genmd5.php
@@ -68,10 +76,14 @@
# the current method will cause errors.
for i in `grep "^[UA]" $WORKFOLDER/files | grep -v revision | awk '{print $2}'`
do
- echo Keeping: $i
- FOLDER=`dirname $i`
- mkdir -p $DESTFOLDER/$FOLDER
- cp $WORKFOLDER/$i $DESTFOLDER/$FOLDER
+ if [ -f $WORKFOLDER/$i -o -d $WORKFOLDER/$i ]; then
+ echo Keeping: $i
+ FOLDER=`dirname $i`
+ mkdir -p $DESTFOLDER/$FOLDER
+ cp $WORKFOLDER/$i $DESTFOLDER/$FOLDER
+# else
+# echo Ignoring: $i
+ fi
done
# finally, update the version.php file
@@ -89,10 +101,6 @@
# remove temporary folders
rm -rf $WORKFOLDER
-# remove files that shouldn't be included in upgrades
-rm $DESTFOLDER/wizard*
-rm -r $DESTFOLDER/config/
-
# remove files that shouldn't be included in any release
rm -rf $DESTFOLDER/bin-devel/
rm -rf $DESTFOLDER/docs-devel/
Modified: plog/trunk/bin-devel/build-svn.sh
===================================================================
--- plog/trunk/bin-devel/build-svn.sh 2008-01-28 15:58:08 UTC (rev 6182)
+++ plog/trunk/bin-devel/build-svn.sh 2008-01-28 17:19:03 UTC (rev 6183)
@@ -1,9 +1,9 @@
#!/bin/bash
-# Script to generate distribution builds of pLog
+# Script to generate distribution builds of LifeType
#
-# (c) 27-08-2004, the pLog Team
+# (c) 27-08-2004, the LifeType Team
#
#
# Requires two parameters: the name of the output package and the
@@ -22,7 +22,7 @@
# array with the files that we are going to remove before
# making the package... Wildcards, complete paths, whatever
# can be used here
-#
+# NOTE: When changing this list, update the list in build-diff.sh as well
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"
@@ -70,6 +70,10 @@
echo "If package-name is omitted, the name will lifetype-devel-current_date"
echo ""
echo "Use HEAD or TRUNK to indicate the main development branch"
+ echo ""
+ echo "Example:"
+ echo ""
+ echo " $0 tags/lifetype-1.2.6 lifetype-1.2.6"
exit -1
fi
@@ -123,12 +127,12 @@
cp -f $WORKDIR/release/logging.properties.php.dist $WORKDIR/config/logging.properties.php
cp -f $WORKDIR/release/cache.properties.php.dist $WORKDIR/config/cache.properties.php
cp -f $WORKDIR/release/userdata.properties.php.dist $WORKDIR/config/userdata.properties.php
-rm -rf $WORKDIR/dist
+rm -rf $WORKDIR/release
# regular users want to use the wizard
mv $WORKDIR/wizard $WORKDIR/wizard.php
-# finally, update the version.php file
+# update the version.php file
message "Updating the version.php file..."
VERNAME=`basename ${SVNTAG}`
echo "<?php" > $WORKDIR/version.php
Modified: plog/trunk/bin-devel/build-svn2.sh
===================================================================
--- plog/trunk/bin-devel/build-svn2.sh 2008-01-28 15:58:08 UTC (rev 6182)
+++ plog/trunk/bin-devel/build-svn2.sh 2008-01-28 17:19:03 UTC (rev 6183)
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# Script to generate distribution builds of pLog
+# Oscar's script to generate distribution builds of pLog - everyone else should use build-svn.sh
#
# (c) 27-08-2004, the pLog Team
#
Modified: plog/trunk/class/action/viewarticleaction.class.php
===================================================================
--- plog/trunk/class/action/viewarticleaction.class.php 2008-01-28 15:58:08 UTC (rev 6182)
+++ plog/trunk/class/action/viewarticleaction.class.php 2008-01-28 17:19:03 UTC (rev 6183)
@@ -69,7 +69,11 @@
{
$this->_view = new ErrorView( $this->_blogInfo );
$this->_view->setValue( "message", "error_fetching_article" );
- $this->setCommonData();
+ if( $this->_config->getValue( 'request_format_mode' ) != NORMAL_REQUEST_MODE )
+ {
+ $this->_view->_headers[0] = "HTTP/1.0 404 Not Found";
+ }
+ $this->setCommonData();
}
/**
Added: plog/trunk/js/tinymce/plugins/inlinepopups/langs/en.js
===================================================================
Modified: plog/trunk/templates/LifeType/en_UK/strings.txt
===================================================================
--- plog/trunk/templates/LifeType/en_UK/strings.txt 2008-01-28 15:58:08 UTC (rev 6182)
+++ plog/trunk/templates/LifeType/en_UK/strings.txt 2008-01-28 17:19:03 UTC (rev 6183)
@@ -1,9 +1,8 @@
ltTagline = """LifeType is an open-source blogging platform with support for multiple blogs and users
in a single installation."""
-frontPageLeft = """The latest stable version of LifeType is <b>1.2.5</b>. Click the link below to download.<br/>
-Take a look at the <a href="http://www.lifetype.net/blog.php/lifetype-development-journal/page/downloads">Downloads</a> section for more download packages,
-additional template sets and plugins."""
+frontPageLeft = """The latest stable version of LifeType is <b>1.2.6</b>. Click the link below to download.<br/>
+Take a look at the <a href="/post/2008/01/23/lifetype-1.2.6">Release Page</a>."""
frontPageRight = """LifeType supports multiple blogs and users, media management,
generation of standard content, clean URLs and support for subdomains.
@@ -552,4 +551,4 @@
<li>German enquiries: <a href="mailto:de at lifetype.net">de at lifetype.net</a></li>
<li>Taiwan enquiries: <a href="mailto:tw at lifetype.net">tw at lifetype.net</a></li>
</ul>
-"""
\ No newline at end of file
+"""
Modified: plog/trunk/templates/wizard/checks.template
===================================================================
--- plog/trunk/templates/wizard/checks.template 2008-01-28 15:58:08 UTC (rev 6182)
+++ plog/trunk/templates/wizard/checks.template 2008-01-28 17:19:03 UTC (rev 6183)
@@ -17,18 +17,9 @@
<p class="wizardInfoText">Welcome to the configuration wizard of LifeType. These are some basic checks of your current
system in order to ensure that LifeType can run properly.
<br/><br/>
- <b>IMPORTANT NOTE:</b> If you previously upgraded from LifeType
- 1.1.x to 1.2.0 (not 1.2.1 or later), there are some changes
- that need to be done to some
- of your resources. This is a known issue in the upgrade
- process of LifeType 1.1.x to 1.2.0 that did not convert the
- name of some preview files correctly.
- In order to have this issue fixed, click <a
- href="?nextStep=Fix120">here</a> and let the browser window
- reload.</p>
- <p>(TODO: can we detect if the fix has already been run? or if
- they are upgrading from 1.2.0? Presumably they already ran
- it if they are upgrading from a later version?)</p>
+ <b>IMPORTANT NOTE:</b>If you previously upgraded from LifeType 1.1.x to 1.2.0, there are some changes that need to be done to some of your resources.
+ This is a known issue in the upgrade process of LifeType 1.1.x to 1.2.0 that did not convert the name of some preview files correctly.
+ In order to have this issue fixed, click <a href="?nextStep=Fix120">here</a> and let the browser window reload.</p>
</div>
{/if}
Modified: plog/trunk/templates/wizard/update4.template
===================================================================
--- plog/trunk/templates/wizard/update4.template 2008-01-28 15:58:08 UTC (rev 6182)
+++ plog/trunk/templates/wizard/update4.template 2008-01-28 17:19:03 UTC (rev 6183)
@@ -12,7 +12,7 @@
<img src="imgs/admin/icon_info-16.png" alt="Info" class="wizardInfoIcon" />
<p class="wizardInfoText">
Installation is complete. Congratulations, Your 1.1 installation has been successfully upgraded to
- LifeType 1.2.4.
+ LifeType 1.2.6.
</p>
</div>
{/if}
More information about the pLog-svn
mailing list