Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Martin Spitzbarth (0f8ee01612940973e276f247c86cdff7d26cc09e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Martin Spitzbarth <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Martin Spitzbarth (0f8ee01612940973e276f247c86cdff7d26cc09e)
  • Date: Mon, 21 Jan 2008 10:14:58 -0600

GIT changes to master grimoire by Martin Spitzbarth <m.spitzbarth AT gmx.de>:

utils/rsbep/BUILD | 7 +------
utils/rsbep/CONFIGURE | 14 ++------------
utils/rsbep/HISTORY | 3 +++
utils/rsbep/PRE_BUILD | 13 +++++++++++++
4 files changed, 19 insertions(+), 18 deletions(-)

New commits:
commit 0f8ee01612940973e276f247c86cdff7d26cc09e
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

rsbep: Spell cleanup

Turned a query into config_query, moved spell logic into PRE_BUILD

diff --git a/utils/rsbep/BUILD b/utils/rsbep/BUILD
index bea1d4a..6b62240 100755
--- a/utils/rsbep/BUILD
+++ b/utils/rsbep/BUILD
@@ -1,7 +1,2 @@
-cp $SCRIPT_DIRECTORY/Makefil* . &&
-if ! grep -q "ASM=y" $SPELL_CONFIG; then
- mv Makefile_plain_C Makefile
-fi &&
-
make clean &&
-make
\ No newline at end of file
+make
diff --git a/utils/rsbep/CONFIGURE b/utils/rsbep/CONFIGURE
index 320d92b..a79129d 100755
--- a/utils/rsbep/CONFIGURE
+++ b/utils/rsbep/CONFIGURE
@@ -1,16 +1,6 @@
# asm routines are only intended for ia32, so they can be disabled
# on other architectures without asking the user.
-if [[ ${SMGL_COMPAT_ARCHS[0]} == "32" ]] ||
- [[ ${SMGL_COMPAT_ARCHS[0]} == "ia32" ]]
+if [[ ${SMGL_COMPAT_ARCHS[1]} == "ia32" ]]
then
- if ! grep -q "ASM=" $SPELL_CONFIG; then
-
- if query "Will you want to use asm routines?" y
- then echo "ASM=y" >> $SPELL_CONFIG
- else echo "ASM=n" >> $SPELL_CONFIG
- fi
-
- fi
-else
- echo "ASM=n" >> $SPELL_CONFIG
+ config_query ASM "Will you want to use asm routines?" y
fi
diff --git a/utils/rsbep/HISTORY b/utils/rsbep/HISTORY
index 8d6468d..8ae01dd 100644
--- a/utils/rsbep/HISTORY
+++ b/utils/rsbep/HISTORY
@@ -1,5 +1,8 @@
2008-01-21 Martin Spitzbarth <m.spitzbarth AT gmx.de>
* CONFIGURE: Limited the query for asm routines to ia32
+ * PRE_BUILD: Created, choose the right Makefile for asm routines
+ and no asm routines
+ * BUILD: Moved the asm spell logic to PRE_BUILD

2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.
diff --git a/utils/rsbep/PRE_BUILD b/utils/rsbep/PRE_BUILD
new file mode 100755
index 0000000..2b4fa51
--- /dev/null
+++ b/utils/rsbep/PRE_BUILD
@@ -0,0 +1,13 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+cp $SCRIPT_DIRECTORY/Makefil* . &&
+
+# Use Makefile for the faster asm routines, and
+# Makefile_plain_C for the C version without asm.
+# Anything other than ia32 must use the C version, and the user may
+# choose ASM=n in CONFIGURE to force the usage of the C version.
+if [[ ! ${SMGL_COMPAT_ARCHS[1]} == "ia32" ]] ||
+ [[ $ASM == "n" ]]
+then
+ mv Makefile_plain_C Makefile
+fi



  • [SM-Commit] GIT changes to master grimoire by Martin Spitzbarth (0f8ee01612940973e276f247c86cdff7d26cc09e), Martin Spitzbarth, 01/21/2008

Archive powered by MHonArc 2.6.24.

Top of Page