Skip to Content.
Sympa Menu

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

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 (34d02ab4b8c888643723d5cbe1bd5631091d1911)
  • Date: Sat, 19 Apr 2008 11:52:50 -0500

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

ChangeLog | 3 ++
etc/sorcery/config | 3 ++
usr/sbin/sorcery | 63
+++++------------------------------------------------
3 files changed, 13 insertions(+), 56 deletions(-)

New commits:
commit 34d02ab4b8c888643723d5cbe1bd5631091d1911
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

sorcery: rewrote feature_menu to be much more concise and removed
the extra
variable fallbacks, since most are already in the sorcery config
config: added defaults for COLOR, CONFIG_LOC and GATHER_DOCS

diff --git a/ChangeLog b/ChangeLog
index c2fb4e8..c0fb25c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
2008-04-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* sorcery: sanitized the saving of CCACHE in the feature_menu
fixed CCACHE and STORE_CONF_LOG not being disablable
+ rewrote feature_menu to be much more concise and removed the extra
+ variable fallbacks, since most are already in the sorcery config
+ * config: added defaults for COLOR, CONFIG_LOC and GATHER_DOCS

2008-04-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libsorcery: don't clear the line on every queuing progress bar
update
diff --git a/etc/sorcery/config b/etc/sorcery/config
index acbe773..df3fad9 100755
--- a/etc/sorcery/config
+++ b/etc/sorcery/config
@@ -29,6 +29,9 @@ shopt -u expand_aliases
EXTENSION=${EXTENSION:=.bz2}
SET_TERM_TITLE=${SET_TERM_TITLE:=off}
PER_SPELL_CFLAGS=${PER_SPELL_CFLAGS:=off}
+ COLOR=${COLOR:=on}
+ CONFIG_LOC=${CONFIG_LOC:=on}
+ GATHER_DOCS=${GATHER_DOCS:=on}
STRICT_SCM_UPDATE=${STRICT_SCM_UPDATE:=off}
NICE=${NICE:=+10}
UMASK=${UMASK:=0022}
diff --git a/usr/sbin/sorcery b/usr/sbin/sorcery
index 2f42e92..8f933a9 100755
--- a/usr/sbin/sorcery
+++ b/usr/sbin/sorcery
@@ -1541,29 +1541,6 @@ feature_menu() {
local SCR_HELP="Toggle usage of screen in cast"
local PSC_HELP="Ask for custom cflags for each spell"

- ARCHIVE=${ARCHIVE:=on}
- AUTOFIX=${AUTOFIX:=on}
- UPDATEFIX=${UPDATEFIX:=off}
- AUTOPRUNE=${AUTOPRUNE:=off}
- CCACHE=${CCACHE:=off}
- COLOR=${COLOR:=on}
- CONFIG_LOC=${CONFIG_LOC:=on}
- GATHER_DOCS=${GATHER_DOCS:=on}
- MAIL_REPORTS=${MAIL_REPORTS:=off}
- TMPFS=${TMPFS:=on}
- VIEW_REPORTS=${VIEW_REPORTS:=off}
- PRESERVE=${PRESERVE:=on}
- SUSTAIN=${SUSTAIN:on}
- VOYEUR=${VOYEUR:=on}
- REAP=${REAP:=on}
-STORE_CONF_LOG=${STORE_CONF_LOG:-off}
- NET_SELECT=${NET_SELECT:=off}
- CLEAN_SOURCE=${CLEAN_SOURCE:=off}
- CROSS_INSTALL=${CROSS_INSTALL:=off}
-SET_TERM_TITLE=${SET_TERM_TITLE:=off}
- SCREEN=${SCREEN:-off}
-PER_SPELL_CFLAGS=${PER_SPELL_CFLAGS:-off}
-
if TOGGLES=`eval $DIALOG ' --title "Feature Menu" \
--no-cancel \
--item-help \
@@ -1599,43 +1576,17 @@ PER_SPELL_CFLAGS=${PER_SPELL_CFLAGS:-off}
eval $i=off
done

- for TOGGLE in $TOGGLES; do
-
- case $TOGGLE in
-
- ARCHIVE) ARCHIVE=on ;;
- AUTOFIX) AUTOFIX=on ;;
- UPDATEFIX) UPDATEFIX=on ;;
- AUTOPRUNE) AUTOPRUNE=on ;;
- CCACHE) CCACHE=on ;;
- COLOR) COLOR=on ;;
- CONFIG_LOC) CONFIG_LOC=on ;;
- GATHER_DOCS) GATHER_DOCS=on ;;
- MAIL_REPORTS) MAIL_REPORTS=on ;;
- PRESERVE) PRESERVE=on ;;
- SUSTAIN) SUSTAIN=on ;;
- TMPFS) TMPFS=on ;;
- VIEW_REPORTS) VIEW_REPORTS=on ;;
- VOYEUR) VOYEUR=on ;;
- REAP) REAP=on ;;
- STORE_CONF_LOG) STORE_CONF_LOG=on ;;
- NET_SELECT) NET_SELECT=on ;;
- CLEAN_SOURCE) CLEAN_SOURCE=on ;;
- CROSS_INSTALL) CROSS_INSTALL=on ;;
- SET_TERM_TITLE) SET_TERM_TITLE=on ;;
- SCREEN) SCREEN=on ;;
- PER_SPELL_CFLAGS) PER_SPELL_CFLAGS=on ;;
- esac
-
+ for TOGGLE in $TOGGLES; do
+ eval $TOGGLE=on
done

- TEMP=(ARCHIVE AUTOFIX UPDATEFIX AUTOPRUNE GATHER_DOCS MAIL_REPORTS
VIEW_REPORTS PRESERVE SUSTAIN TMPFS VOYEUR REAP STORE_CONF_LOG NET_SELECT
CONFIG_LOC CLEAN_SOURCE CROSS_INSTALL SET_TERM_TITLE SCREEN PER_SPELL_CFLAGS)
for i in ${TEMP[*]} ; do
- modify_local_config "$i" "${!i}"
+ case $i in
+ CCACHE) modify_config $LOCAL_COMPILE_CONFIG CCACHE $CCACHE ;;
+ COLOR) modify_local_config "color" "$COLOR" "command" ;;
+ *) modify_local_config "$i" "${!i}" ;;
+ esac
done
-
- modify_local_config "color" "$COLOR" "command"
- modify_config $LOCAL_COMPILE_CONFIG CCACHE $CCACHE
fi

}



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (34d02ab4b8c888643723d5cbe1bd5631091d1911), Jaka Kranjc, 04/19/2008

Archive powered by MHonArc 2.6.24.

Top of Page