You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by fu...@apache.org on 2011/03/18 02:08:18 UTC
svn commit: r1082778 [4/4] - in /apr: apr-util/branches/1.3.x/
apr-util/branches/1.3.x/dbd/ apr-util/branches/1.3.x/dbm/
apr-util/branches/1.3.x/ldap/ apr-util/branches/1.3.x/test/
apr-util/branches/1.3.x/xml/ apr-util/branches/1.3.x/xml/expat/lib/ apr...
Modified: apr/apr/branches/1.5.x/test/NWGNUproc_child
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/test/NWGNUproc_child?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/test/NWGNUproc_child (original)
+++ apr/apr/branches/1.5.x/test/NWGNUproc_child Fri Mar 18 01:08:15 2011
@@ -8,7 +8,7 @@
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#
@@ -92,7 +92,7 @@ endif
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
-NLM_NAME = proc_child
+NLM_NAME = proc_child
#
# This is used by the link '-desc ' directive.
@@ -114,9 +114,9 @@ NLM_SCREEN_NAME = DEFAULT
#
# If this is specified, it will override VERSION value in
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
#
-NLM_VERSION = 1,0,0
+NLM_VERSION =
#
# If this is specified, it will override the default of 64K
@@ -126,12 +126,12 @@ NLM_STACK_SIZE =
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -141,7 +141,7 @@ NLM_CHECK_SYM =
#
# If this is specified it will be used by the link '-flags' directive
#
-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
+NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
#
# If this is specified it will be linked in with the XDCData option in the def
@@ -180,7 +180,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
#
@@ -211,7 +211,7 @@ FILE_nlm_copyright =
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
+ @aprlib.imp \
@libc.imp \
$(EOLIST)
@@ -238,7 +238,7 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
@@ -251,5 +251,5 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr/branches/1.5.x/test/NWGNUreadchild
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/test/NWGNUreadchild?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/test/NWGNUreadchild (original)
+++ apr/apr/branches/1.5.x/test/NWGNUreadchild Fri Mar 18 01:08:15 2011
@@ -8,7 +8,7 @@
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#
@@ -92,7 +92,7 @@ endif
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
-NLM_NAME = readchild
+NLM_NAME = readchild
#
# This is used by the link '-desc ' directive.
@@ -114,9 +114,9 @@ NLM_SCREEN_NAME = DEFAULT
#
# If this is specified, it will override VERSION value in
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
#
-NLM_VERSION = 1,0,0
+NLM_VERSION =
#
# If this is specified, it will override the default of 64K
@@ -126,12 +126,12 @@ NLM_STACK_SIZE =
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -141,7 +141,7 @@ NLM_CHECK_SYM =
#
# If this is specified it will be used by the link '-flags' directive
#
-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
+NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
#
# If this is specified it will be linked in with the XDCData option in the def
@@ -180,7 +180,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
#
@@ -211,7 +211,7 @@ FILE_nlm_copyright =
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
+ @aprlib.imp \
@libc.imp \
$(EOLIST)
@@ -238,7 +238,7 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
@@ -251,5 +251,5 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr/branches/1.5.x/test/NWGNUsockchild
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/test/NWGNUsockchild?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/test/NWGNUsockchild (original)
+++ apr/apr/branches/1.5.x/test/NWGNUsockchild Fri Mar 18 01:08:15 2011
@@ -8,7 +8,7 @@
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#
@@ -92,7 +92,7 @@ endif
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
-NLM_NAME = sockchild
+NLM_NAME = sockchild
#
# This is used by the link '-desc ' directive.
@@ -114,9 +114,9 @@ NLM_SCREEN_NAME = DEFAULT
#
# If this is specified, it will override VERSION value in
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
#
-NLM_VERSION = 1,0,0
+NLM_VERSION =
#
# If this is specified, it will override the default of 64K
@@ -126,12 +126,12 @@ NLM_STACK_SIZE =
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -141,7 +141,7 @@ NLM_CHECK_SYM =
#
# If this is specified it will be used by the link '-flags' directive
#
-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
+NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
#
# If this is specified it will be linked in with the XDCData option in the def
@@ -180,7 +180,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
#
@@ -211,7 +211,7 @@ FILE_nlm_copyright =
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
+ @aprlib.imp \
@libc.imp \
$(EOLIST)
@@ -238,7 +238,7 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
@@ -251,5 +251,5 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr/branches/1.5.x/test/NWGNUsockperf
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/test/NWGNUsockperf?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/test/NWGNUsockperf (original)
+++ apr/apr/branches/1.5.x/test/NWGNUsockperf Fri Mar 18 01:08:15 2011
@@ -123,12 +123,12 @@ NLM_STACK_SIZE =
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -178,7 +178,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
#
@@ -209,7 +209,7 @@ FILE_nlm_copyright =
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
+ @aprlib.imp \
@libc.imp \
$(EOLIST)
Modified: apr/apr/branches/1.5.x/test/NWGNUtestatmc
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/test/NWGNUtestatmc?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/test/NWGNUtestatmc (original)
+++ apr/apr/branches/1.5.x/test/NWGNUtestatmc Fri Mar 18 01:08:15 2011
@@ -8,7 +8,7 @@
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#
@@ -89,12 +89,12 @@ endif
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
-NLM_NAME =testatmc
+NLM_NAME = testatmc
#
# This is used by the link '-desc ' directive.
# If left blank, NLM_NAME will be used.
#
-NLM_DESCRIPTION = NLM is to test the atomic functions
+NLM_DESCRIPTION = NLM is to test the atomic functions
#
# This is used by the '-threadname' directive. If left blank,
@@ -110,9 +110,9 @@ NLM_SCREEN_NAME = testatmc
#
# If this is specified, it will override VERSION value in
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
#
-NLM_VERSION = 1,0,0
+NLM_VERSION =
#
# If this is specified, it will override the default of 64K
@@ -122,12 +122,12 @@ NLM_STACK_SIZE =
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -137,7 +137,7 @@ NLM_CHECK_SYM =
#
# If this is specified it will be used by the link '-flags' directive
#
-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
+NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
#
# If this is specified it will be linked in with the XDCData option in the def
@@ -179,7 +179,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
#
@@ -211,7 +211,7 @@ FILE_nlm_copyright =
#
FILES_nlm_Ximports = \
@libc.imp \
- @$(APR)/aprlib.imp \
+ @aprlib.imp \
$(EOLIST)
#
@@ -237,7 +237,7 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
@@ -251,5 +251,5 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr/branches/1.5.x/test/NWGNUtryread
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/test/NWGNUtryread?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/test/NWGNUtryread (original)
+++ apr/apr/branches/1.5.x/test/NWGNUtryread Fri Mar 18 01:08:15 2011
@@ -8,7 +8,7 @@
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#
@@ -92,13 +92,13 @@ endif
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
-NLM_NAME = tryread
+NLM_NAME = tryread
#
# This is used by the link '-desc ' directive.
# If left blank, NLM_NAME will be used.
#
-NLM_DESCRIPTION = reader NLM to test flock
+NLM_DESCRIPTION = reader NLM to test flock
#
# This is used by the '-threadname' directive. If left blank,
@@ -114,9 +114,9 @@ NLM_SCREEN_NAME = DEFAULT
#
# If this is specified, it will override VERSION value in
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
#
-NLM_VERSION = 1,0,0
+NLM_VERSION =
#
# If this is specified, it will override the default of 64K
@@ -126,12 +126,12 @@ NLM_STACK_SIZE =
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -141,7 +141,7 @@ NLM_CHECK_SYM =
#
# If this is specified it will be used by the link '-flags' directive
#
-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
+NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
#
# If this is specified it will be linked in with the XDCData option in the def
@@ -180,7 +180,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
#
@@ -211,7 +211,7 @@ FILE_nlm_copyright =
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
+ @aprlib.imp \
@libc.imp \
$(EOLIST)
@@ -238,7 +238,7 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
@@ -251,5 +251,5 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr/branches/1.5.x/test/nw_misc.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/test/nw_misc.c?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/test/nw_misc.c (original)
+++ apr/apr/branches/1.5.x/test/nw_misc.c Fri Mar 18 01:08:15 2011
@@ -1,4 +1,6 @@
+#include <stdio.h>
#include <stdlib.h>
+#include <screen.h>
/*
#include "testutil.h"
*/
@@ -6,6 +8,7 @@
/* function to keep the screen open if not launched from bash */
void _NonAppStop( void )
{
+ if (getenv("_IN_NETWARE_BASH_") == NULL) {
printf("\r\n<Press any key to close screen> ");
getcharacter();
}