configure v4.1.0 (see NEWS for details)

parent 0aaac5c7
......@@ -16,6 +16,7 @@ fi
PREFIX="/usr"
DIRINFO_ENABLE="false"
MODE=user
QUIET=false
PYTHON=$(which python)
export OLDPATH=$PATH
......
......@@ -94,7 +94,7 @@ for SECTION in GIR OPT_GIR; do
VERSION=$(grep -w ${SECTION}${DONE_COUNTER} .configure/depends | gawk '{print $3}')
TYPE_LIB=$(grep -w ${SECTION}${DONE_COUNTER} .configure/depends | gawk '{print $4}')
FILE=$(basename $(ls ${GIRPATH}/$TYPE_LIB* 2>/dev/null) .typelib 2>/dev/null)
if [[ $FILE != ".typelib" ]]; then
EXIST_RETURN=0
......@@ -121,6 +121,30 @@ done
}
check_python () {
section_message PY
if [[ ! -e $PYTHON ]]; then
fail_message p
exit 1
else
PYMINVER=270
PYMAXVER=300
PYVER=$(python --version 2>&1 | gawk '{ gsub(/\./,""); print $2 }')
if [[ $PYVER -lt $PYMINVER ]]; then
fail_message p-
exit 1
elif [[ $PYVER -gt $PYMAXVER ]]; then
fail_message p+
exit 1
else
ok_message Python $PYTHON
fi
fi
}
check_pymods () {
for SECTION in PYMOD OPT_PYMOD; do
......@@ -132,7 +156,7 @@ for SECTION in PYMOD OPT_PYMOD; do
while (( $DONE_COUNTER <= $CHKS_COUNTER )); do
DEPENDENCY=$(grep -w ${SECTION}${DONE_COUNTER} .configure/depends | gawk '{print $2}')
if [[ $DEPENDENCY == *:* ]]; then
FROM=$(echo $DEPENDENCY | gawk -F \: '{print $1}')
SMOD=$(echo $DEPENDENCY | gawk -F \: '{print $2}')
......
......@@ -2,7 +2,7 @@
section_message () {
if [[ ! $QUIET ]]; then
if [[ $QUIET != "true" ]]; then
case $1 in
APP )
......@@ -21,6 +21,10 @@ section_message () {
echo -e "\n${MAGENTA}Optional ${WHITE}SuperUser Applications:\n"
;;
PY )
echo -e "\n${RED}Python Interpreter ${WHITE} > 2.6 && < 3.0:\n"
;;
PYMOD )
echo -e "\n${RED}Required ${WHITE}Python Modules:\n"
;;
......@@ -59,7 +63,7 @@ start_message () {
ok_message () {
if [[ ! $QUIET ]]; then
if [[ $QUIET != "true" ]]; then
if [[ $2 != "" ]]; then
echo -e "${WHITE}\t+ ${CYAN}$1${MAGENTA} >${GREEN} O.K.${SILVER} ( $2 )"
else echo -e "${WHITE}\t+ ${CYAN}$1${MAGENTA} >${GREEN} O.K."
......@@ -70,11 +74,28 @@ ok_message () {
fail_message () {
if [[ $1 == "m" ]]; then
echo -e "${WHITE}\t+ ${CYAN}$2${MAGENTA} >${RED} !MISSING!"
elif [[ $1 == "o" ]]; then
echo -e "${WHITE}\t+ ${CYAN}$2${MAGENTA} >${RED} !OLDER THAN $3!"
fi
case $1 in
m )
echo -e "${WHITE}\t+ ${CYAN}$2${MAGENTA} >${RED} !MISSING!"
;;
o )
echo -e "${WHITE}\t+ ${CYAN}$2${MAGENTA} >${RED} !OLDER THAN $3!"
;;
p )
echo -e "${WHITE}\t+ ${CYAN}Python ($PYTHON)${MAGENTA} >${RED} !MISSING!"
;;
p- )
echo -e "${WHITE}\t+ ${CYAN}Python ($PYTHON)${MAGENTA} >${RED} !OLDER THAN 2.7.0!"
;;
p+ )
echo -e "${WHITE}\t+ ${CYAN}Python ($PYTHON)${MAGENTA} >${RED} !IS 3.0 OR ABOVE!"
;;
esac
tput sgr0
}
......@@ -108,15 +129,15 @@ end_message () {
help_message () {
echo -e "\n${GREEN}BashStyle-NG ${YELLOW}(configure 4.0.2) ${CYAN}help
\n\n${WHITE}Options:\
echo -e "\n${GREEN}BashStyle-NG ${YELLOW}(configure 4.1.0) ${CYAN}help
\n${WHITE}Options:\
\n${ORANGE}--help${WHITE} |${GREEN} Display this help message\
\n${ORANGE}--maintainer${WHITE} |${GREEN} Enter Maintainer Mode (disables checks)\
\n${ORANGE}--mode${WHITE} |${GREEN} user (do checks) or maintainer (skip checks)\
\n${ORANGE}--prefix=${WHITE} |${GREEN} Change Installation Prefix (default: /usr)\
\n${ORANGE}--girpath=${WHITE} |${GREEN} Where to look G-I typelibs (default: /usr/lib/girepository-1.0/)\
\n${ORANGE}--python=${WHITE} |${GREEN} Make BashStyle-NG use a specific python (default: /usr/bin/python)\
\n${ORANGE}--quiet${WHITE} |${GREEN} Only display warnings, failures and results\
\n${ORANGE}--dirinfo-disable${WHITE} |${GREEN} Disable Dirinfo Wrappers (default)\
\n${ORANGE}--dirinfo-enable${WHITE} |${GREEN} Enable Dirinfo Wrappers (RTFM first!)\n"
\n${ORANGE}--dirinfo=${WHITE} |${GREEN} true: enable dirinfo wrappers, false: disable (default: disable)\n"
tput sgr0
}
......@@ -4,7 +4,7 @@ IN_FILES=( rc/nx-rc data/bashstyle data/bashstyle-ng.pc data/bashstyle.sh )
SUB_VERSION_FILES=( data/bashstyle-ng.pc rc/nx-rc data/bashstyle )
SUB_PREFIX_FILES=( data/bashstyle-ng.pc data/bashstyle data/bashstyle.sh rc/nx-rc )
SUB_PY_FILES=( )
SUB_PY_FILES=( data/bashstyle )
copy_in_files () {
......
Overview of changes in v8.1 "Sonic Empire"
=== Bug fixes ===
* 138 (ui):
* #138 (ui):
don't enforce window to be centered
=== Added Features ===
* configure now accepts --girpath argument (tell configure where to look
for gobject introspection files
* #139 (configure, ui):
add ability to specify which python interpreter to use
=== configure 4.1.0 ===
* configure now accepts --girpath argument (girpath to use)
* configure now accepts --mode argument (user = check dependencies,
maintainer = don't check dependencies (speed up re-builds))
* configure now accepts --dirinfo argument (replacing --dirinfo-enable
and --dirinfo-disable arguements)
* configure now accepts --python argument (python interpreter to use,
part of fixing bug #139)
* configure now checks version of python interpreter to be greater or
equal 2.7.0 and lower than 3.0
* minor internal improvements in configure
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
......
......@@ -12,31 +12,31 @@ pcount=$#
while [[ $xcount -lt $pcount ]]; do
case $1 in
*maintainer )
MODE=MAINTAINER
--mode=* )
MODE="${1/*=}"
;;
--prefix* )
--prefix=* )
PREFIX="${1/*=}"
;;
--girpath* )
GIRPATH="${$1/*=}"
--girpath=* )
GIRPATH="${1/*=}"
;;
*dirinfo-disable )
DIRINFO_ENABLE="false"
--python=* )
PYTHON="${1/*=}"
;;
*dirinfo-enable )
DIRINFO_ENABLE="true"
--dirinfo=* )
DIRINFO_ENABLE="${1/*=}"
;;
*quiet )
QUIET="true"
--quiet )
QUIET=true
;;
*help )
--help )
MODE=help
;;
esac
......@@ -64,6 +64,7 @@ elif [[ $MODE == user ]]; then
check_apps
check_libs
check_gir
check_python
check_pymods
copy_in_files
substitute_values
......
#!/bin/bash
cd @PREFIX@/share/bashstyle-ng/
if [[ $1 == "--python" ]]; then
echo "@PYTHON@"
else
cd @PREFIX@/share/bashstyle-ng/
export BSNG_UI_PREFIX="@PREFIX@"
export BSNG_UI_VERSION="@VERSION@"
export PYTHONPATH="$PYTHONPATH:@PREFIX@/share/bashstyle-ng/ui/"
export BSNG_UI_PREFIX="@PREFIX@"
export BSNG_UI_VERSION="@VERSION@"
export PYTHONPATH="$PYTHONPATH:@PREFIX@/share/bashstyle-ng/ui/"
python $PWD/ui/bs-ng.py $@
@PYTHON@ $PWD/ui/bs-ng.py $@
fi
#!/usr/bin/env python
#!/usr/bin/env bashstyle --python
#coding=utf-8
#########################################################
# #
......
#!/usr/bin/env python
#!/usr/bin/env bashstyle --python
#coding=utf-8
#########################################################
# #
......
#!/usr/bin/env python
#!/usr/bin/env bashstyle --python
#coding=utf-8
#########################################################
# #
......@@ -86,4 +86,4 @@ class Config(object):
print self.udc["%s" % group]["%s" % setting]
def GetFactoryConfig(self, group, setting):
print self.fdc["%s" % group]["%s" % setting]
\ No newline at end of file
print self.fdc["%s" % group]["%s" % setting]
#!/usr/bin/env python
#!/usr/bin/env bashstyle --python
#coding=utf-8
#########################################################
# #
......
#!/usr/bin/env python
#!/usr/bin/env bashstyle --python
#coding=utf-8
#########################################################
# #
......@@ -41,4 +41,4 @@ class Gettext(object):
if self.lc[:2] in self.langs:
print self.lc
else:
print "C"
\ No newline at end of file
print "C"
#!/usr/bin/env python
#!/usr/bin/env bashstyle --python
#coding=utf-8
#########################################################
# #
......@@ -59,4 +59,4 @@ class LockFile(object):
def Remove(self):
if os.access(lockfile, os.F_OK):
os.remove(lockfile)
\ No newline at end of file
os.remove(lockfile)
#!/usr/bin/env python
#!/usr/bin/env bashstyle --python
#coding=utf-8
#########################################################
# #
......@@ -40,4 +40,4 @@ def EnableBashstyleNG(activate):
if activate == True:
rc_new.write("source %s/share/bashstyle-ng/rc/nx-rc" % PREFIX)
rc_new.close
shutil.move(os.path.expanduser("~/.bashrc.new"), os.path.expanduser("~/.bashrc"))
\ No newline at end of file
shutil.move(os.path.expanduser("~/.bashrc.new"), os.path.expanduser("~/.bashrc"))
#!/usr/bin/env python
#!/usr/bin/env bashstyle --python
#coding=utf-8
#########################################################
# #
......
#!/usr/bin/env python
#!/usr/bin/env bashstyle --python
#coding=utf-8
#########################################################
# #
......
#!/usr/bin/env python
#!/usr/bin/env bashstyle --python
# -*- coding:utf-8 -*-
""" gtk textbuffer with undo functionality """
......
#!/usr/bin/env python
#!/usr/bin/env bashstyle --python
#coding=utf-8
#########################################################
# #
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment