svn commit: trunk/busybox: applets scripts

vda at busybox.net vda at busybox.net
Thu Oct 19 22:12:47 UTC 2006


Author: vda
Date: 2006-10-19 15:12:47 -0700 (Thu, 19 Oct 2006)
New Revision: 16408

Log:
move usage_compressed.h generation into applets/


Added:
   trunk/busybox/applets/usage.c
   trunk/busybox/applets/usage_compressed

Removed:
   trunk/busybox/scripts/usage.c
   trunk/busybox/scripts/usage_compressed

Modified:
   trunk/busybox/applets/Kbuild
   trunk/busybox/scripts/Kbuild


Changeset:
Modified: trunk/busybox/applets/Kbuild
===================================================================
--- trunk/busybox/applets/Kbuild	2006-10-19 22:11:06 UTC (rev 16407)
+++ trunk/busybox/applets/Kbuild	2006-10-19 22:12:47 UTC (rev 16408)
@@ -12,7 +12,10 @@
 
 applets/applets.o: include/usage_compressed.h
 
-include/usage_compressed.h: $(srctree)/include/usage.h
-	@$(MAKE) $(build)=scripts
+hostprogs-y += usage
+always := $(hostprogs-y)
+HOSTCFLAGS_usage.o = -I$(srctree)/include
+
+include/usage_compressed.h: $(srctree)/include/usage.h applets/usage
 	@echo '  GEN     include/usage_compressed.h'
-	@$(srctree)/scripts/usage_compressed include/usage_compressed.h scripts
+	@$(srctree)/applets/usage_compressed include/usage_compressed.h applets

Added: trunk/busybox/applets/usage.c
===================================================================
--- trunk/busybox/applets/usage.c	2006-10-19 22:11:06 UTC (rev 16407)
+++ trunk/busybox/applets/usage.c	2006-10-19 22:12:47 UTC (rev 16408)
@@ -0,0 +1,17 @@
+/* vi: set sw=4 ts=4: */
+#include <unistd.h>
+
+#include "../include/autoconf.h"
+#include "../include/busybox.h"
+
+static const char usage_messages[] =
+#define MAKE_USAGE
+#include "usage.h"
+#include "applets.h"
+;
+
+int main(void)
+{
+	write(1, usage_messages, sizeof(usage_messages));
+	return 0;
+}

Added: trunk/busybox/applets/usage_compressed
===================================================================
--- trunk/busybox/applets/usage_compressed	2006-10-19 22:11:06 UTC (rev 16407)
+++ trunk/busybox/applets/usage_compressed	2006-10-19 22:12:47 UTC (rev 16408)
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+target="$1"
+loc="$2"
+
+test "$target" || exit 1
+test "$loc" || loc=.
+test -x "$loc/usage" || exit 1
+test "$SED" || SED=sed
+
+sz=`"$loc/usage" | wc -c` || exit 1
+
+exec >"$target"
+
+echo 'static const char packed_usage[] = '
+"$loc/usage" | bzip2 -1 | od -v -t x1 \
+| $SED -e 's/^[^ ]*//' -e 's/ \(..\)/\\x\1/g' -e 's/^\(.*\)$/"\1"/'
+echo ';'
+echo '#define SIZEOF_usage_messages' `expr 0 + $sz`


Property changes on: trunk/busybox/applets/usage_compressed
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/busybox/scripts/Kbuild
===================================================================
--- trunk/busybox/scripts/Kbuild	2006-10-19 22:11:06 UTC (rev 16407)
+++ trunk/busybox/scripts/Kbuild	2006-10-19 22:12:47 UTC (rev 16408)
@@ -3,11 +3,5 @@
 # the kernel for the build process.
 # ---------------------------------------------------------------------------
 
-hostprogs-y += usage
-
-always := $(hostprogs-y)
-
 # Let clean descend into subdirs
 subdir- += basic kconfig
-
-HOSTCFLAGS_usage.o = -I$(srctree)/include

Deleted: trunk/busybox/scripts/usage.c
===================================================================
--- trunk/busybox/scripts/usage.c	2006-10-19 22:11:06 UTC (rev 16407)
+++ trunk/busybox/scripts/usage.c	2006-10-19 22:12:47 UTC (rev 16408)
@@ -1,17 +0,0 @@
-/* vi: set sw=4 ts=4: */
-#include <unistd.h>
-
-#include "../include/autoconf.h"
-#include "../include/busybox.h"
-
-static const char usage_messages[] =
-#define MAKE_USAGE
-#include "usage.h"
-#include "applets.h"
-;
-
-int main(void)
-{
-	write(1, usage_messages, sizeof(usage_messages));
-	return 0;
-}

Deleted: trunk/busybox/scripts/usage_compressed
===================================================================
--- trunk/busybox/scripts/usage_compressed	2006-10-19 22:11:06 UTC (rev 16407)
+++ trunk/busybox/scripts/usage_compressed	2006-10-19 22:12:47 UTC (rev 16408)
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-target="$1"
-loc="$2"
-
-test "$target" || exit 1
-test "$loc" || loc=.
-test -x "$loc/usage" || exit 1
-test "$SED" || SED=sed
-
-sz=`"$loc/usage" | wc -c` || exit 1
-
-exec >"$target"
-
-echo 'static const char packed_usage[] = '
-"$loc/usage" | bzip2 -1 | od -v -t x1 \
-| $SED -e 's/^[^ ]*//' -e 's/ \(..\)/\\x\1/g' -e 's/^\(.*\)$/"\1"/'
-echo ';'
-echo '#define SIZEOF_usage_messages' `expr 0 + $sz`




More information about the busybox-cvs mailing list