summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJonas Häggqvist <rasher@rasher.dk>2009-04-11 23:20:09 +0000
committerJonas Häggqvist <rasher@rasher.dk>2009-04-11 23:20:09 +0000
commita2008f9bdeed215256d8762d378397c8e417f7df (patch)
tree24a2498b64bc6314851fe463796217ca8449c5b1 /tools
parentfbe39975cfcce5b297cd54ff2952dd6cecebe3eb (diff)
downloadrockbox-a2008f9bdeed215256d8762d378397c8e417f7df.tar.gz
rockbox-a2008f9bdeed215256d8762d378397c8e417f7df.tar.bz2
rockbox-a2008f9bdeed215256d8762d378397c8e417f7df.zip
Revert r20687 since it breaks make zip.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20692 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
-rwxr-xr-xtools/buildzip.pl11
-rwxr-xr-xtools/configure2
-rw-r--r--tools/root.make31
3 files changed, 15 insertions, 29 deletions
diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index c32733bcd9..7df6af3a36 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -21,7 +21,7 @@ my $ROOT="..";
my $ziptool="zip -r9";
my $output="rockbox.zip";
my $verbose;
-my $install="/dev/null";
+my $sim;
my $exe;
my $target;
my $modelname;
@@ -75,7 +75,7 @@ GetOptions ( 'r|root=s' => \$ROOT,
'o|output=s' => \$output,
'f|fonts=s' => \$incfonts, # 0 - no fonts, 1 - fonts only 2 - fonts and package
'v|verbose' => \$verbose,
- 'install=s' => \$install, # install destination
+ 's|sim' => \$sim,
'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";
}
- if($install) {
- if ($install =~ /\/dev\/null/) {
- die "ERROR: No PREFIX given\n"
- }
- system("cp -r $rbdir \"$install\" >/dev/null");
+ if($sim) {
+ system("cp -r $rbdir simdisk/ >/dev/null");
}
else {
system("$ziptool $output $rbdir $target >/dev/null");
diff --git a/tools/configure b/tools/configure
index 72d0c79950..44ae3e524f 100755
--- a/tools/configure
+++ b/tools/configure
@@ -2526,7 +2526,6 @@ sed > Makefile \
-e "s,@LANGS@,${buildlangs},g" \
-e "s,@USE_ELF@,${USE_ELF},g" \
-e "s,@RBDIR@,${rbdir},g" \
- -e "s,@PREFIX@,$PREFIX,g" \
-e "s,@CMDLINE@,$cmdline,g" \
<<EOF
## Automatically generated. http://www.rockbox.org/
@@ -2573,7 +2572,6 @@ export WINDRES=@WINDRES@
export DLLTOOL=@DLLTOOL@
export DLLWRAP=@DLLWRAP@
export RANLIB=@RANLIB@
-export PREFIX=@PREFIX@
export PROFILE_OPTS=@PROFILE_OPTS@
export SIMVER=@SIMVER@
export SIMDIR=\$(ROOTDIR)/uisimulator/sdl
diff --git a/tools/root.make b/tools/root.make
index 9f4890e1f4..803a5d53b3 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -22,19 +22,6 @@ TOOLS = $(TOOLSDIR)/rdf2binary $(TOOLSDIR)/convbdf \
$(TOOLSDIR)/codepages $(TOOLSDIR)/scramble $(TOOLSDIR)/bmp2rb \
$(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
# list suffixes to be understood by $*
@@ -82,7 +69,7 @@ endif # bootloader
OBJ := $(SRC:.c=.o)
OBJ := $(OBJ:.S=.o)
OBJ += $(BMP:.bmp=.o)
-OBJ := $(subst $(ROOTDIR),$(BUILDDIR),$(OBJ))
+OBJ := $(subst $(ROOTDIR),$(BUILDDIR),$(OBJ))
build: $(TOOLS) $(BUILDDIR)/$(BINARY) $(CODECS) $(ROCKS) $(ARCHOSROM) $(RBINFO)
@@ -267,15 +254,19 @@ voice: voicetools features
endif
+ifdef SIMVER
+
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; \
- $(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:
- @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; \
- $(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:
@echo "A few helpful make targets"
@@ -301,8 +292,8 @@ help:
@echo "tools - builds the tools only"
@echo "voice - creates the voice clips (voice builds only)"
@echo "voicetools - builds the voice tools only"
- @echo "install - installs your build (at PREFIX, defaults to simdisk/ for simulators (no fonts))"
- @echo "fullinstall - installs your build (like install, but with fonts)"
+ @echo "install - installs your build (for simulator builds only, no fonts)"
+ @echo "fullinstall - installs your build (for simulator builds only, with fonts)"
@echo "reconf - rerun configure with the same selection"
### general compile rules: