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 2009/10/05 19:21:17 UTC
svn commit: r821929 - in /apr/apr/trunk/test: NWGNUaprtest NWGNUechod
NWGNUglobalmutexchild NWGNUmakefile NWGNUmod_test NWGNUproc_child
NWGNUreadchild NWGNUsockchild NWGNUsockperf NWGNUtestatmc NWGNUtryread
nw_misc.c
Author: fuankg
Date: Mon Oct 5 17:21:16 2009
New Revision: 821929
URL: http://svn.apache.org/viewvc?rev=821929&view=rev
Log:
improved NetWare build of test samples.
Added:
apr/apr/trunk/test/NWGNUechod (with props)
apr/apr/trunk/test/NWGNUsockperf (with props)
Modified:
apr/apr/trunk/test/NWGNUaprtest
apr/apr/trunk/test/NWGNUglobalmutexchild
apr/apr/trunk/test/NWGNUmakefile
apr/apr/trunk/test/NWGNUmod_test
apr/apr/trunk/test/NWGNUproc_child
apr/apr/trunk/test/NWGNUreadchild
apr/apr/trunk/test/NWGNUsockchild
apr/apr/trunk/test/NWGNUtestatmc
apr/apr/trunk/test/NWGNUtryread
apr/apr/trunk/test/nw_misc.c
Modified: apr/apr/trunk/test/NWGNUaprtest
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUaprtest?rev=821929&r1=821928&r2=821929&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUaprtest (original)
+++ apr/apr/trunk/test/NWGNUaprtest Mon Oct 5 17:21:16 2009
@@ -101,13 +101,13 @@
# This is used by the '-threadname' directive. If left blank,
# NLM_NAME Thread will be used.
#
-NLM_THREAD_NAME = aprtest
+NLM_THREAD_NAME = $(NLM_NAME)
#
# This is used by the '-screenname' directive. If left blank,
# 'Apache for NetWare' Thread will be used.
#
-NLM_SCREEN_NAME = aprtest
+NLM_SCREEN_NAME = $(NLM_NAME)
#
# If this is specified, it will override VERSION value in
@@ -275,9 +275,8 @@
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @libc.imp \
- @netware.imp \
@$(APR)/aprlib.imp \
+ @libc.imp \
$(EOLIST)
# Include the Winsock imports if Winsock is being used
Added: apr/apr/trunk/test/NWGNUechod
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUechod?rev=821929&view=auto
==============================================================================
--- apr/apr/trunk/test/NWGNUechod (added)
+++ apr/apr/trunk/test/NWGNUechod Mon Oct 5 17:21:16 2009
@@ -0,0 +1,253 @@
+#
+# Make sure all needed macro's are defined
+#
+
+#
+# Get the 'head' of the build environment if necessary. This includes default
+# targets and paths to tools
+#
+
+ifndef EnvironmentDefined
+include $(APR_WORK)/build/NWGNUhead.inc
+endif
+
+#
+# These directories will be at the beginning of the include list, followed by
+# INCDIRS
+#
+XINCDIRS += \
+ $(APR)/include \
+ $(APR)/include/arch/NetWare \
+ $(EOLIST)
+
+#
+# These flags will come after CFLAGS
+#
+XCFLAGS += \
+ $(EOLIST)
+
+#
+# These defines will come after DEFINES
+#
+XDEFINES += \
+ $(EOLIST)
+
+#
+# These flags will be added to the link.opt file
+#
+XLFLAGS += \
+ $(EOLIST)
+
+#
+# These values will be appended to the correct variables based on the value of
+# RELEASE
+#
+ifeq "$(RELEASE)" "debug"
+XINCDIRS += \
+ $(EOLIST)
+
+XCFLAGS += \
+ $(EOLIST)
+
+XDEFINES += \
+ $(EOLIST)
+
+XLFLAGS += \
+ $(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "noopt"
+XINCDIRS += \
+ $(EOLIST)
+
+XCFLAGS += \
+ $(EOLIST)
+
+XDEFINES += \
+ $(EOLIST)
+
+XLFLAGS += \
+ $(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "release"
+XINCDIRS += \
+ $(EOLIST)
+
+XCFLAGS += \
+ $(EOLIST)
+
+XDEFINES += \
+ $(EOLIST)
+
+XLFLAGS += \
+ $(EOLIST)
+endif
+
+#
+# These are used by the link target if an NLM is being generated
+# This is used by the link 'name' directive to name the nlm. If left blank
+# TARGET_nlm (see below) will be used.
+#
+NLM_NAME = echod
+
+#
+# This is used by the link '-desc ' directive.
+# If left blank, NLM_NAME will be used.
+#
+NLM_DESCRIPTION = Echo Daemon NLM to test socket performance
+
+#
+# This is used by the '-threadname' directive. If left blank,
+# NLM_NAME Thread will be used.
+#
+NLM_THREAD_NAME = $(NLM_NAME)
+
+#
+# This is used by the '-screenname' directive. If left blank,
+# 'Apache for NetWare' Thread will be used.
+#
+NLM_SCREEN_NAME = $(NLM_NAME)
+
+#
+# If this is specified, it will override VERSION value in
+# $(APR_WORK)/build/NWGNUenvironment.inc
+#
+NLM_VERSION =
+
+#
+# If this is specified, it will override the default of 64K
+#
+NLM_STACK_SIZE =
+
+#
+# If this is specified it will be used by the link '-entry' directive
+#
+NLM_ENTRY_SYM = _LibCPrelude
+
+#
+# If this is specified it will be used by the link '-exit' directive
+#
+NLM_EXIT_SYM = _LibCPostlude
+
+#
+# If this is specified it will be used by the link '-check' directive
+#
+NLM_CHECK_SYM =
+
+#
+# If this is specified it will be used by the link '-flags' directive
+#
+NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
+
+#
+# If this is specified it will be linked in with the XDCData option in the def
+# file instead of the default of $(APR)/misc/netware/apache.xdc. XDCData can
+# be disabled by setting APACHE_UNIPROC in the environment
+#
+XDCDATA =
+
+#
+# Declare all target files (you must add your files here)
+#
+
+#
+# If there is an NLM target, put it here
+#
+TARGET_nlm = \
+ $(OBJDIR)/$(NLM_NAME).nlm \
+ $(EOLIST)
+
+#
+# If there is an LIB target, put it here
+#
+TARGET_lib = \
+ $(EOLIST)
+
+#
+# These are the OBJ files needed to create the NLM target above.
+# Paths must all use the '/' character
+#
+FILES_nlm_objs = \
+ $(OBJDIR)/$(NLM_NAME).o \
+ $(OBJDIR)/nw_misc.o \
+ $(EOLIST)
+
+#
+# These are the LIB files needed to create the NLM target above.
+# These will be added as a library command in the link.opt file.
+#
+FILES_nlm_libs = \
+ libcpre.o \
+ $(EOLIST)
+
+#
+# These are the modules that the above NLM target depends on to load.
+# These will be added as a module command in the link.opt file.
+#
+FILES_nlm_modules = \
+ aprlib \
+ Libc \
+ $(EOLIST)
+
+#
+# If the nlm has a msg file, put it's path here
+#
+FILE_nlm_msg =
+
+#
+# If the nlm has a hlp file put it's path here
+#
+FILE_nlm_hlp =
+
+#
+# If this is specified, it will override the default copyright.
+#
+FILE_nlm_copyright =
+
+#
+# Any additional imports go here
+#
+FILES_nlm_Ximports = \
+ @$(APR)/aprlib.imp \
+ @libc.imp \
+ $(EOLIST)
+
+#
+# Any symbols exported to here
+#
+FILES_nlm_exports = \
+ $(EOLIST)
+
+#
+# These are the OBJ files needed to create the LIB target above.
+# Paths must all use the '/' character
+#
+FILES_lib_objs = \
+ $(EOLIST)
+
+#
+# implement targets and dependancies (leave this section alone)
+#
+
+libs :: $(OBJDIR) $(TARGET_lib)
+
+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)
+#
+install :: nlms FORCE
+
+#
+# Any specialized rules here
+#
+
+#
+# Include the 'tail' makefile that has targets that depend on variables defined
+# in this makefile
+#
+
+include $(APR_WORK)/build/NWGNUtail.inc
+
Propchange: apr/apr/trunk/test/NWGNUechod
------------------------------------------------------------------------------
svn:eol-style = native
Modified: apr/apr/trunk/test/NWGNUglobalmutexchild
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUglobalmutexchild?rev=821929&r1=821928&r2=821929&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUglobalmutexchild (original)
+++ apr/apr/trunk/test/NWGNUglobalmutexchild Mon Oct 5 17:21:16 2009
@@ -103,7 +103,7 @@
# This is used by the '-threadname' directive. If left blank,
# NLM_NAME Thread will be used.
#
-NLM_THREAD_NAME = globalmutexchild
+NLM_THREAD_NAME = $(NLM_NAME)
#
# This is used by the '-screenname' directive. If left blank,
@@ -157,7 +157,7 @@
# If there is an NLM target, put it here
#
TARGET_nlm = \
- $(OBJDIR)/globalmutexchild.nlm \
+ $(OBJDIR)/$(NLM_NAME).nlm \
$(EOLIST)
#
@@ -171,7 +171,7 @@
# Paths must all use the '/' character
#
FILES_nlm_objs = \
- $(OBJDIR)/globalmutexchild.o \
+ $(OBJDIR)/$(NLM_NAME).o \
$(EOLIST)
#
Modified: apr/apr/trunk/test/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUmakefile?rev=821929&r1=821928&r2=821929&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUmakefile (original)
+++ apr/apr/trunk/test/NWGNUmakefile Mon Oct 5 17:21:16 2009
@@ -163,13 +163,15 @@
#
TARGET_nlm = \
$(OBJDIR)/aprtest.nlm \
+ $(OBJDIR)/echod.nlm \
+ $(OBJDIR)/globalmutexchild.nlm \
$(OBJDIR)/mod_test.nlm \
$(OBJDIR)/proc_child.nlm \
$(OBJDIR)/readchild.nlm \
- $(OBJDIR)/globalmutexchild.nlm \
$(OBJDIR)/sockchild.nlm \
- $(OBJDIR)/tryread.nlm \
+ $(OBJDIR)/sockperf.nlm \
$(OBJDIR)/testatmc.nlm \
+ $(OBJDIR)/tryread.nlm \
$(EOLIST)
#
# If there is an LIB target, put it here
Modified: apr/apr/trunk/test/NWGNUmod_test
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUmod_test?rev=821929&r1=821928&r2=821929&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUmod_test (original)
+++ apr/apr/trunk/test/NWGNUmod_test Mon Oct 5 17:21:16 2009
@@ -54,7 +54,6 @@
XLFLAGS += \
$(EOLIST)
-
endif
ifeq "$(RELEASE)" "noopt"
@@ -69,8 +68,6 @@
XLFLAGS += \
$(EOLIST)
-
- $(EOLIST)
endif
ifeq "$(RELEASE)" "release"
@@ -92,13 +89,13 @@
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
-NLM_NAME = mod_test
+NLM_NAME = mod_test
#
# This is used by the link '-desc ' directive.
# If left blank, NLM_NAME will be used.
#
-NLM_DESCRIPTION = DSO NLM to test the apr DSO loading layer
+NLM_DESCRIPTION = DSO NLM to test the apr DSO loading layer
#
# This is used by the '-threadname' directive. If left blank,
@@ -116,7 +113,7 @@
# If this is specified, it will override VERSION value in
# $(APR_WORK)\build\NWGNUenvironment.inc
#
-NLM_VERSION = 1,0,0
+NLM_VERSION =
#
# If this is specified, it will override the default of 64K
@@ -141,14 +138,14 @@
#
# 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
# file instead of the default of $(APR)/misc/netware/apache.xdc. XDCData can
# be disabled by setting APACHE_UNIPROC in the environment
#
-XDCDATA =
+XDCDATA =
#
# Declare all target files (you must add your files here)
@@ -222,7 +219,7 @@
print_hello \
count_reps \
$(EOLIST)
-
+
#
# These are the OBJ files needed to create the LIB target above.
# Paths must all use the '/' character
Modified: apr/apr/trunk/test/NWGNUproc_child
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUproc_child?rev=821929&r1=821928&r2=821929&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUproc_child (original)
+++ apr/apr/trunk/test/NWGNUproc_child Mon Oct 5 17:21:16 2009
@@ -54,7 +54,6 @@
XLFLAGS += \
$(EOLIST)
-
endif
ifeq "$(RELEASE)" "noopt"
@@ -69,8 +68,6 @@
XLFLAGS += \
$(EOLIST)
-
- $(EOLIST)
endif
ifeq "$(RELEASE)" "release"
@@ -92,19 +89,19 @@
# 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.
# If left blank, NLM_NAME will be used.
#
-NLM_DESCRIPTION = child NLM to test the proc layer
+NLM_DESCRIPTION = child NLM to test the proc layer
#
# This is used by the '-threadname' directive. If left blank,
# NLM_NAME Thread will be used.
#
-NLM_THREAD_NAME = proc_child
+NLM_THREAD_NAME = $(NLM_NAME)
#
# This is used by the '-screenname' directive. If left blank,
@@ -116,7 +113,7 @@
# If this is specified, it will override VERSION value in
# $(APR_WORK)\build\NWGNUenvironment.inc
#
-NLM_VERSION = 1,0,0
+NLM_VERSION =
#
# If this is specified, it will override the default of 64K
@@ -141,14 +138,14 @@
#
# 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
# file instead of the default of $(APR)/misc/netware/apache.xdc. XDCData can
# be disabled by setting APACHE_UNIPROC in the environment
#
-XDCDATA =
+XDCDATA =
#
# Declare all target files (you must add your files here)
@@ -158,7 +155,7 @@
# If there is an NLM target, put it here
#
TARGET_nlm = \
- $(OBJDIR)/proc_child.nlm \
+ $(OBJDIR)/$(NLM_NAME).nlm \
$(EOLIST)
#
@@ -172,7 +169,7 @@
# Paths must all use the '/' character
#
FILES_nlm_objs = \
- $(OBJDIR)/proc_child.o \
+ $(OBJDIR)/$(NLM_NAME).o \
$(EOLIST)
#
Modified: apr/apr/trunk/test/NWGNUreadchild
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUreadchild?rev=821929&r1=821928&r2=821929&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUreadchild (original)
+++ apr/apr/trunk/test/NWGNUreadchild Mon Oct 5 17:21:16 2009
@@ -101,7 +101,7 @@
# This is used by the '-threadname' directive. If left blank,
# NLM_NAME Thread will be used.
#
-NLM_THREAD_NAME = readchild
+NLM_THREAD_NAME = $(NLM_NAME)
#
# This is used by the '-screenname' directive. If left blank,
@@ -155,7 +155,7 @@
# If there is an NLM target, put it here
#
TARGET_nlm = \
- $(OBJDIR)/readchild.nlm \
+ $(OBJDIR)/$(NLM_NAME).nlm \
$(EOLIST)
#
@@ -169,7 +169,7 @@
# Paths must all use the '/' character
#
FILES_nlm_objs = \
- $(OBJDIR)/readchild.o \
+ $(OBJDIR)/$(NLM_NAME).o \
$(EOLIST)
#
Modified: apr/apr/trunk/test/NWGNUsockchild
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUsockchild?rev=821929&r1=821928&r2=821929&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUsockchild (original)
+++ apr/apr/trunk/test/NWGNUsockchild Mon Oct 5 17:21:16 2009
@@ -101,7 +101,7 @@
# This is used by the '-threadname' directive. If left blank,
# NLM_NAME Thread will be used.
#
-NLM_THREAD_NAME = sockchild
+NLM_THREAD_NAME = $(NLM_NAME)
#
# This is used by the '-screenname' directive. If left blank,
@@ -155,7 +155,7 @@
# If there is an NLM target, put it here
#
TARGET_nlm = \
- $(OBJDIR)/sockchild.nlm \
+ $(OBJDIR)/$(NLM_NAME).nlm \
$(EOLIST)
#
@@ -169,7 +169,7 @@
# Paths must all use the '/' character
#
FILES_nlm_objs = \
- $(OBJDIR)/sockchild.o \
+ $(OBJDIR)/$(NLM_NAME).o \
$(EOLIST)
#
Added: apr/apr/trunk/test/NWGNUsockperf
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUsockperf?rev=821929&view=auto
==============================================================================
--- apr/apr/trunk/test/NWGNUsockperf (added)
+++ apr/apr/trunk/test/NWGNUsockperf Mon Oct 5 17:21:16 2009
@@ -0,0 +1,253 @@
+#
+# Make sure all needed macro's are defined
+#
+
+#
+# Get the 'head' of the build environment if necessary. This includes default
+# targets and paths to tools
+#
+
+ifndef EnvironmentDefined
+include $(APR_WORK)/build/NWGNUhead.inc
+endif
+
+#
+# These directories will be at the beginning of the include list, followed by
+# INCDIRS
+#
+XINCDIRS += \
+ $(APR)/include \
+ $(APR)/include/arch/NetWare \
+ $(EOLIST)
+
+#
+# These flags will come after CFLAGS
+#
+XCFLAGS += \
+ $(EOLIST)
+
+#
+# These defines will come after DEFINES
+#
+XDEFINES += \
+ $(EOLIST)
+
+#
+# These flags will be added to the link.opt file
+#
+XLFLAGS += \
+ $(EOLIST)
+
+#
+# These values will be appended to the correct variables based on the value of
+# RELEASE
+#
+ifeq "$(RELEASE)" "debug"
+XINCDIRS += \
+ $(EOLIST)
+
+XCFLAGS += \
+ $(EOLIST)
+
+XDEFINES += \
+ $(EOLIST)
+
+XLFLAGS += \
+ $(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "noopt"
+XINCDIRS += \
+ $(EOLIST)
+
+XCFLAGS += \
+ $(EOLIST)
+
+XDEFINES += \
+ $(EOLIST)
+
+XLFLAGS += \
+ $(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "release"
+XINCDIRS += \
+ $(EOLIST)
+
+XCFLAGS += \
+ $(EOLIST)
+
+XDEFINES += \
+ $(EOLIST)
+
+XLFLAGS += \
+ $(EOLIST)
+endif
+
+#
+# These are used by the link target if an NLM is being generated
+# This is used by the link 'name' directive to name the nlm. If left blank
+# TARGET_nlm (see below) will be used.
+#
+NLM_NAME = sockperf
+
+#
+# This is used by the link '-desc ' directive.
+# If left blank, NLM_NAME will be used.
+#
+NLM_DESCRIPTION = socket NLM to test socket performance
+
+#
+# This is used by the '-threadname' directive. If left blank,
+# NLM_NAME Thread will be used.
+#
+NLM_THREAD_NAME = $(NLM_NAME)
+
+#
+# This is used by the '-screenname' directive. If left blank,
+# 'Apache for NetWare' Thread will be used.
+#
+NLM_SCREEN_NAME = $(NLM_NAME)
+
+#
+# If this is specified, it will override VERSION value in
+# $(APR_WORK)/build/NWGNUenvironment.inc
+#
+NLM_VERSION =
+
+#
+# If this is specified, it will override the default of 64K
+#
+NLM_STACK_SIZE =
+
+#
+# If this is specified it will be used by the link '-entry' directive
+#
+NLM_ENTRY_SYM = _LibCPrelude
+
+#
+# If this is specified it will be used by the link '-exit' directive
+#
+NLM_EXIT_SYM = _LibCPostlude
+
+#
+# If this is specified it will be used by the link '-check' directive
+#
+NLM_CHECK_SYM =
+
+#
+# If this is specified it will be used by the link '-flags' directive
+#
+NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
+
+#
+# If this is specified it will be linked in with the XDCData option in the def
+# file instead of the default of $(APR)/misc/netware/apache.xdc. XDCData can
+# be disabled by setting APACHE_UNIPROC in the environment
+#
+XDCDATA =
+
+#
+# Declare all target files (you must add your files here)
+#
+
+#
+# If there is an NLM target, put it here
+#
+TARGET_nlm = \
+ $(OBJDIR)/$(NLM_NAME).nlm \
+ $(EOLIST)
+
+#
+# If there is an LIB target, put it here
+#
+TARGET_lib = \
+ $(EOLIST)
+
+#
+# These are the OBJ files needed to create the NLM target above.
+# Paths must all use the '/' character
+#
+FILES_nlm_objs = \
+ $(OBJDIR)/$(NLM_NAME).o \
+ $(OBJDIR)/nw_misc.o \
+ $(EOLIST)
+
+#
+# These are the LIB files needed to create the NLM target above.
+# These will be added as a library command in the link.opt file.
+#
+FILES_nlm_libs = \
+ libcpre.o \
+ $(EOLIST)
+
+#
+# These are the modules that the above NLM target depends on to load.
+# These will be added as a module command in the link.opt file.
+#
+FILES_nlm_modules = \
+ aprlib \
+ Libc \
+ $(EOLIST)
+
+#
+# If the nlm has a msg file, put it's path here
+#
+FILE_nlm_msg =
+
+#
+# If the nlm has a hlp file put it's path here
+#
+FILE_nlm_hlp =
+
+#
+# If this is specified, it will override the default copyright.
+#
+FILE_nlm_copyright =
+
+#
+# Any additional imports go here
+#
+FILES_nlm_Ximports = \
+ @$(APR)/aprlib.imp \
+ @libc.imp \
+ $(EOLIST)
+
+#
+# Any symbols exported to here
+#
+FILES_nlm_exports = \
+ $(EOLIST)
+
+#
+# These are the OBJ files needed to create the LIB target above.
+# Paths must all use the '/' character
+#
+FILES_lib_objs = \
+ $(EOLIST)
+
+#
+# implement targets and dependancies (leave this section alone)
+#
+
+libs :: $(OBJDIR) $(TARGET_lib)
+
+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)
+#
+install :: nlms FORCE
+
+#
+# Any specialized rules here
+#
+
+#
+# Include the 'tail' makefile that has targets that depend on variables defined
+# in this makefile
+#
+
+include $(APR_WORK)/build/NWGNUtail.inc
+
Propchange: apr/apr/trunk/test/NWGNUsockperf
------------------------------------------------------------------------------
svn:eol-style = native
Modified: apr/apr/trunk/test/NWGNUtestatmc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUtestatmc?rev=821929&r1=821928&r2=821929&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUtestatmc (original)
+++ apr/apr/trunk/test/NWGNUtestatmc Mon Oct 5 17:21:16 2009
@@ -100,13 +100,13 @@
# This is used by the '-threadname' directive. If left blank,
# NLM_NAME Thread will be used.
#
-NLM_THREAD_NAME = testatmc
+NLM_THREAD_NAME = $(NLM_NAME)
#
# This is used by the '-screenname' directive. If left blank,
# 'Apache for NetWare' Thread will be used.
#
-NLM_SCREEN_NAME = testatmc
+NLM_SCREEN_NAME = $(NLM_NAME)
#
# If this is specified, it will override VERSION value in
@@ -154,7 +154,7 @@
# If there is an NLM target, put it here
#
TARGET_nlm = \
- $(OBJDIR)/testatmc.nlm \
+ $(OBJDIR)/$(NLM_NAME).nlm \
$(EOLIST)
#
@@ -210,8 +210,8 @@
# Any additional imports go here
#
FILES_nlm_Ximports = \
+ @$(APR)/aprlib.imp \
@libc.imp \
- @$(APR)/aprlib.imp \
$(EOLIST)
#
Modified: apr/apr/trunk/test/NWGNUtryread
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUtryread?rev=821929&r1=821928&r2=821929&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUtryread (original)
+++ apr/apr/trunk/test/NWGNUtryread Mon Oct 5 17:21:16 2009
@@ -101,7 +101,7 @@
# This is used by the '-threadname' directive. If left blank,
# NLM_NAME Thread will be used.
#
-NLM_THREAD_NAME = try_read
+NLM_THREAD_NAME = $(NLM_NAME)
#
# This is used by the '-screenname' directive. If left blank,
@@ -155,7 +155,7 @@
# If there is an NLM target, put it here
#
TARGET_nlm = \
- $(OBJDIR)/tryread.nlm \
+ $(OBJDIR)/$(NLM_NAME).nlm \
$(EOLIST)
#
@@ -169,7 +169,7 @@
# Paths must all use the '/' character
#
FILES_nlm_objs = \
- $(OBJDIR)/tryread.o \
+ $(OBJDIR)/$(NLM_NAME).o \
$(EOLIST)
#
Modified: apr/apr/trunk/test/nw_misc.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/nw_misc.c?rev=821929&r1=821928&r2=821929&view=diff
==============================================================================
--- apr/apr/trunk/test/nw_misc.c (original)
+++ apr/apr/trunk/test/nw_misc.c Mon Oct 5 17:21:16 2009
@@ -1,6 +1,4 @@
#include <stdlib.h>
-#include <netware.h>
-#include <screen.h>
/*
#include "testutil.h"
*/
@@ -9,11 +7,7 @@
void _NonAppStop( void )
{
if (getenv("_IN_NETWARE_BASH_") == NULL) {
- uint16_t row, col;
-
- GetScreenSize(&row, &col);
- gotorowcol(row-1, 0);
- printf("<Press any key to close screen> ");
+ printf("\r\n<Press any key to close screen> ");
getcharacter();
}
}