Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (395aa34b001b08a6d866d6c94c3386605c1c186e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (395aa34b001b08a6d866d6c94c3386605c1c186e)
  • Date: Sun, 10 Sep 2006 05:33:58 -0500

GIT changes to master grimoire by George Sherwood <chat AT sourcemage.org>:

printer/cups/BUILD | 22 +++++++++++++---------
printer/cups/CONFIGURE | 5 ++++-
printer/cups/HISTORY | 6 ++++++
3 files changed, 23 insertions(+), 10 deletions(-)

New commits:
commit 3348bac2ea7b68b589df39d81b1c5f17b5a8654e
Author: George Sherwood <chat AT sourcemage.org>
Commit: George Sherwood <chat AT sourcemage.org>

Added option to build no extra languages. Addressed almost all of the
issues in Bug #12935. Still can't make build all extra languages.

diff --git a/printer/cups/BUILD b/printer/cups/BUILD
index a9ed603..d15cd0d 100755
--- a/printer/cups/BUILD
+++ b/printer/cups/BUILD
@@ -2,14 +2,18 @@ # don't install xinetd script
sedit "/XINETD=/D" configure &&
# prevent install of init scripts
OPTS="$OPTS --without-rcdir" &&
-# choose languages
-local CLIST &&
-# remove leading blank,
-CLIST=`echo ${CUPS_LANG} | sed "s/^ *//"` &&
-
-if [ $CLIST == none ];then
- OPTS="$OPTS --without-languages"
+# Set language options
+#local CLIST &&
+# remove leading blank
+#CLIST=`echo ${CUPS_LANG} | sed "s/^ *//"` &&
+if [ ${EXTRA_LANG} == "n" ]; then
+ OPTS="--without-languages $OPTS"
else
- OPTS="$OPTS --with-languages=\"$CLIST\" "
-fi &&
+ if [ ${CUPS_LANG} == "all" ]; then
+ OPTS="--with-languages $OPTS"
+ else
+ OPTS="--with-languages=$CUPS_LANG $OPTS"
+ fi
+fi &&
default_build
+
diff --git a/printer/cups/CONFIGURE b/printer/cups/CONFIGURE
index f47ae87..7f9b9fb 100755
--- a/printer/cups/CONFIGURE
+++ b/printer/cups/CONFIGURE
@@ -1,2 +1,5 @@
source $GRIMOIRE/FUNCTIONS &&
-config_query_multi CUPS_LANG "which additional language to install?" de es
ja pl sv
+config_query EXTRA_LANG "Do you want to build extra languages?" n
+if [ $EXTRA_LANG == "y" ]; then
+config_query_list CUPS_LANG "Which additional language to install?" all de
es ja pl sv
+fi
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index 3cb338c..9ea0e21 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,3 +1,9 @@
+2006-09-10 George Sherwood <george AT beernabeer.com>
+ * CONFIGURE: Added option to build no languages. Changed from
+ config_query_multi since it wasn't working. Added all option.
+ Addresses Bug #12935.
+ * BUILD: Added options to build no, all or one extra language.
+
2006-08-30 Treeve Jelbert <treeve AT pi.be>
* DETAILS: versioon 1.2.3




  • [SM-Commit] GIT changes to master grimoire by George Sherwood (395aa34b001b08a6d866d6c94c3386605c1c186e), George Sherwood, 09/11/2006

Archive powered by MHonArc 2.6.24.

Top of Page