Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (4b6beccf530eb5d76c658fd15cd02663dbdb4ee3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (4b6beccf530eb5d76c658fd15cd02663dbdb4ee3)
  • Date: Fri, 13 Aug 2010 06:17:56 -0500

GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 3 +++
var/lib/sorcery/modules/build_api/api2 | 3 +--
var/lib/sorcery/modules/libspell | 6 ++++--
3 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 4b6beccf530eb5d76c658fd15cd02663dbdb4ee3
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

api2: run optimize right before build so the persistent variables are
available and per-spell flags can work #15782

commit 8eb4c0ab23c4a8d6003a93b2dd3d838d7ec7010f
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libspell: always run the pre_function in run_spell_file

diff --git a/ChangeLog b/ChangeLog
index d1993a1..aeb226d 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
and added message colorisation, based on patches by Bor Kraljič
fixed "existing" typo in an error message
* cleanse: update the term title during fixing, patch by Bor Kraljič
+ * libspell: always run the pre_function in run_spell_file
+ * api2: run optimize right before build so the persistent variables
are
+ available and per-spell flags can work #15782

2010-07-04 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libtrack, libdispel: use the correct whole-line option for grep
diff --git a/var/lib/sorcery/modules/build_api/api2
b/var/lib/sorcery/modules/build_api/api2
index 197c847..79911fa 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -161,14 +161,13 @@ function run_build() {

invoke_build_dir
invoke_gcc
- optimize

message -n "Building in dir: "
pwd
message "$SPELL $VERSION"
message

- run_spell_file BUILD build
+ run_spell_file BUILD build optimize

if [ "$?" != 0 ]; then
message "${PROBLEM_COLOR}" \
diff --git a/var/lib/sorcery/modules/libspell
b/var/lib/sorcery/modules/libspell
index f7c2cf8..d51eff7 100755
--- a/var/lib/sorcery/modules/libspell
+++ b/var/lib/sorcery/modules/libspell
@@ -162,11 +162,13 @@ function run_spell_file() {
}"

persistent_load &&
+ if [[ $pre_function ]]; then
+ $pre_function
+ true
+ fi &&
if test -x "$SCRIPT_DIRECTORY/$spell_file"; then
- [[ $pre_function ]] && $pre_function
. $SCRIPT_DIRECTORY/$spell_file
elif [[ "$spell_cmd" ]] ; then
- [[ $pre_function ]] && $pre_function
$spell_cmd
else
default_${function_suffix}



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (4b6beccf530eb5d76c658fd15cd02663dbdb4ee3), Jaka Kranjc, 08/13/2010

Archive powered by MHonArc 2.6.24.

Top of Page