Re: Language chooser - patch
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
|porridge@pandora.info.bielsko.pl| 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.c 2000/09/17 14:04:10 1.46
+++ utilities/dbootstrap/boxes.c 2000/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 <fcntl.h>
#include <slang.h>
Index: utilities/dbootstrap/main.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/main.c,v
retrieving revision 1.104
diff -u -r1.104 main.c
--- utilities/dbootstrap/main.c 2000/10/06 09:15:08 1.104
+++ utilities/dbootstrap/main.c 2000/10/11 23:54:49
@@ -4,7 +4,13 @@
#include <errno.h>
#include <sys/ioctl.h>
#include <sys/klog.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 <fcntl.h>
#include <ctype.h>
Index: utilities/dbootstrap/langs/Makefile
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/langs/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- utilities/dbootstrap/langs/Makefile 2000/05/03 18:07:45 1.9
+++ utilities/dbootstrap/langs/Makefile 2000/10/11 23:54:50
@@ -1,4 +1,5 @@
CC = gcc
+include ../../../config
# make parameters...
ifeq ($(USE_LANGUAGE_CHOOSER),true)
@@ -16,10 +17,10 @@
PYTHON_LIB=/usr/lib/python$(PYTHON_VERSION)/config
PYTHON_LIBS=-lpython$(PYTHON_VERSION)
-UTF_BASE=/usr/home/mss/projects/utf8
+UTF_BASE=../../../../bf-utf
ifeq ($(HAVE_UTF_CONSOLE),true)
-CFLAGS += -DHAVE_UTF_CONSOLE
+CFLAGS += -DHAVE_UTF_CONSOLE -I../../../../bf-utf
LANG_GEN_FLAG = 1
LIBS = $(UTF_BASE)/newt-utf/libnewt.a $(UTF_BASE)/slang14/src/objs/libslang.a
else
Index: utilities/dbootstrap/langs/lc.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/langs/lc.c,v
retrieving revision 1.3
diff -u -r1.3 lc.c
--- utilities/dbootstrap/langs/lc.c 2000/04/29 21:18:39 1.3
+++ utilities/dbootstrap/langs/lc.c 2000/10/11 23:54:52
@@ -33,7 +33,7 @@
#include <locale.h>
#include <wchar.h>
-#include "slang14/slang.h"
+#include "slang14/src/slang.h"
#include "newt-utf/newt.h"
#endif
Reply to: