Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up the installation process.

Browse Source 
svn: r8
This commit is contained in:
Don Allingham 2001-05-13 19:42:15 +00:00
parent ca3d8dffd6
commit b5cc4b0ceb
8 changed files with 292 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

232
gramps/configure vendored
View File

@ -710,11 +710,234 @@ else
fi
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:717: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_dummy="$PATH"
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_prog_CC="gcc"
break
fi
done
IFS="$ac_save_ifs"
fi
fi
CC="$ac_cv_prog_CC"
if test -n "$CC"; then
echo "$ac_t""$CC" 1>&6
else
echo "$ac_t""no" 1>&6
fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:747: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_prog_rejected=no
ac_dummy="$PATH"
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
fi
ac_cv_prog_CC="cc"
break
fi
done
IFS="$ac_save_ifs"
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
set dummy $ac_cv_prog_CC
shift
if test $# -gt 0; then
# We chose a different compiler from the bogus one.
# However, it has the same basename, so the bogon will be chosen
# first if we set CC to just the basename; use the full file name.
shift
set dummy "$ac_dir/$ac_word" "$@"
shift
ac_cv_prog_CC="$@"
fi
fi
fi
fi
CC="$ac_cv_prog_CC"
if test -n "$CC"; then
echo "$ac_t""$CC" 1>&6
else
echo "$ac_t""no" 1>&6
fi
if test -z "$CC"; then
case "`uname -s`" in
*win32* | *WIN32*)
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:798: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_dummy="$PATH"
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_prog_CC="cl"
break
fi
done
IFS="$ac_save_ifs"
fi
fi
CC="$ac_cv_prog_CC"
if test -n "$CC"; then
echo "$ac_t""$CC" 1>&6
else
echo "$ac_t""no" 1>&6
fi
;;
esac
fi
test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
echo "configure:830: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
#line 841 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
if { (eval echo configure:846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
ac_cv_prog_cc_cross=no
else
ac_cv_prog_cc_cross=yes
fi
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
ac_cv_prog_cc_works=no
fi
rm -fr conftest*
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cc_cross
echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
echo "configure:872: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
echo "configure:877: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.c <<EOF
#ifdef __GNUC__
yes;
#endif
EOF
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:886: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
fi
fi
echo "$ac_t""$ac_cv_prog_gcc" 1>&6
if test $ac_cv_prog_gcc = yes; then
GCC=yes
else
GCC=
fi
ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
echo "configure:905: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo 'void f(){}' > conftest.c
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
ac_cv_prog_cc_g=yes
else
ac_cv_prog_cc_g=no
fi
rm -f conftest*
fi
echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS"
elif test $ac_cv_prog_cc_g = yes; then
if test "$GCC" = yes; then
CFLAGS="-g -O2"
else
CFLAGS="-g"
fi
else
if test "$GCC" = yes; then
CFLAGS="-O2"
else
CFLAGS=
fi
fi
# Extract the first word of "gnome-config", so it can be a program name with args.
set dummy gnome-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:718: checking for $ac_word" >&5
echo "configure:941: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_HAVE_GNOME_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -744,7 +967,7 @@ fi
echo $ac_n "checking Python bindings for sax/xml""... $ac_c" 1>&6
echo "configure:748: checking Python bindings for sax/xml" >&5
echo "configure:971: checking Python bindings for sax/xml" >&5
cat > conftest.py <<EOF
try:
@ -770,7 +993,7 @@ fi
echo "$ac_t""ok" 1>&6
echo $ac_n "checking Python bindings for gtk+""... $ac_c" 1>&6
echo "configure:774: checking Python bindings for gtk+" >&5
echo "configure:997: checking Python bindings for gtk+" >&5
cat > conftest.py <<EOF
try:
@ -796,7 +1019,7 @@ fi
echo "$ac_t""ok" 1>&6
echo $ac_n "checking Python bindings for GNOME""... $ac_c" 1>&6
echo "configure:800: checking Python bindings for GNOME" >&5
echo "configure:1023: checking Python bindings for GNOME" >&5
cat > conftest.py <<EOF
try:
@ -982,6 +1205,7 @@ s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
s%@INSTALL_DATA@%$INSTALL_DATA%g
s%@SET_MAKE@%$SET_MAKE%g
s%@CC@%$CC%g
s%@HAVE_GNOME_CONFIG@%$HAVE_GNOME_CONFIG%g
CEOF

2
gramps/configure.in
View File

@ -14,6 +14,8 @@ AC_SUBST(PACKAGE)
AC_PROG_INSTALL
AC_PROG_MAKE_SET
AC_PROG_CC
dnl Check for programs
AC_CHECK_PROG(HAVE_GNOME_CONFIG, gnome-config, "YES", "NO")

73
gramps/src/Date.py
View File

@ -35,7 +35,10 @@ class Date:
formatCode = 0
BadFormat = _("Unknown Format")
fmt = re.compile("\s*(from|between|bet)(.+)(and|to)(.+)\s*$",
from_str = _("(from|between|bet)")
to_str = _("(and|to)")
fmt = re.compile("\s*" + from_str + "(.+)" + to_str + "(.+)\s*$",
re.IGNORECASE)
def __init__(self):
@ -74,7 +77,8 @@ class Date:
function = SingleDate.fmtFunc[Date.formatCode]
if self.range:
return "from " + function(self.start) + " to " + function(self.stop)
return _("from") + " " + function(self.start) + " " + \
_("to") + " " + function(self.stop)
else:
return function(self.start)
@ -128,11 +132,27 @@ class SingleDate:
"may" : 4, "jun" : 5, "jul" : 6, "aug" : 7,
"sep" : 8, "oct" : 9, "nov" : 10,"dec" : 11 }
m2v = { "abt" : about , "about" : about, "est" : about ,
"circa" : about, "around": about, "before": before,
"bef" : before, "after" : after, "aft" : after }
m2v = { _("abt") : about ,
_("about") : about,
_("est") : about ,
_("circa") : about,
_("around") : about,
_("before") : before,
_("bef") : before,
_("after") : after,
_("aft") : after }
modifiers = "(" + \
_("abt") + '|' + \
_("about") + '|' + \
_("est") + '|' + \
_("circa") + '|' + \
_("around") + '|' + \
_("before") + '|' + \
_("after") + '|' + \
_("aft") + '|' + \
_("bef") + ")"
modifiers = "(abt|about|est|circa|around|before|after|aft|bef)"
start = "^\s*" + modifiers + "?\s*"
fmt1 = re.compile(start + "(\S+)(\s+\d+\s*,)?\s*(\d+)?\s*$",
@ -256,6 +276,17 @@ class SingleDate:
else:
self.month = -1
#--------------------------------------------------------------------
#
#
#
#--------------------------------------------------------------------
def setMonthStrEng(self,text):
if SingleDate.m2num.has_key(string.lower(text[0:3])):
self.month = SingleDate.m2num[string.lower(text[0:3])]
else:
self.month = -1
#--------------------------------------------------------------------
#
#
@ -300,14 +331,14 @@ class SingleDate:
elif self.mode == SingleDate.about:
month = SingleDate.mname[self.month]
if self.year == -1:
retval = "about %s %d, ????" % (month,self.day)
retval = _("about") + " %s %d, ????" % (month,self.day)
else:
retval = "about %s %d, %d" % (month,self.day,self.year)
retval = _("about") + " %s %d, %d" % (month,self.day,self.year)
if self.mode == SingleDate.before:
retval = "before " + retval
retval = _("before") +" " + retval
elif self.mode == SingleDate.after:
retval = "after " + retval
retval = _("after") + " " + retval
return retval
@ -346,9 +377,9 @@ class SingleDate:
retval = "ABT %s %s, ????" % (string.upper(month[0:3]),self.day,self.year)
if self.mode == SingleDate.before:
retval = "BEFORE " + retval
retval = _("BEFORE") + " " + retval
elif self.mode == SingleDate.after:
retval = "AFTER " + retval
retval = _("AFTER") + " " + retval
return retval
@ -383,9 +414,9 @@ class SingleDate:
if self.mode == SingleDate.about:
retval = "ABT " + retval
elif self.mode == SingleDate.before:
retval = "BEFORE " + retval
retval = _("BEFORE") + " " + retval
elif self.mode == SingleDate.after:
retval = "AFTER " + retval
retval = _("AFTER") + " " + retval
return retval
@ -449,9 +480,9 @@ class SingleDate:
retval = "ABT %d-%d-%d" % (self.month+1,self.day,self.year)
if self.mode == SingleDate.before:
retval = "BEFORE " + retval
retval = _("BEFORE") + " " + retval
elif self.mode == SingleDate.after:
retval = "AFTER " + retval
retval = _("AFTER") + " " + retval
return retval
@ -482,9 +513,9 @@ class SingleDate:
retval = "ABT %d/%d/%d" % (self.day,self.month+1,self.year)
if self.mode == SingleDate.before:
retval = "BEFORE " + retval
retval = _("BEFORE") + " " + retval
elif self.mode == SingleDate.after:
retval = "AFTER " + retval
retval = _("AFTER") + " " + retval
return retval
@ -515,9 +546,9 @@ class SingleDate:
retval = "ABT %d-%d-%d" % (self.day,self.month+1,self.year)
if self.mode == SingleDate.before:
retval = "BEFORE " + retval
retval = _("BEFORE") + " " + retval
elif self.mode == SingleDate.after:
retval = "AFTER " + retval
retval = _("AFTER") + " " + retval
return retval
@ -658,7 +689,7 @@ class SingleDate:
if match != None:
matches = match.groups()
self.setMode(matches[0])
self.setMonthStr(matches[2])
self.setMonthStrEng(matches[2])
self.setDay(string.atoi(matches[1]))
if len(matches) == 4:
val = matches[3]

10
gramps/src/Makefile.in
View File

@ -6,6 +6,7 @@ INSTALL = @INSTALL@
srcdir = @top_srcdir@
pycomp = ${srcdir}/py-compile
CFLAGS = -fPIC -shared -O -I/usr/include/python1.5 -I/usr/lib/python1.5/config
LANG = sv
@SET_MAKE@
@ -23,11 +24,10 @@ install:
${INSTALL} -c gramps.png ${prefix}/share/pixmaps
${INSTALL} -d ${prefix}/share/gnome/apps/Applications
${INSTALL} -c gramps.desktop ${prefix}/share/gnome/apps/Applications
for i in locale/*; do\
base=`basename $$i`;\
${INSTALL} -d ${prefix}/share/locale/$$base; \
${INSTALL} -d ${prefix}/share/locale/$$base/LC_MESSAGES; \
${INSTALL} $$i/LC_MESSAGES/gramps.mo ${prefix}/share/locale/$$base/LC_MESSAGES; \
for i in ${LANG}; do\
${INSTALL} -d ${prefix}/share/locale/$$i; \
${INSTALL} -d ${prefix}/share/locale/$$i/LC_MESSAGES; \
${INSTALL} locale/$$i/LC_MESSAGES/gramps.mo ${prefix}/share/locale/$$i/LC_MESSAGES; \
done
uninstall:

76
gramps/src/OpenOfficeDoc.py
View File

@ -402,79 +402,3 @@ class OpenOfficeDoc(TextDoc):
self.f.write('</office:meta>\n')
self.f.write('</office:document-meta>\n')
self.f.close()
if __name__ == "__main__":
doc = OpenOfficeDoc(PAPER_US_LETTER,PAPER_PORTRAIT)
foo = FontStyle()
foo.set_type_face(FONT_SANS_SERIF)
foo.set_color((255,0,0))
foo.set_size(24)
para = ParagraphStyle()
para.set_font(foo)
para.set_alignment(PARA_ALIGN_RIGHT)
doc.add_style("MyTitle",para)
para = ParagraphStyle()
para.set_left_margin(1)
para.set_right_margin(1)
para.set_alignment(PARA_ALIGN_JUSTIFY)
doc.add_style("Normal",para)
table = TableStyle()
table.set_width(10)
table.set_columns(2)
table.set_column_width(0,2)
table.set_column_width(1,8)
doc.add_table_style("Table1",table)
para = ParagraphStyle()
font = FontStyle()
font.set_type_face(FONT_SANS_SERIF)
font.set_bold(1)
font.set_size(16)
para.set_font(font)
doc.add_style("TableEntry",para)
cell = TableCellStyle()
cell.set_bottom_border(1)
cell.set_top_border(1)
doc.add_cell_style("TableHeader",cell)
cell = TableCellStyle()
doc.add_cell_style("TableContents",cell)
doc.open("/home/dona/oo_test.sxw")
doc.start_paragraph("MyTitle")
doc.write_text("This is my Title")
doc.end_paragraph()
doc.start_paragraph("Normal")
doc.write_text("This is a test of the emergency broadcast system. ")
doc.write_text("This is a only a test. Repeat. This is only a test. ")
doc.write_text("Had this been an actual emergency, we would not be here ")
doc.write_text("to give you this message.")
doc.end_paragraph()
doc.start_table("MyTable","Table1")
doc.start_row()
doc.start_cell("TableHeader",2)
doc.start_paragraph("TableEntry")
doc.write_text("This is my Title")
doc.end_paragraph()
doc.end_cell()
doc.end_row()
doc.start_row()
doc.start_cell("TableContents")
doc.write_text("Hello")
doc.end_cell()
doc.start_cell("TableContents")
doc.write_text("Goodbye")
doc.end_cell()
doc.end_row()
doc.end_table()
doc.close()

6
gramps/src/data/Makefile.in
View File

@ -11,11 +11,11 @@ pycomp = ${srcdir}/py-compile
all:
install:
-mkdir ${data}
${INSTALL} -c *.sxw ${data}
${INSTALL} -d ${data}
${INSTALL} -c *.sxd table.* ${data}
uninstall:
rm ${data}/*.sxw
rm -f ${data}/*.sxd ${data}/table.html ${data}/table.sxc
-rmdir ${data}
clean:

2
gramps/src/filters/Makefile.in
View File

@ -13,7 +13,7 @@ all:
${pycomp} *.py
install:
-mkdir ${filters}
${INSTALL} -d ${filters}
${INSTALL} -c *.py *.pyo ${datadir}/filters
uninstall:

2
gramps/src/plugins/Makefile.in
View File

@ -14,7 +14,7 @@ all:
install:
-mkdir ${plugins}
${INSTALL} -d ${plugins}
${INSTALL} -c *.py *.pyo *.glade ${plugins}
uninstall: