Re: Language chooser - patch

2000-10-12 Thread Michael Sobolev 

On Wed, Oct 11, 2000 at 07:32:03PM -0500, Adam Di Carlo wrote:
 The only grotty thing about it, really, is that it required us to have
 bf-utf8 in the same parent dir as the boot-floppies area is, which is
 pretty much the best we can do in a bad situation, IMHO.
That sounds good.  One could check if bf-utf is available in parent directory
and disable LANG_CHOOSER if it is not.

--
Misha


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Re: Language chooser - patch

2000-10-11 Thread Marcin Owsiany 

Here is the patch.
Now we have to agree on how/which font to use, and make the changes to put
all the necessary files on root disk.

regards
Marcin

-- 
++ The reason we come up with new versions
|Marcin Owsiany  | is not to fix bugs. It's the stupidest
|[EMAIL PROTECTED]| reason to buy a new version
++ I ever heard.- Bill Gates


Index: utilities/Makefile
===
RCS file: /cvs/debian-boot/boot-floppies/utilities/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- utilities/Makefile  2000/03/23 04:11:30 1.33
+++ utilities/Makefile  2000/10/11 23:54:32
@@ -9,8 +9,10 @@
   SUBDIRS  += lowmemrd
 endif
 
-# bogl disabled
-# SUBDIRS  += bogl
+ifeq ($(USE_LANGUAGE_CHOOSER),true)
+# bogl enabled
+SUBDIRS+= bogl
+endif
 
 SPLIT_OBJECTS  := floppy_split.o
 
Index: utilities/bogl/Makefile
===
RCS file: /cvs/debian-boot/boot-floppies/utilities/bogl/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- utilities/bogl/Makefile 2000/04/05 21:15:11 1.18
+++ utilities/bogl/Makefile 2000/10/11 23:54:38
@@ -39,7 +39,7 @@
 
 GENERATED = helvB10.c helvB12.c helvR10.c timBI18.c tux75.c
 
-all:depend $(LIB)
+all:depend $(LIB) bterm bdftobogl libutf8_plug.so
 
 $(LIB): $(OBJECTS)
rm -f $(LIB)
@@ -63,11 +63,15 @@
 %.c: %.png pngtobogl
./pngtobogl $  $@
 
+libutf8_plug.so:
+   $(MAKE) -C ../../../bf-utf/libutf8
+   cp -f ../../../bf-utf/libutf8_plug.so $
+
 depend: $(SOURCES_DEP)
$(CPP) $(CFLAGS) -M $(SOURCES_DEP)  .depend
 
 clean: 
-   rm -rf bdftobogl pngtobogl *.o $(GENERATED) *-test lang.h tmp.*.c bowl-boxes 
$(LIB)
+   rm -rf libutf8_plug.so bterm bdftobogl pngtobogl *.o $(GENERATED) *-test 
+lang.h tmp.*.c bowl-boxes $(LIB)
 
 distclean: clean
rm -f $(LIB) .depend *~ .nfs*
Index: utilities/bogl/bowl-boxes.c
===
RCS file: /cvs/debian-boot/boot-floppies/utilities/bogl/bowl-boxes.c,v
retrieving revision 1.10
diff -u -r1.10 bowl-boxes.c
--- utilities/bogl/bowl-boxes.c 2000/04/01 10:52:04 1.10
+++ utilities/bogl/bowl-boxes.c 2000/10/11 23:54:40
@@ -317,6 +317,7 @@
   return NULL;
 }
 
+/*
 int
 enterDirBox (const char *title, const char *prompt, const char *dir, char *buf, 
size_t bufsize)
 {
@@ -334,8 +335,8 @@
 
 if (bowl_run ())
 {
-strcpy (buf, s);/* Actually, I must check whether the length of buf 
allows to hold a whole s */
-
+strcpy (buf, s);   */ /* Actually, I must check whether the length of buf 
+allows to hold a whole s */
+/*
 result = DLG_OKAY;
 }
 else
@@ -345,7 +346,7 @@
 
 return result;
 }
-
+*/
 int
 menuBox (const char *text, const char *title,
 struct d_choices *choices, int nchoices, int cancel)
Index: utilities/dbootstrap/Makefile
===
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/Makefile,v
retrieving revision 1.82
diff -u -r1.82 Makefile
--- utilities/dbootstrap/Makefile   2000/08/28 21:45:33 1.82
+++ utilities/dbootstrap/Makefile   2000/10/11 23:54:42
@@ -157,17 +157,20 @@
 OBJECTS = $(SOURCES:%.c=%.o)
 OBJECTS_G   = $(filter-out boxes.o, $(OBJECTS))
 
-$(PROG) : _LIBS= $(LIBS)
+$(PROG) : $(LIBS)
 $(PROG) : _OBJECTS = $(OBJECTS) $(OBJECTS_2)
-$(PROG) : $(OBJECTS) $(OBJECTS_2) $(_LIBFDISK)
+$(PROG): $(OBJECTS) $(OBJECTS_2) $(_LIBFDISK)
 
 $(PROG_G) : _LIBS= $(LIBS_G)
 $(PROG_G) : _OBJECTS = $(OBJECTS_G)
 $(PROG_G) : $(_LIBBOGL) $(OBJECTS_G) $(_LIBFDISK)
 
 $(PROG) $(PROG_G) :
-   $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(_OBJECTS) $(_LIBS)
+   $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJECTS) $(OBJECTS_2) $(LIBS)
$(STRIP) $@
+ifeq ($(USE_LANGUAGE_CHOOSER),true)
+   $(MAKE) -C po all-utf
+endif
 
 ifeq (${no_pointerize},)
 __SOURCES = ${SOURCES}
@@ -250,6 +253,12 @@
 
 %.test.o %.o : .translated/%.c
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $
+
+$(UTF_LIBS_BASE)/newt/libnewt.a:
+   $(MAKE) -C $(UTF_LIBS_BASE)/newt
+
+$(UTF_LIBS_BASE)/slang/src/objs/libslang.a:
+   $(MAKE) -C $(UTF_LIBS_BASE)/slang
 
 .PHONY : clean
 clean :
Index: utilities/dbootstrap/boxes.c
===
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/boxes.c,v
retrieving revision 1.46
diff -u -r1.46 boxes.c
--- utilities/dbootstrap/boxes.c2000/09/17 14:04:10 1.46
+++ utilities/dbootstrap/boxes.c2000/10/11 23:54:48
@@ -2,7 +2,13 @@
 #include string.h
 #include signal.h
 #include errno.h
-#include sys/reboot.h
+#ifndef _TESTING_
+# include sys/reboot.h
+#endif
+#ifdef _TESTING_
+# define RB_AUTOBOOT 1
+reboot(int blah);
+#endif
 #include sys/types.h
 #include

Re: Language chooser - patch

2000-10-11 Thread Adam Di Carlo 

On Thu, Oct 12, 2000 at 02:01:16AM +0200, Marcin Owsiany wrote:
 Here is the patch.

Glancing at it, it looks pretty good and should be comitted into the
mainline of the boot-floppies CVS.  It will have no adverse affect if the
LANG_CHOOSER is not being used.

The only grotty thing about it, really, is that it required us to have
bf-utf8 in the same parent dir as the boot-floppies area is, which is
pretty much the best we can do in a bad situation, IMHO.

Aside from the font problems (I wish I had a clue!), the next step is to
build/test and be sure it works.  If that is good, we need to modify the
top-level makefile so that LANG_CHOOSER is enabled by default, *unless*
the kernel in question doesn't support, uh, framebuffer, I think, which
means at least the vanilla and udma66 kernels for i386.  Not sure about
other arches.

-- 
.Adam Di [EMAIL PROTECTED]URL:http://www.onShore.com/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]