devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Revert r20687 since it breaks make zip.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20692 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonas Häggqvist 2009-04-11 23:20:09 +00:00
parent fbe39975cf
commit a2008f9bde
3 changed files with 15 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tools/buildzip.pl
View file

@ -21,7 +21,7 @@ my $ROOT="..";
my $ziptool="zip -r9"; my $ziptool="zip -r9";
my $output="rockbox.zip"; my $output="rockbox.zip";
my $verbose; my $verbose;
my $install="/dev/null"; my $sim;
my $exe; my $exe;
my $target; my $target;
my $modelname; my $modelname;
@ -75,7 +75,7 @@ GetOptions ( 'r|root=s' => \$ROOT,
'o|output=s' => \$output, 'o|output=s' => \$output,
'f|fonts=s' => \$incfonts, # 0 - no fonts, 1 - fonts only 2 - fonts and package 'f|fonts=s' => \$incfonts, # 0 - no fonts, 1 - fonts only 2 - fonts and package
'v|verbose' => \$verbose, 'v|verbose' => \$verbose,
'install=s' => \$install, # install destination 's|sim' => \$sim,
'rbdir=s' => \$rbdir, # If we want to put in a different directory 'rbdir=s' => \$rbdir, # If we want to put in a different directory
); );
@ -438,11 +438,8 @@ sub runone {
print "$ziptool $output $rbdir $target >/dev/null\n"; print "$ziptool $output $rbdir $target >/dev/null\n";
} }
if($install) { if($sim) {
if ($install =~ /\/dev\/null/) { system("cp -r $rbdir simdisk/ >/dev/null");
die "ERROR: No PREFIX given\n"
}
system("cp -r $rbdir \"$install\" >/dev/null");
} }
else { else {
system("$ziptool $output $rbdir $target >/dev/null"); system("$ziptool $output $rbdir $target >/dev/null");

2
tools/configure vendored
View file

@ -2526,7 +2526,6 @@ sed > Makefile \
-e "s,@LANGS@,${buildlangs},g" \ -e "s,@LANGS@,${buildlangs},g" \
-e "s,@USE_ELF@,${USE_ELF},g" \ -e "s,@USE_ELF@,${USE_ELF},g" \
-e "s,@RBDIR@,${rbdir},g" \ -e "s,@RBDIR@,${rbdir},g" \
-e "s,@PREFIX@,$PREFIX,g" \
-e "s,@CMDLINE@,$cmdline,g" \ -e "s,@CMDLINE@,$cmdline,g" \
<<EOF <<EOF
## Automatically generated. http://www.rockbox.org/ ## Automatically generated. http://www.rockbox.org/
@ -2573,7 +2572,6 @@ export WINDRES=@WINDRES@
export DLLTOOL=@DLLTOOL@ export DLLTOOL=@DLLTOOL@
export DLLWRAP=@DLLWRAP@ export DLLWRAP=@DLLWRAP@
export RANLIB=@RANLIB@ export RANLIB=@RANLIB@
export PREFIX=@PREFIX@
export PROFILE_OPTS=@PROFILE_OPTS@ export PROFILE_OPTS=@PROFILE_OPTS@
export SIMVER=@SIMVER@ export SIMVER=@SIMVER@
export SIMDIR=\$(ROOTDIR)/uisimulator/sdl export SIMDIR=\$(ROOTDIR)/uisimulator/sdl

31
tools/root.make
View file

@ -22,19 +22,6 @@ TOOLS = $(TOOLSDIR)/rdf2binary $(TOOLSDIR)/convbdf \
$(TOOLSDIR)/codepages $(TOOLSDIR)/scramble $(TOOLSDIR)/bmp2rb \ $(TOOLSDIR)/codepages $(TOOLSDIR)/scramble $(TOOLSDIR)/bmp2rb \
$(TOOLSDIR)/uclpack $(TOOLSDIR)/mktccboot $(TOOLSDIR)/mkboot $(TOOLSDIR)/uclpack $(TOOLSDIR)/mktccboot $(TOOLSDIR)/mkboot
ifeq (,$(PREFIX))
ifdef SIMVER
PREFIX = simdisk
INSTALL = --install="$(PREFIX)"
else
# Don't set INSTALL and error out later
INSTALL =
endif
else
INSTALL = --install="$(PREFIX)"
endif
RBINFO = $(BUILDDIR)/rockbox-info.txt RBINFO = $(BUILDDIR)/rockbox-info.txt
# list suffixes to be understood by $* # list suffixes to be understood by $*
@ -82,7 +69,7 @@ endif # bootloader
OBJ := $(SRC:.c=.o) OBJ := $(SRC:.c=.o)
OBJ := $(OBJ:.S=.o) OBJ := $(OBJ:.S=.o)
OBJ += $(BMP:.bmp=.o) OBJ += $(BMP:.bmp=.o)
OBJ := $(subst $(ROOTDIR),$(BUILDDIR),$(OBJ)) OBJ := $(subst $(ROOTDIR),$(BUILDDIR),$(OBJ))
build: $(TOOLS) $(BUILDDIR)/$(BINARY) $(CODECS) $(ROCKS) $(ARCHOSROM) $(RBINFO) build: $(TOOLS) $(BUILDDIR)/$(BINARY) $(CODECS) $(ROCKS) $(ARCHOSROM) $(RBINFO)
@ -267,15 +254,19 @@ voice: voicetools features
endif endif
ifdef SIMVER
install: install:
@echo "Installing your build in your '$(PREFIX)' dir" @echo "Installing your build in your 'simdisk' dir"
$(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \ $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \
$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 0 $(TARGET) $(BINARY) $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -s -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 0 $(TARGET) $(BINARY)
fullinstall: fullinstall:
@echo "Installing a full setup in your '$(PREFIX)' dir" @echo "Installing a full setup in your 'simdisk' dir"
$(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \ $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \
$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY) $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -s -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY)
endif
help: help:
@echo "A few helpful make targets" @echo "A few helpful make targets"
@ -301,8 +292,8 @@ help:
@echo "tools - builds the tools only" @echo "tools - builds the tools only"
@echo "voice - creates the voice clips (voice builds only)" @echo "voice - creates the voice clips (voice builds only)"
@echo "voicetools - builds the voice tools only" @echo "voicetools - builds the voice tools only"
@echo "install - installs your build (at PREFIX, defaults to simdisk/ for simulators (no fonts))" @echo "install - installs your build (for simulator builds only, no fonts)"
@echo "fullinstall - installs your build (like install, but with fonts)" @echo "fullinstall - installs your build (for simulator builds only, with fonts)"
@echo "reconf - rerun configure with the same selection" @echo "reconf - rerun configure with the same selection"
### general compile rules: ### general compile rules: