summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2008-02-17 23:12:54 +0000
committerDaniel Stenberg <daniel@haxx.se>2008-02-17 23:12:54 +0000
commit4a06c87e7869bb2703c0b0181d3816ba73dff9ff (patch)
tree5d9c1ea2e534337d548ec97568a23615a56e9d1b /tools
parent8c81e789cc7da214db5a5c1a3aa3698375a400e3 (diff)
downloadrockbox-4a06c87e7869bb2703c0b0181d3816ba73dff9ff.tar.gz
rockbox-4a06c87e7869bb2703c0b0181d3816ba73dff9ff.tar.bz2
rockbox-4a06c87e7869bb2703c0b0181d3816ba73dff9ff.zip
FS#8482:
Build system tweak that builds all languages first, to make the system able to use a buffer size that fits the larger language only. Parts of this work done by Jonas Haggqvist, but all the mistakes are my own! git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16337 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
-rwxr-xr-xtools/buildzip.pl35
-rwxr-xr-xtools/configure10
-rw-r--r--tools/make.inc3
-rw-r--r--tools/makesrc.inc4
4 files changed, 13 insertions, 39 deletions
diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index 4c21ae819f..4faa38ac54 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -154,30 +154,6 @@ sub filesize {
return $size;
}
-sub buildlangs {
- my ($outputlang)=@_;
- my $dir = "$ROOT/apps/lang";
- opendir(DIR, $dir);
- my @files = grep { /\.lang$/ } readdir(DIR);
- closedir(DIR);
-
- # Exclude some bad languages (uncomment and adjust in case of release
- # and/or End Times)
- # @files = grep(!/(afrikaans|hindi|slovenscina|turkce)\.lang/, @files);
-
- # Exclude more languages on the player which won't work on charcell display
- if ($archos =~ /^"?player:/ ) {
- @files = grep(!/(chinese-simp|chinese-trad|hindi|japanese|korean|thai)\.lang/, @files);
- }
-
- for(@files) {
- my $output = $_;
- $output =~ s/(.*)\.lang/$1.lng/;
- print "$ROOT/tools/genlang -e=$dir/english.lang -t=$archos -i=$target_id -b=$outputlang/$output $dir/$_\n" if($verbose);
- system ("$ROOT/tools/genlang -e=$dir/english.lang -t=$archos -i=$target_id -b=$outputlang/$output $dir/$_ >/dev/null 2>&1");
- }
-}
-
sub buildzip {
my ($zip, $image, $fonts)=@_;
@@ -413,15 +389,8 @@ STOP
# and the info file
system("cp rockbox-info.txt .rockbox/");
- # now copy the file made for reading on the unit:
- #if($notplayer) {
- # `cp $webroot/docs/Help-JBR.txt .rockbox/docs/`;
- #}
- #else {
- # `cp $webroot/docs/Help-Stu.txt .rockbox/docs/`;
- #}
-
- buildlangs(".rockbox/langs");
+ # copy the already built lng files
+ `cp apps/lang/*lng .rockbox/langs/`
}
diff --git a/tools/configure b/tools/configure
index 49773e1a6f..b46f175f6a 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1919,14 +1919,14 @@ export ENCODER=@ENCODER@
# Do not print "Entering directory ..."
MAKEFLAGS += --no-print-directory
-.PHONY: all clean tags zip tools manual bin build info
+.PHONY: all clean tags zip tools manual bin build info langs
all: info
info: build
\$(SILENT)\$(TOOLSDIR)/mkinfo.pl \$(BUILDDIR)/rockbox-info.txt
-build: tools
+build: tools langs
@SIMUL1@
@SIMUL2@
\$(SILENT)\$(MAKE) -C \$(FIRMDIR) OBJDIR=\$(BUILDDIR)/firmware
@@ -1952,7 +1952,7 @@ clean:
manual *.pdf *.a credits.raw @OUTPUT@ bitmaps pluginbitmaps \
@ARCHOSROM@ @FLASHFILE@ UI256.bmp rockbox-full.zip \
html txt rockbox-manual*.zip sysfont.h rockbox-info.txt \
- voicefontids *.wav *.mp3 *.voice
+ voicefontids *.wav *.mp3 *.voice max_language_size.h
tools:
\$(SILENT)\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) AR=\$(HOSTAR) @TOOLSET@
@@ -1996,6 +1996,10 @@ bzip2: tar
gzip: tar
\$(SILENT)gzip -f9 rockbox.tar
+langs: features
+ \$(SILENT)mkdir -p \$(BUILDDIR)/apps/lang
+ \$(SILENT)\$(MAKE) -C \$(APPSDIR)/lang OBJDIR=\$(BUILDDIR)/apps/lang
+
manual: manual-pdf
manual-pdf:
\$(SILENT)\$(MAKE) -C \$(MANUALDIR) OBJDIR=\$(BUILDDIR)/manual manual-pdf
diff --git a/tools/make.inc b/tools/make.inc
index 8e125c834e..30d0779b2d 100644
--- a/tools/make.inc
+++ b/tools/make.inc
@@ -40,7 +40,8 @@ $(DEPFILE): $(SOURCES)
rm $$del; \
del=""; \
fi \
- done | sed -e "s:[^[:space:]]*lang.h:$(OBJDIR)/lang.o:" > $(DEPFILE); \
+ done | sed -e "s:[^[:space:]]*lang.h:$(OBJDIR)/lang.o:" \
+ -e "s:[^[:space:]]*sysfont.h:$(BUILDDIR)/sysfont.h:" > $(DEPFILE); \
echo "oo" > /dev/null )
tags:
diff --git a/tools/makesrc.inc b/tools/makesrc.inc
index 78d97f3283..846df8cb9e 100644
--- a/tools/makesrc.inc
+++ b/tools/makesrc.inc
@@ -10,5 +10,5 @@
# to make this do right when used on Mac OS X.
SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) \
-$(TARGET) $(DEFINES) $(EXTRA_DEFINES) -E -P -include "config.h" - | \
-grep -v "^\#")
+$(TARGET) $(DEFINES) $(EXTRA_DEFINES) -E -P -include "config.h" - 2>/dev/null \
+| grep -v "^\#")