From ba7010ecec84d39011dec55a78e4f220ea8c455a Mon Sep 17 00:00:00 2001 From: coppro Date: Sun, 23 Sep 2007 22:17:41 +0000 Subject: [PATCH] Fixed some problems with the last commit (like I had to rewrite my entire perl script, which was somehow deleted). git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@751 0fc631ac-6414-0410-93d0-97cfa31319b6 --- src/data/symbol_font.cpp | 2 ++ src/gui/update_checker.cpp | 4 +-- tools/website/create-package-list.pl | 52 ++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/src/data/symbol_font.cpp b/src/data/symbol_font.cpp index d30b56e5..e3342a53 100644 --- a/src/data/symbol_font.cpp +++ b/src/data/symbol_font.cpp @@ -48,6 +48,8 @@ SymbolFontP SymbolFont::byName(const String& name) { } IMPLEMENT_REFLECTION(SymbolFont) { + REFLECT_BASE(Packaged); + REFLECT_ALIAS(300, "text align", "text alignment"); REFLECT_N("image font size", img_size); diff --git a/src/gui/update_checker.cpp b/src/gui/update_checker.cpp index 203bd83d..620fb973 100644 --- a/src/gui/update_checker.cpp +++ b/src/gui/update_checker.cpp @@ -28,7 +28,7 @@ DECLARE_TYPEOF_COLLECTION(PackageVersionDataP); /// Information on available packages class PackageVersionData : public IntrusivePtrBase { public: - PackageVersionData() : is_installer(true) {} + PackageVersionData() {} String name; ///< Name of the package String description; ///< html description @@ -402,7 +402,7 @@ void UpdatesWindow::onActionChange(wxCommandEvent& ev) { } void UpdatesWindow::onApplyChanges(wxCommandEvent& ev) { - FOREACH(update_version_data->packages, pack) { + FOR_EACH(pack, update_version_data->packages) { PackageAction action = package_data[pack].second; } } diff --git a/tools/website/create-package-list.pl b/tools/website/create-package-list.pl index e69de29b..a4a8f651 100644 --- a/tools/website/create-package-list.pl +++ b/tools/website/create-package-list.pl @@ -0,0 +1,52 @@ +#!/usr/bin/perl +# +#Perl script to create updates. +#Just run with first argument being the folder all the installers are in, and the others being the packages +# e.g. ./create-package-list.pl http://magicseteditor.sf.net/packages/ ../../data/* + +$url = shift; + +while ($ARGV = shift) { + $f = $ARGV =~ /(([-a-z]+).mse-(game|style|symbol-font|include|export-template|locale))/; + if (!$f) { + warn "$ARGV not an appropriate package."; + next; + } + + $fullname = $1; + $name = $2; + + open(FILE, "$ARGV/$3"); + + $version = $msever = $dependencies = ""; + + while () { + $version = $1 if /^(?:\xef\xbb\xbf)?version: (.*)$/; + $msever = $1 if /^(?:\xef\xbb\xbf)?mse[ _]version: (.*)$/; + while (/^(?:\xef\xbb\xbf)?depends[ _]on:\s*$/) { + $dep = $depver = ""; + while () { + $version = $1 if /^(?:\xef\xbb\xbf)?version: (.*)$/; + $msever = $1 if /^(?:\xef\xbb\xbf)?mse[ _]version: (.*)$/; + last unless /^\t/; + $dep = $1 if /^\tpackage: (.*)$/; + $depver = $1 if /^\tversion: (.*)$/; + } + if (!$dep || !$depver) { + warn "$ARGV has an invalid dependency!"; + next; + } + $dependencies .= "\tdepends on:\n\t\tpackage: $dep\n\t\tversion: $depver\n"; + } + } + + close(FILE); + + if (!$version || !$msever) { + warn "$ARGV does not have a version" unless $version; + warn "$ARGV does not have an application version" unless $msever; + next; + } + + print "package:\n\tname: $fullname\n\turl: $url$name.mse-installer\n\tversion: $version\n\tapp version: $msever\n$dependencies\tdescription:\n\n"; +} \ No newline at end of file