[Jboss-svn-commits] JBL Code SVN: r2134 - in trunk/labs/jbosswebnp/src/windows/native: JNI/servlet JPI/core JPI/mscorlib

[<jbo...@li...>]

Author: mla...@jb...
Date: 2006-01-18 08:10:22 -0500 (Wed, 18 Jan 2006)
New Revision: 2134

Modified:
   trunk/labs/jbosswebnp/src/windows/native/JNI/servlet/Makefile
   trunk/labs/jbosswebnp/src/windows/native/JPI/core/Makefile
   trunk/labs/jbosswebnp/src/windows/native/JPI/mscorlib/Makefile
Log:
Rename JAVA_RT to JNI_RT.

Modified: trunk/labs/jbosswebnp/src/windows/native/JNI/servlet/Makefile
===================================================================
--- trunk/labs/jbosswebnp/src/windows/native/JNI/servlet/Makefile	2006-01-18 12:49:34 UTC (rev 2133)
+++ trunk/labs/jbosswebnp/src/windows/native/JNI/servlet/Makefile	2006-01-18 13:10:22 UTC (rev 2134)
@@ -16,7 +16,7 @@
 PPREFIX = JNI
 EXTRA_LFLAGS = /BASE:@../../build/baseaddr.ref,$(PPREFIX).$(PROJECT)
 JNI_CORE_LIB = JNI.core.lib
-JAVA_RT_LIB = JNI.rt.lib
+JNI_RT_LIB = JNI.rt.lib
 
 !IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
 SRCDIR = .
@@ -30,14 +30,14 @@
 !IFNDEF WITH_JNI_CORE
 WITH_JNI_CORE = ../core
 !ENDIF
-!IFNDEF WITH_JAVA_RT
-WITH_JAVA_RT = ../rt
+!IFNDEF WITH_JNI_RT
+WITH_JNI_RT = ../rt
 !ENDIF
 
-INCLUDES = $(INCLUDES) /I "$(WITH_JNI_CORE)/include" /I "$(WITH_JAVA_RT)"
-LDIRS = /libpath:"$(WITH_JNI_CORE)/$(BUILDIR)" /libpath:"$(WITH_JAVA_RT)/$(BUILDIR)"
+INCLUDES = $(INCLUDES) /I "$(WITH_JNI_CORE)/include" /I "$(WITH_JNI_RT)"
+LDIRS = /libpath:"$(WITH_JNI_CORE)/$(BUILDIR)" /libpath:"$(WITH_JNI_RT)/$(BUILDIR)"
 
-LFLAGS = $(LFLAGS) $(JNI_CORE_LIB) $(JAVA_RT_LIB)
+LFLAGS = $(LFLAGS) $(JNI_CORE_LIB) $(JNI_RT_LIB)
 
 !include <javax.servlet.inc>
 

Modified: trunk/labs/jbosswebnp/src/windows/native/JPI/core/Makefile
===================================================================
--- trunk/labs/jbosswebnp/src/windows/native/JPI/core/Makefile	2006-01-18 12:49:34 UTC (rev 2133)
+++ trunk/labs/jbosswebnp/src/windows/native/JPI/core/Makefile	2006-01-18 13:10:22 UTC (rev 2134)
@@ -18,7 +18,7 @@
 EXTRA_LIBS = mscoree.lib
 EXTRA_LFLAGS = /BASE:@../../build/baseaddr.ref,$(PPREFIX).$(PROJECT)
 JNI_CORE_LIB = JNI.core.lib
-JAVA_RT_LIB = JNI.rt.lib
+JNI_RT_LIB = JNI.rt.lib
 
 !IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
 SRCDIR = .
@@ -32,14 +32,14 @@
 !IFNDEF WITH_JNI_CORE
 WITH_JNI_CORE = ../../JNI/core
 !ENDIF
-!IFNDEF WITH_JAVA_RT
-WITH_JAVA_RT = ../../JNI/rt
+!IFNDEF WITH_JNI_RT
+WITH_JNI_RT = ../../JNI/rt
 !ENDIF
 
-INCLUDES = $(INCLUDES) /I "$(WITH_JNI_CORE)/include"  /I "$(WITH_JAVA_RT)"
-LDIRS = /libpath:"$(WITH_JNI_CORE)/$(BUILDIR)" /libpath:"$(WITH_JAVA_RT)/$(BUILDIR)"
+INCLUDES = $(INCLUDES) /I "$(WITH_JNI_CORE)/include"  /I "$(WITH_JNI_RT)"
+LDIRS = /libpath:"$(WITH_JNI_CORE)/$(BUILDIR)" /libpath:"$(WITH_JNI_RT)/$(BUILDIR)"
 
-LFLAGS = $(LFLAGS) $(JNI_CORE_LIB) $(JAVA_RT_LIB)
+LFLAGS = $(LFLAGS) $(JNI_CORE_LIB) $(JNI_RT_LIB)
 
 OBJECTS = \
 	$(BUILDIR)\AssemblyInfo.obj \

Modified: trunk/labs/jbosswebnp/src/windows/native/JPI/mscorlib/Makefile
===================================================================
--- trunk/labs/jbosswebnp/src/windows/native/JPI/mscorlib/Makefile	2006-01-18 12:49:34 UTC (rev 2133)
+++ trunk/labs/jbosswebnp/src/windows/native/JPI/mscorlib/Makefile	2006-01-18 13:10:22 UTC (rev 2134)
@@ -18,8 +18,9 @@
 EXTRA_LIBS = mscoree.lib
 EXTRA_LFLAGS = /BASE:@../../build/baseaddr.ref,$(PPREFIX).$(PROJECT)
 JNI_CORE_LIB = JNI.core.lib
+JNI_RT_LIB = JNI.rt.lib
+JNI_MSCORLIB_LIB = JNI.mscorlib.lib
 JPI_CORE_LIB = JPI.core.lib
-JNI_MSCORLIB_LIB = JNI.mscorlib.lib
 
 !IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
 SRCDIR = .
@@ -33,6 +34,9 @@
 !IFNDEF WITH_JNI_CORE
 WITH_JNI_CORE = ../../JNI/core
 !ENDIF
+!IFNDEF WITH_JNI_RT
+WITH_JNI_RT = ../../JNI/rt
+!ENDIF
 !IFNDEF WITH_JPI_CORE
 WITH_JPI_CORE = ../core
 !ENDIF
@@ -40,10 +44,10 @@
 WITH_JNI_MSCORLIB = ../../JNI/mscorlib
 !ENDIF
 
-INCLUDES = $(INCLUDES) /I "$(WITH_JNI_CORE)/include" /I "$(WITH_JNI_MSCORLIB)" /I "$(WITH_JPI_CORE)"
-LDIRS = /libpath:"$(WITH_JNI_CORE)/$(BUILDIR)" /libpath:"$(WITH_JNI_MSCORLIB)/$(BUILDIR)" /libpath:"$(WITH_JPI_CORE)/$(BUILDIR)"
+INCLUDES = $(INCLUDES) /I "$(WITH_JNI_CORE)/include" /I "$(WITH_JNI_RT)" /I "$(WITH_JNI_MSCORLIB)" /I "$(WITH_JPI_CORE)"
+LDIRS = /libpath:"$(WITH_JNI_CORE)/$(BUILDIR)" /libpath:"$(WITH_JNI_RT)/$(BUILDIR)" /libpath:"$(WITH_JNI_MSCORLIB)/$(BUILDIR)" /libpath:"$(WITH_JPI_CORE)/$(BUILDIR)"
 
-LFLAGS = $(LFLAGS) $(JNI_CORE_LIB) $(JNI_MSCORLIB_LIB) $(JPI_CORE_LIB)
+LFLAGS = $(LFLAGS) $(JNI_CORE_LIB) $(JNI_RT_LIB) $(JNI_MSCORLIB_LIB) $(JPI_CORE_LIB)
 
 OBJECTS = \
 	$(BUILDIR)\AssemblyInfo.obj \