From 10c435dccb953d1a8ea814be753f69dd5bfc54b0 Mon Sep 17 00:00:00 2001 From: Graham Knop Date: Thu, 14 Feb 2008 21:46:23 +0000 Subject: [PATCH] preparing for 7.5.3 dev --- docs/changelog/7.x.x.txt | 2 + docs/upgrades/upgrade_7.5.2-7.5.3.pl | 98 ++++++++++++++++++++++++++++ lib/WebGUI.pm | 2 +- 3 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 docs/upgrades/upgrade_7.5.2-7.5.3.pl diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 3fa7fd085..8b1867af7 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,3 +1,5 @@ +7.5.3 + 7.5.2 - add: Auth modules now accept a "returnUrl" form parameter when logging in or creating a new account. This parameter is the URL the user is diff --git a/docs/upgrades/upgrade_7.5.2-7.5.3.pl b/docs/upgrades/upgrade_7.5.2-7.5.3.pl new file mode 100644 index 000000000..1bd5461cc --- /dev/null +++ b/docs/upgrades/upgrade_7.5.2-7.5.3.pl @@ -0,0 +1,98 @@ +#------------------------------------------------------------------- +# WebGUI is Copyright 2001-2008 Plain Black Corporation. +#------------------------------------------------------------------- +# Please read the legal notices (docs/legal.txt) and the license +# (docs/license.txt) that came with this distribution before using +# this software. +#------------------------------------------------------------------- +# http://www.plainblack.com info@plainblack.com +#------------------------------------------------------------------- + +use lib "../../lib"; +use strict; +use Getopt::Long; +use WebGUI::Session; +use WebGUI::Storage; +use WebGUI::Asset; + + +my $toVersion = '7.5.3'; +my $quiet; # this line required + + +my $session = start(); # this line required + +# upgrade functions go here + +finish($session); # this line required + + +##------------------------------------------------- +#sub exampleFunction { +# my $session = shift; +# print "\tWe're doing some stuff here that you should know about.\n" unless ($quiet); +# # and here's our code +#} + + +# --------------- DO NOT EDIT BELOW THIS LINE -------------------------------- + +#---------------------------------------------------------------------------- +# Add a package to the import node +sub addPackage { + my $session = shift; + my $file = shift; + + # Make a storage location for the package + my $storage = WebGUI::Storage->createTemp( $session ); + $storage->addFileFromFilesystem( $file ); + + # Import the package into the import node + my $package = WebGUI::Asset->getImportNode($session)->importPackage( $storage ); + + # Make the package not a package anymore + $package->update({ isPackage => 0 }); +} + +#------------------------------------------------- +sub start { + my $configFile; + $|=1; #disable output buffering + GetOptions( + 'configFile=s'=>\$configFile, + 'quiet'=>\$quiet + ); + my $session = WebGUI::Session->open("../..",$configFile); + $session->user({userId=>3}); + my $versionTag = WebGUI::VersionTag->getWorking($session); + $versionTag->set({name=>"Upgrade to ".$toVersion}); + $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")"); + updateTemplates($session); + return $session; +} + +#------------------------------------------------- +sub finish { + my $session = shift; + my $versionTag = WebGUI::VersionTag->getWorking($session); + $versionTag->commit; + $session->close(); +} + +#------------------------------------------------- +sub updateTemplates { + my $session = shift; + return undef unless (-d "packages-".$toVersion); + print "\tUpdating packages.\n" unless ($quiet); + opendir(DIR,"packages-".$toVersion); + my @files = readdir(DIR); + closedir(DIR); + my $newFolder = undef; + foreach my $file (@files) { + next unless ($file =~ /\.wgpkg$/); + # Fix the filename to include a path + $file = "packages-" . $toVersion . "/" . $file; + addPackage( $session, $file ); + } +} + diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm index defedd9d2..0d47f4416 100644 --- a/lib/WebGUI.pm +++ b/lib/WebGUI.pm @@ -1,7 +1,7 @@ package WebGUI; -our $VERSION = '7.5.2'; +our $VERSION = '7.5.3'; our $STATUS = "beta";