svn commit: trunk/busybox: editors include libbb scripts

vda at busybox.net vda at busybox.net
Fri Oct 24 10:49:49 UTC 2008


Author: vda
Date: 2008-10-24 03:49:49 -0700 (Fri, 24 Oct 2008)
New Revision: 23777

Log:
build system cleanup: rename FEATURE_AWK_MATH to FEATURE_AWK_LIBM;
 disable parsing test applet.



Modified:
   trunk/busybox/Config.in
   trunk/busybox/TODO_config_nommu
   trunk/busybox/editors/Config.in
   trunk/busybox/editors/awk.c
   trunk/busybox/include/applets.h
   trunk/busybox/libbb/parse_config.c
   trunk/busybox/scripts/defconfig


Changeset:
Modified: trunk/busybox/Config.in
===================================================================
--- trunk/busybox/Config.in	2008-10-24 10:42:21 UTC (rev 23776)
+++ trunk/busybox/Config.in	2008-10-24 10:49:49 UTC (rev 23777)
@@ -494,8 +494,8 @@
 	  will be supported in head, tail, and fold. (Note: should
 	  affect renice too.)
 
-config PARSE
-	bool "Uniform config file parser debugging applet: parse"
+### config PARSE
+### 	bool "Uniform config file parser debugging applet: parse"
 
 endmenu
 

Modified: trunk/busybox/TODO_config_nommu
===================================================================
--- trunk/busybox/TODO_config_nommu	2008-10-24 10:42:21 UTC (rev 23776)
+++ trunk/busybox/TODO_config_nommu	2008-10-24 10:49:49 UTC (rev 23777)
@@ -58,7 +58,6 @@
 # CONFIG_DMALLOC is not set
 # CONFIG_EFENCE is not set
 CONFIG_INCLUDE_SUSv2=y
-# CONFIG_PARSE is not set
 
 #
 # Installation Options
@@ -306,7 +305,7 @@
 # Editors
 #
 CONFIG_AWK=y
-CONFIG_FEATURE_AWK_MATH=y
+CONFIG_FEATURE_AWK_LIBM=y
 CONFIG_CMP=y
 CONFIG_DIFF=y
 CONFIG_FEATURE_DIFF_BINARY=y

Modified: trunk/busybox/editors/Config.in
===================================================================
--- trunk/busybox/editors/Config.in	2008-10-24 10:42:21 UTC (rev 23776)
+++ trunk/busybox/editors/Config.in	2008-10-24 10:49:49 UTC (rev 23777)
@@ -12,7 +12,7 @@
 	  Awk is used as a pattern scanning and processing language. This is
 	  the BusyBox implementation of that programming language.
 
-config FEATURE_AWK_MATH
+config FEATURE_AWK_LIBM
 	bool "Enable math functions (requires libm)"
 	default n
 	depends on AWK

Modified: trunk/busybox/editors/awk.c
===================================================================
--- trunk/busybox/editors/awk.c	2008-10-24 10:42:21 UTC (rev 23776)
+++ trunk/busybox/editors/awk.c	2008-10-24 10:49:49 UTC (rev 23777)
@@ -512,7 +512,7 @@
 static const char EMSG_NOT_ARRAY[] ALIGN1 = "Not an array";
 static const char EMSG_POSSIBLE_ERROR[] ALIGN1 = "Possible syntax error";
 static const char EMSG_UNDEF_FUNC[] ALIGN1 = "Call to undefined function";
-#if !ENABLE_FEATURE_AWK_MATH
+#if !ENABLE_FEATURE_AWK_LIBM
 static const char EMSG_NO_MATH[] ALIGN1 = "Math support is not compiled in";
 #endif
 
@@ -2024,7 +2024,7 @@
 	switch (info & OPNMASK) {
 
 	case B_a2:
-#if ENABLE_FEATURE_AWK_MATH
+#if ENABLE_FEATURE_AWK_LIBM
 		setvar_i(res, atan2(getvar_i(av[0]), getvar_i(av[1])));
 #else
 		syntax_error(EMSG_NO_MATH);
@@ -2465,7 +2465,7 @@
 			case F_rn:
 				R.d = (double)rand() / (double)RAND_MAX;
 				break;
-#if ENABLE_FEATURE_AWK_MATH
+#if ENABLE_FEATURE_AWK_LIBM
 			case F_co:
 				R.d = cos(L.d);
 				break;
@@ -2633,7 +2633,7 @@
 				L.d /= R.d;
 				break;
 			case '&':
-#if ENABLE_FEATURE_AWK_MATH
+#if ENABLE_FEATURE_AWK_LIBM
 				L.d = pow(L.d, R.d);
 #else
 				syntax_error(EMSG_NO_MATH);

Modified: trunk/busybox/include/applets.h
===================================================================
--- trunk/busybox/include/applets.h	2008-10-24 10:42:21 UTC (rev 23776)
+++ trunk/busybox/include/applets.h	2008-10-24 10:49:49 UTC (rev 23777)
@@ -270,7 +270,7 @@
 USE_NSLOOKUP(APPLET(nslookup, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
 USE_OD(APPLET(od, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
 USE_OPENVT(APPLET(openvt, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
-USE_PARSE(APPLET(parse, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+//USE_PARSE(APPLET(parse, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
 USE_PASSWD(APPLET(passwd, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS))
 USE_PATCH(APPLET(patch, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
 USE_PGREP(APPLET(pgrep, _BB_DIR_USR_BIN, _BB_SUID_NEVER))

Modified: trunk/busybox/libbb/parse_config.c
===================================================================
--- trunk/busybox/libbb/parse_config.c	2008-10-24 10:42:21 UTC (rev 23776)
+++ trunk/busybox/libbb/parse_config.c	2008-10-24 10:49:49 UTC (rev 23777)
@@ -9,7 +9,7 @@
 
 #include "libbb.h"
 
-#if ENABLE_PARSE
+#if defined ENABLE_PARSE && ENABLE_PARSE
 int parse_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int parse_main(int argc UNUSED_PARAM, char **argv)
 {

Modified: trunk/busybox/scripts/defconfig
===================================================================
--- trunk/busybox/scripts/defconfig	2008-10-24 10:42:21 UTC (rev 23776)
+++ trunk/busybox/scripts/defconfig	2008-10-24 10:49:49 UTC (rev 23777)
@@ -58,7 +58,6 @@
 # CONFIG_DMALLOC is not set
 # CONFIG_EFENCE is not set
 CONFIG_INCLUDE_SUSv2=y
-# CONFIG_PARSE is not set
 
 #
 # Installation Options
@@ -304,7 +303,7 @@
 # Editors
 #
 CONFIG_AWK=y
-CONFIG_FEATURE_AWK_MATH=y
+CONFIG_FEATURE_AWK_LIBM=y
 CONFIG_CMP=y
 CONFIG_DIFF=y
 CONFIG_FEATURE_DIFF_BINARY=y




More information about the busybox-cvs mailing list