diff options
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/buildzip.pl | 11 | ||||
-rwxr-xr-x | tools/configure | 2 | ||||
-rw-r--r-- | tools/root.make | 31 |
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=".."; | |||
21 | my $ziptool="zip -r9"; | 21 | my $ziptool="zip -r9"; |
22 | my $output="rockbox.zip"; | 22 | my $output="rockbox.zip"; |
23 | my $verbose; | 23 | my $verbose; |
24 | my $install="/dev/null"; | 24 | my $sim; |
25 | my $exe; | 25 | my $exe; |
26 | my $target; | 26 | my $target; |
27 | my $modelname; | 27 | my $modelname; |
@@ -75,7 +75,7 @@ GetOptions ( 'r|root=s' => \$ROOT, | |||
75 | 'o|output=s' => \$output, | 75 | 'o|output=s' => \$output, |
76 | 'f|fonts=s' => \$incfonts, # 0 - no fonts, 1 - fonts only 2 - fonts and package | 76 | 'f|fonts=s' => \$incfonts, # 0 - no fonts, 1 - fonts only 2 - fonts and package |
77 | 'v|verbose' => \$verbose, | 77 | 'v|verbose' => \$verbose, |
78 | 'install=s' => \$install, # install destination | 78 | 's|sim' => \$sim, |
79 | 'rbdir=s' => \$rbdir, # If we want to put in a different directory | 79 | 'rbdir=s' => \$rbdir, # If we want to put in a different directory |
80 | ); | 80 | ); |
81 | 81 | ||
@@ -438,11 +438,8 @@ sub runone { | |||
438 | print "$ziptool $output $rbdir $target >/dev/null\n"; | 438 | print "$ziptool $output $rbdir $target >/dev/null\n"; |
439 | } | 439 | } |
440 | 440 | ||
441 | if($install) { | 441 | if($sim) { |
442 | if ($install =~ /\/dev\/null/) { | 442 | system("cp -r $rbdir simdisk/ >/dev/null"); |
443 | die "ERROR: No PREFIX given\n" | ||
444 | } | ||
445 | system("cp -r $rbdir \"$install\" >/dev/null"); | ||
446 | } | 443 | } |
447 | else { | 444 | else { |
448 | system("$ziptool $output $rbdir $target >/dev/null"); | 445 | 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 \ | |||
2526 | -e "s,@LANGS@,${buildlangs},g" \ | 2526 | -e "s,@LANGS@,${buildlangs},g" \ |
2527 | -e "s,@USE_ELF@,${USE_ELF},g" \ | 2527 | -e "s,@USE_ELF@,${USE_ELF},g" \ |
2528 | -e "s,@RBDIR@,${rbdir},g" \ | 2528 | -e "s,@RBDIR@,${rbdir},g" \ |
2529 | -e "s,@PREFIX@,$PREFIX,g" \ | ||
2530 | -e "s,@CMDLINE@,$cmdline,g" \ | 2529 | -e "s,@CMDLINE@,$cmdline,g" \ |
2531 | <<EOF | 2530 | <<EOF |
2532 | ## Automatically generated. http://www.rockbox.org/ | 2531 | ## Automatically generated. http://www.rockbox.org/ |
@@ -2573,7 +2572,6 @@ export WINDRES=@WINDRES@ | |||
2573 | export DLLTOOL=@DLLTOOL@ | 2572 | export DLLTOOL=@DLLTOOL@ |
2574 | export DLLWRAP=@DLLWRAP@ | 2573 | export DLLWRAP=@DLLWRAP@ |
2575 | export RANLIB=@RANLIB@ | 2574 | export RANLIB=@RANLIB@ |
2576 | export PREFIX=@PREFIX@ | ||
2577 | export PROFILE_OPTS=@PROFILE_OPTS@ | 2575 | export PROFILE_OPTS=@PROFILE_OPTS@ |
2578 | export SIMVER=@SIMVER@ | 2576 | export SIMVER=@SIMVER@ |
2579 | export SIMDIR=\$(ROOTDIR)/uisimulator/sdl | 2577 | 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 \ | |||
22 | $(TOOLSDIR)/codepages $(TOOLSDIR)/scramble $(TOOLSDIR)/bmp2rb \ | 22 | $(TOOLSDIR)/codepages $(TOOLSDIR)/scramble $(TOOLSDIR)/bmp2rb \ |
23 | $(TOOLSDIR)/uclpack $(TOOLSDIR)/mktccboot $(TOOLSDIR)/mkboot | 23 | $(TOOLSDIR)/uclpack $(TOOLSDIR)/mktccboot $(TOOLSDIR)/mkboot |
24 | 24 | ||
25 | |||
26 | ifeq (,$(PREFIX)) | ||
27 | ifdef SIMVER | ||
28 | PREFIX = simdisk | ||
29 | INSTALL = --install="$(PREFIX)" | ||
30 | else | ||
31 | # Don't set INSTALL and error out later | ||
32 | INSTALL = | ||
33 | endif | ||
34 | else | ||
35 | INSTALL = --install="$(PREFIX)" | ||
36 | endif | ||
37 | |||
38 | RBINFO = $(BUILDDIR)/rockbox-info.txt | 25 | RBINFO = $(BUILDDIR)/rockbox-info.txt |
39 | 26 | ||
40 | # list suffixes to be understood by $* | 27 | # list suffixes to be understood by $* |
@@ -82,7 +69,7 @@ endif # bootloader | |||
82 | OBJ := $(SRC:.c=.o) | 69 | OBJ := $(SRC:.c=.o) |
83 | OBJ := $(OBJ:.S=.o) | 70 | OBJ := $(OBJ:.S=.o) |
84 | OBJ += $(BMP:.bmp=.o) | 71 | OBJ += $(BMP:.bmp=.o) |
85 | OBJ := $(subst $(ROOTDIR),$(BUILDDIR),$(OBJ)) | 72 | OBJ := $(subst $(ROOTDIR),$(BUILDDIR),$(OBJ)) |
86 | 73 | ||
87 | build: $(TOOLS) $(BUILDDIR)/$(BINARY) $(CODECS) $(ROCKS) $(ARCHOSROM) $(RBINFO) | 74 | build: $(TOOLS) $(BUILDDIR)/$(BINARY) $(CODECS) $(ROCKS) $(ARCHOSROM) $(RBINFO) |
88 | 75 | ||
@@ -267,15 +254,19 @@ voice: voicetools features | |||
267 | 254 | ||
268 | endif | 255 | endif |
269 | 256 | ||
257 | ifdef SIMVER | ||
258 | |||
270 | install: | 259 | install: |
271 | @echo "Installing your build in your '$(PREFIX)' dir" | 260 | @echo "Installing your build in your 'simdisk' dir" |
272 | $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \ | 261 | $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \ |
273 | $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 0 $(TARGET) $(BINARY) | 262 | $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -s -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 0 $(TARGET) $(BINARY) |
274 | 263 | ||
275 | fullinstall: | 264 | fullinstall: |
276 | @echo "Installing a full setup in your '$(PREFIX)' dir" | 265 | @echo "Installing a full setup in your 'simdisk' dir" |
277 | $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \ | 266 | $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \ |
278 | $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY) | 267 | $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -s -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY) |
268 | |||
269 | endif | ||
279 | 270 | ||
280 | help: | 271 | help: |
281 | @echo "A few helpful make targets" | 272 | @echo "A few helpful make targets" |
@@ -301,8 +292,8 @@ help: | |||
301 | @echo "tools - builds the tools only" | 292 | @echo "tools - builds the tools only" |
302 | @echo "voice - creates the voice clips (voice builds only)" | 293 | @echo "voice - creates the voice clips (voice builds only)" |
303 | @echo "voicetools - builds the voice tools only" | 294 | @echo "voicetools - builds the voice tools only" |
304 | @echo "install - installs your build (at PREFIX, defaults to simdisk/ for simulators (no fonts))" | 295 | @echo "install - installs your build (for simulator builds only, no fonts)" |
305 | @echo "fullinstall - installs your build (like install, but with fonts)" | 296 | @echo "fullinstall - installs your build (for simulator builds only, with fonts)" |
306 | @echo "reconf - rerun configure with the same selection" | 297 | @echo "reconf - rerun configure with the same selection" |
307 | 298 | ||
308 | ### general compile rules: | 299 | ### general compile rules: |