From 030368320192cdeaf6286a8d1d234c24d6243334 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Thu, 29 Mar 2012 04:27:08 +0000 Subject: [PATCH] Testando esquemas de cor da versao antiga em windows --- bootstrap.sh | 67 +++++++++++++++++++++++++++++++------------------------------------ colors.conf | 6 +++--- pw3270.cbp | 1066 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 3 files changed, 569 insertions(+), 570 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 457ccee..c1ff273 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -5,57 +5,52 @@ PACKAGE_RELEASE=5 REV_FILE=./revision.m4 REV=`date +%y%m%d%H%M` -if test -d ".svn" ; then +SVN=`which svn 2> /dev/null` - SVN=`which svn 2> /dev/null` +if test -x "$SVN" ; then - if test -x "$SVN" ; then + echo "Updating sources..." + "$SVN" update + if [ "$?" != "0" ]; then - echo "Updating sources..." - "$SVN" update - if [ "$?" != "0" ]; then + echo "$SVN update failed!" - echo "$SVN update failed!" + else - else + LANG="EN_US" - if $SVN --xml info >/dev/null 2>&1; then - REV=`$SVN --xml info | tr -d '\r\n' | sed -e 's/.*.*/\1/'` - LCD=`$SVN --xml info | tr -d '\r\n' | sed -e 's/.*\([0-9\-]*\)\T\([0-9\:]*\)\..*<\/date>.*<\/commit>.*/\1 \2/'` - elif $SVN --version --quiet >/dev/null 2>&1; then - REV=`$SVN info | grep "^Revision:" | cut -d" " -f2` - LCD=`$SVN info | grep "^Last Changed Date:" | cut -d" " -f4,5` - else - LCD="" - fi + if $SVN --xml info >/dev/null 2>&1; then + REV=`$SVN --xml info | tr -d '\r\n' | sed -e 's/.*.*/\1/'` + LCD=`$SVN --xml info | tr -d '\r\n' | sed -e 's/.*\([0-9\-]*\)\T\([0-9\:]*\)\..*<\/date>.*<\/commit>.*/\1 \2/'` + elif $SVN --version --quiet >/dev/null 2>&1; then + REV=`$SVN info | grep "^Revision:" | cut -d" " -f2` + LCD=`$SVN info | grep "^Last Changed Date:" | cut -d" " -f4,5` + else + LCD="" + fi - if [ "$LCD" == "" ]; then - LCD=`date +%Y%m%d` - fi + if [ "$LCD" == "" ]; then + LCD=`date +%Y%m%d` + fi - URL=`svn info | grep "URL: " | sed -s "s@URL: @@g"` + URL=`svn info | grep "URL: " | sed -s "s@URL: @@g"` - echo "m4_define([SVN_REV], $REV)" > $REV_FILE - echo "m4_define([SVN_DATE], $LCD)" >> $REV_FILE - echo "m4_define([SVN_URL], $URL)" >> $REV_FILE - echo "m4_define([SVN_RELEASE], $PACKAGE_RELEASE)" >> $REV_FILE + echo "m4_define([SVN_REV], $REV)" > $REV_FILE + echo "m4_define([SVN_DATE], $LCD)" >> $REV_FILE + echo "m4_define([SVN_URL], $URL)" >> $REV_FILE + echo "m4_define([SVN_RELEASE], $PACKAGE_RELEASE)" >> $REV_FILE - fi - - SVN2CL=`which svn2cl.sh 2> /dev/null` - if [ ! -z $SVN2CL ]; then - echo "Creating changelog ..." - $SVN2CL - fi fi -elif [ ! -e $REV_FILE ]; then - echo "Can´t find subversion and no revision.m4 supplied; aborting" - exit -1 + SVN2CL=`which svn2cl.sh 2> /dev/null` + if [ ! -z $SVN2CL ]; then + echo "Creating changelog ..." + $SVN2CL + fi fi if [ ! -f $REV_FILE ]; then - echo "Can't create $REV_FILE Is svn installed?" + echo "Can't create $REV_FILE is svn available?" exit -1 fi diff --git a/colors.conf b/colors.conf index 893de47..82fcc57 100644 --- a/colors.conf +++ b/colors.conf @@ -35,7 +35,7 @@ OIA=black,white,white,white,white [Green] Label=Green Label[pt_BR]=Verde -Terminal=black,green,green,green,green,green,green,green,green,green,green,green,green,green,green,green +Terminal=black,green,green,green,green,green,green,green,black,green,green,green,green,green,green,green BaseAttributes=green,green,green,green SelectedText=dimGrey,green,dimGrey Cursor=green,green @@ -44,7 +44,7 @@ OIA=black,green,green,green,green [WB] Label=White on Black Label[pt_BR]=Branco com fundo preto -Terminal=black,white,white,white,white,white,white,white,white,white,white,white,white,white,white,white +Terminal=black,white,white,white,white,white,white,white,black,white,white,white,white,white,white,white BaseAttributes=white,white,white,white SelectedText=white,black,white Cursor=white,white @@ -53,7 +53,7 @@ OIA=black,white,white,white,white [BW] Label=Black on White Label[pt_BR]=Preto com fundo branco -Terminal=white,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black +Terminal=white,black,black,black,black,black,black,black,white,black,black,black,black,black,black,black BaseAttributes=black,black,black,black SelectedText=black,white,black Cursor=black,black diff --git a/pw3270.cbp b/pw3270.cbp index 8c7226a..c627c27 100644 --- a/pw3270.cbp +++ b/pw3270.cbp @@ -9,8 +9,8 @@