diff options
| -rw-r--r-- | src/make.configuration.deps | 4 | ||||
| -rwxr-xr-x | src/util/makeblob.pl | 41 | ||||
| -rwxr-xr-x | src/util/makemetablob.pl | 18 |
3 files changed, 29 insertions, 34 deletions
diff --git a/src/make.configuration.deps b/src/make.configuration.deps index 6c52b69..ca933e4 100644 --- a/src/make.configuration.deps +++ b/src/make.configuration.deps @@ -82,7 +82,7 @@ $(TARBALL_DIR)/cactus-flesh-source.o: $(TARBALL_DIR)/cactus-flesh-source.c $(CC) $(CFLAGS) -c -o $@ $^ $(TARBALL_DIR)/cactus-flesh-source.c: $(TARBALL_DIR)/cactus-flesh-source.tar.gz $(CCTK_HOME)/arrangements/AEIThorns/Formaline/src/util/VERSION - $(TARBALL_DIR)/makeblob.pl '' Cactus $(@:%.c=%) < $< > $@ + $(TARBALL_DIR)/makeblob.pl '' Cactus < $< > $@ $(TARBALL_DIR)/cactus-flesh-source.tar.gz: $(TARBALL_DIR)/cactus-flesh-source.files cd $(CCTK_HOME) && \ @@ -127,7 +127,7 @@ $(TARBALL_DIR)/cactus-thorn-source-%.o: $(TARBALL_DIR)/cactus-thorn-source-%.c $(CC) $(CFLAGS) -c -o $@ $^ $(TARBALL_DIR)/cactus-thorn-source-%.c: $(TARBALL_DIR)/cactus-thorn-source-%.tar.gz $(CCTK_HOME)/arrangements/AEIThorns/Formaline/src/util/VERSION - $(TARBALL_DIR)/makeblob.pl $(patsubst %/,%,$(dir $(filter %/$(@:$(TARBALL_DIR)/cactus-thorn-source-%.c=%),$(THORNS)))) $(@:$(TARBALL_DIR)/cactus-thorn-source-%.c=%) $(@:%.c=%) < $< > $@ + $(TARBALL_DIR)/makeblob.pl $(patsubst %/,%,$(dir $(filter %/$(@:$(TARBALL_DIR)/cactus-thorn-source-%.c=%),$(THORNS)))) $(@:$(TARBALL_DIR)/cactus-thorn-source-%.c=%) < $< > $@ $(TARBALL_DIR)/cactus-thorn-source-%.tar.gz: $(TARBALL_DIR)/cactus-thorn-source-%.files cd $(CCTK_HOME) && \ diff --git a/src/util/makeblob.pl b/src/util/makeblob.pl index 11f5aa6..6407537 100755 --- a/src/util/makeblob.pl +++ b/src/util/makeblob.pl @@ -6,14 +6,11 @@ use strict; my $items_per_line = 16; my $items_per_file = 1024 * 1024; -$#ARGV == 2 or die; +$#ARGV == 1 or die; my $arrangement = $ARGV[0]; -$arrangement ne '' or die; my $thorn = $ARGV[1]; $thorn ne '' or die; -my $output = $ARGV[2]; -$output ne '' or die; print <<EOF; /* This is an auto-generated file -- do not edit */ @@ -46,8 +43,8 @@ EOF my $done = 0; for (my $fcount = 0; ! $done; ++ $fcount) { - printf ("\n"); - printf ("static unsigned char const data_%04d [] = {", $fcount); + printf "\n"; + printf "static unsigned char const data_%04d [] = {", $fcount; my $count; for ($count = 0; $count < $items_per_file; ++ $count) { @@ -59,35 +56,33 @@ for (my $fcount = 0; ! $done; ++ $fcount) } if ($count != 0) { - printf (","); + printf ","; } if ($count % $items_per_line == 0) { - printf ("\n"); - printf (" "); + printf "\n"; + printf " "; } - printf ("%3d", ord $ch); + printf "%3d", ord $ch; } - printf ("\n"); - printf ("};\n"); - printf ("\n"); + printf "\n"; + printf "};\n"; + printf "\n"; if (! $done) { - printf ("struct datainfo const cactus_data_%04d_%s;\n", - $fcount + 1, $thorn); + printf "struct datainfo const cactus_data_%04d_%s;\n", $fcount + 1, $thorn; } - printf ("struct datainfo const cactus_data_%04d_%s =\n", - $fcount, $thorn); - printf ("{\n"); - printf (" data_%04d,\n", $fcount); - printf (" %dUL,\n", $count); + printf "struct datainfo const cactus_data_%04d_%s =\n", $fcount, $thorn; + printf "{\n"; + printf " data_%04d,\n", $fcount; + printf " %dUL,\n", $count; if (! $done) { - printf (" & cactus_data_%04d_%s\n", $fcount + 1, $thorn); + printf " & cactus_data_%04d_%s\n", $fcount + 1, $thorn; } else { - printf (" NULL\n"); + printf " NULL\n"; } - printf ("};\n"); + printf "};\n"; } diff --git a/src/util/makemetablob.pl b/src/util/makemetablob.pl index 49ffcde..2f11a75 100755 --- a/src/util/makemetablob.pl +++ b/src/util/makemetablob.pl @@ -26,19 +26,19 @@ EOF for (my $count = 0; $count <= $#ARGV; ++ $count) { - printf ("extern struct sourceinfo cactus_source_%s;\n", $ARGV[$count]); + printf "extern struct sourceinfo cactus_source_%s;\n", $ARGV[$count]; } -printf ("\n"); -printf ("struct sourceinfo const * const cactus_source [] = {"); +printf "\n"; +printf "struct sourceinfo const * const cactus_source [] = {"; for (my $count = 0; $count <= $#ARGV; ++ $count) { if ($count != 0) { - printf (","); + printf ","; } - printf ("\n"); - printf (" & cactus_source_%s", $ARGV[$count]); + printf "\n"; + printf " & cactus_source_%s", $ARGV[$count]; } -printf ("\n"); -printf ("};\n"); -printf ("size_t const cactus_source_length = %d;\n", $#ARGV + 1); +printf "\n"; +printf "};\n"; +printf "size_t const cactus_source_length = %d;\n", $#ARGV + 1; |