Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 77977 by Pol Vinogradov for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Eric Sandall" <eric AT sandall.us>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Pol Vinogradov" <vin.public AT gmail.com>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 77977 by Pol Vinogradov for review
  • Date: Tue, 18 Apr 2006 23:55:01 +0100 (BST)

Change 77977 by pol_vinogradov@public on 2006/04/18 23:50:36

ugh... integrated more generalized stuff for nanorc and version update

Affected files ...

... //sgl/grimoires/test/editors/nano/BUILD#4 integrate
... //sgl/grimoires/test/editors/nano/CONFIGURE#5 integrate
... //sgl/grimoires/test/editors/nano/DETAILS#8 integrate
... //sgl/grimoires/test/editors/nano/HISTORY#18 integrate
... //sgl/grimoires/test/editors/nano/INSTALL#3 integrate
... //sgl/grimoires/test/editors/nano/spell-config/nanorc-ruskie#1 branch
...
//sgl/grimoires/test/editors/nano/spell-config/nanorc-spell-highlighting#1
branch
... //sgl/grimoires/test/editors/nano/spellhighlight.diff#2 delete

Differences ...

==== //sgl/grimoires/test/editors/nano/BUILD#4 (xtext) ====

@@ -1,11 +1,5 @@
OPTS="$OPTS --build=${BUILD} ${NANO_OPTS}"
[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"
- if [[ "$SPELL_HIGHLIGHT" == "y" ]]; then
- cd doc &&
- patch -p0 < ${SCRIPT_DIRECTORY}/spellhighlight.diff &&
- cd ${SOURCE_DIRECTORY}
- fi &&
-

./configure --prefix=${TRACK_ROOT}/usr \
--sysconfdir=${TRACK_ROOT}/etc \

==== //sgl/grimoires/test/editors/nano/CONFIGURE#5 (xtext) ====

@@ -34,8 +34,15 @@
"--enable-utf8" "--disable-utf8"
fi
&&

-if [[ "${NANO_CONFIG}" == "all" || $( echo ${NANO_OPTS} | grep -o
enable-color ) = "enable-color" &&
-$( echo ${NANO_OPTS} | grep -o enable-nanorc ) = "enable-nanorc" ]] ; then
- config_query SPELL_HIGHLIGHT "Do you want to enable syntax highlighting
of spell files?" y
+if [[ "${NANO_CONFIG}" == "all" ||
+ list_find "$NANO_OPTS" "--enable-color" &&
+ list_find "$NANO_OPTS" "--enable-nanorc" ]]; then
+ config_query NANO_PROVIDED_CONFIG "Do you want to install one of the
available system-wide nanorc config files" n
+fi
&&
+
+if [[ "$NANO_PROVIDED_CONFIG" == "y" ]]; then
+ local NANO_AVAILABLE_CONFIG
&&
+ NANO_AVAILABLE_CONFIG="$(ls -1 $SCRIPT_DIRECTORY/spell-config/*" | tr "\n"
")" &&
+ NANO_AVAILABLE_CONFIG="nanorc-sample $NANO_AVAILABLE_CONFIG"
&&
+ config_query_list NANO_SELECTED_CONFIG "Which config do you want to
choose" $NANO_AVAILABLE_CONFIG
fi
-

==== //sgl/grimoires/test/editors/nano/DETAILS#8 (xtext) ====

@@ -1,11 +1,11 @@
SPELL=nano
BUILD_API=2
- VERSION=1.3.10
+ VERSION=1.3.11
BRANCH=`echo ${VERSION}|cut -d . -f1,2`
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=http://www.nano-editor.org/dist/v${BRANCH}/${SOURCE}
-
SOURCE_HASH=sha512:1bd2e7ea583042db843d5b4facd7bcdd3d5c730487b58f1a157106ca998cd48ba510939a6e501954bdf26dbdd7c8523b2c5093d209f387f333110e4393cc0daa
+
SOURCE_HASH='sha512:eab4cfdb3c9b59245abeb48d17356f284d11e6ed56555058a76b4b3866ef2eb8dfd83e117cd39c21648f55653366d16a3b470e49a49366205c6e69b53200cf37'
WEB_SITE=http://www.nano-editor.org
ENTERED=20010922
UPDATED=20020414

==== //sgl/grimoires/test/editors/nano/HISTORY#18 (text) ====

@@ -1,8 +1,13 @@
2006-04-19 Pol Vinogradov <vin.public AT gmail.com>
- * CONFIGURE: added query for spell highlighting
- * BUILD: if statement added, patch if needed
- * INSTALL: added if and install_config_file
- * spellhighlight.diff: added
+ * spell-config/nanorc-{spell-highlighting,ruskie}: added, used for
spell
+ highlighting and SMGL specific needs (thanks e-type and ruskie for
idea)
+ * CONFIGURE: added queries for spell highlighting and nanorc selecting
+ * BUILD: if statement removed
+ * INSTALL: added ifs and install_config_files for various nanorc
+ * spellhighlight.diff: removed
+
+2006-03-30 Sergey Lipnevich <sergey AT sourcemage.org>
+ * DETAILS: upgrade to 1.3.11.

2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

==== //sgl/grimoires/test/editors/nano/INSTALL#3 (xtext) ====

@@ -1,5 +1,7 @@
make install DESTDIR=$INSTALL_ROOT &&

-if [[ "${NANO_CONFIG}" == "all" || $( echo ${NANO_OPTS} | grep -o
enable-nanorc ) = "enable-nanorc" ]] ; then
+if [[ "$NANO_SELECTED_CONFIG" == "nanorc-sample" ]]; then
install_config_file doc/nanorc.sample $INSTALL_ROOT/etc/nanorc
+else
+ install_config_file $SCRIPT_DIRECTORY/spell-config/$NANO_SELECTED_CONFIG
$INSTALL_ROOT/etc/nanorc
fi



  • [SM-Commit] PERFORCE change 77977 by Pol Vinogradov for review, Perforce Review Daemon, 04/18/2006

Archive powered by MHonArc 2.6.24.

Top of Page