[vmkit-commits] [vmkit] r142939 - in /vmkit/trunk/lib/J3: ./ ClassLib/ ClassLib/GNUClasspath/ ClassLib/OpenJDK/ Classpath/ Compiler/ VMCore/

Will Dietz wdietz2 at illinois.edu
Tue Oct 25 12:46:45 PDT 2011 

Author: wdietz2
Date: Tue Oct 25 14:46:45 2011
New Revision: 142939

URL: http://llvm.org/viewvc/llvm-project?rev=142939&view=rev
Log:
Move Classpath to ClassLib/GNUClasspath subdirectory, prep for new runtimes

Added:
    vmkit/trunk/lib/J3/ClassLib/
    vmkit/trunk/lib/J3/ClassLib/Classpath.h.in
      - copied unchanged from r142938, vmkit/trunk/lib/J3/Classpath/Classpath.h.in
    vmkit/trunk/lib/J3/ClassLib/GNUClasspath/
    vmkit/trunk/lib/J3/ClassLib/GNUClasspath/Classpath.inc
      - copied unchanged from r142938, vmkit/trunk/lib/J3/Classpath/Classpath.inc
    vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ClasspathConstructor.inc
      - copied unchanged from r142938, vmkit/trunk/lib/J3/Classpath/ClasspathConstructor.inc
    vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ClasspathField.inc
      - copied unchanged from r142938, vmkit/trunk/lib/J3/Classpath/ClasspathField.inc
    vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ClasspathMethod.inc
      - copied unchanged from r142938, vmkit/trunk/lib/J3/Classpath/ClasspathMethod.inc
    vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ClasspathReflect.cpp
      - copied unchanged from r142938, vmkit/trunk/lib/J3/Classpath/ClasspathReflect.cpp
    vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ClasspathReflect.h
      - copied unchanged from r142938, vmkit/trunk/lib/J3/Classpath/ClasspathReflect.h
    vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ClasspathVMClass.inc
      - copied unchanged from r142938, vmkit/trunk/lib/J3/Classpath/ClasspathVMClass.inc
    vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ClasspathVMClassLoader.inc
      - copied unchanged from r142938, vmkit/trunk/lib/J3/Classpath/ClasspathVMClassLoader.inc
    vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ClasspathVMObject.inc
      - copied unchanged from r142938, vmkit/trunk/lib/J3/Classpath/ClasspathVMObject.inc
    vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ClasspathVMRuntime.inc
      - copied unchanged from r142938, vmkit/trunk/lib/J3/Classpath/ClasspathVMRuntime.inc
    vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ClasspathVMStackWalker.inc
      - copied unchanged from r142938, vmkit/trunk/lib/J3/Classpath/ClasspathVMStackWalker.inc
    vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ClasspathVMSystem.inc
      - copied unchanged from r142938, vmkit/trunk/lib/J3/Classpath/ClasspathVMSystem.inc
    vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ClasspathVMSystemProperties.inc
      - copied unchanged from r142938, vmkit/trunk/lib/J3/Classpath/ClasspathVMSystemProperties.inc
    vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ClasspathVMThread.inc
      - copied unchanged from r142938, vmkit/trunk/lib/J3/Classpath/ClasspathVMThread.inc
    vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ClasspathVMThrowable.inc
      - copied unchanged from r142938, vmkit/trunk/lib/J3/Classpath/ClasspathVMThrowable.inc
    vmkit/trunk/lib/J3/ClassLib/GNUClasspath/JavaUpcalls.cpp
      - copied unchanged from r142938, vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp
    vmkit/trunk/lib/J3/ClassLib/GNUClasspath/JavaUpcalls.h
      - copied unchanged from r142938, vmkit/trunk/lib/J3/Classpath/JavaUpcalls.h
    vmkit/trunk/lib/J3/ClassLib/GNUClasspath/Makefile
      - copied, changed from r142938, vmkit/trunk/lib/J3/Classpath/Makefile
    vmkit/trunk/lib/J3/ClassLib/Makefile
    vmkit/trunk/lib/J3/ClassLib/OpenJDK/
    vmkit/trunk/lib/J3/ClassLib/OpenJDK/Makefile
Removed:
    vmkit/trunk/lib/J3/Classpath/
Modified:
    vmkit/trunk/lib/J3/Compiler/Makefile
    vmkit/trunk/lib/J3/Makefile
    vmkit/trunk/lib/J3/VMCore/Makefile

Copied: vmkit/trunk/lib/J3/ClassLib/GNUClasspath/Makefile (from r142938, vmkit/trunk/lib/J3/Classpath/Makefile)
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/ClassLib/GNUClasspath/Makefile?p2=vmkit/trunk/lib/J3/ClassLib/GNUClasspath/Makefile&p1=vmkit/trunk/lib/J3/Classpath/Makefile&r1=142938&r2=142939&rev=142939&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/Makefile (original)
+++ vmkit/trunk/lib/J3/ClassLib/GNUClasspath/Makefile Tue Oct 25 14:46:45 2011
@@ -1,4 +1,4 @@
-##===- lib/JnJVM/Classpath/Makefile ------------------------*- Makefile -*-===##
+##===- lib/J3/ClassLib/GNUClasspath/Makefile ---------------*- Makefile -*-===##
 # 
 #                     The vmkit project
 #
@@ -6,7 +6,7 @@
 # License. See LICENSE.TXT for details.
 # 
 ##===----------------------------------------------------------------------===##
-LEVEL = ../../..
+LEVEL = ../../../..
 
 
 EXTRA_DIST = ClasspathConstructor.inc ClasspathField.inc Classpath.inc ClasspathMethod.inc \
@@ -20,4 +20,4 @@
 
 include $(LEVEL)/Makefile.common
 
-CXX.Flags += -I$(PROJ_SRC_DIR)/../VMCore -I$(PROJ_SRC_DIR)/../../../include/j3
+CXX.Flags += -I$(PROJ_SRC_DIR)/../VMCore -I$(PROJ_SRC_DIR)/../../../include/j3 -I..

Added: vmkit/trunk/lib/J3/ClassLib/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/ClassLib/Makefile?rev=142939&view=auto
==============================================================================
--- vmkit/trunk/lib/J3/ClassLib/Makefile (added)
+++ vmkit/trunk/lib/J3/ClassLib/Makefile Tue Oct 25 14:46:45 2011
@@ -0,0 +1,15 @@
+##===- lib/J3/ClassLib/Makefile ----------------------------*- Makefile -*-===##
+#
+#                     The vmkit project
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+LEVEL = ../../..
+
+include $(LEVEL)/Makefile.config
+
+DIRS = $(CLASSPATH_DIR)
+
+include $(LEVEL)/Makefile.common

Added: vmkit/trunk/lib/J3/ClassLib/OpenJDK/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/ClassLib/OpenJDK/Makefile?rev=142939&view=auto
==============================================================================
--- vmkit/trunk/lib/J3/ClassLib/OpenJDK/Makefile (added)
+++ vmkit/trunk/lib/J3/ClassLib/OpenJDK/Makefile Tue Oct 25 14:46:45 2011
@@ -0,0 +1,19 @@
+##===- lib/J3/ClassLib/OpenJDK/Makefile --------------------*- Makefile -*-===##
+# 
+#                     The vmkit project
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+# 
+##===----------------------------------------------------------------------===##
+LEVEL = ../../../..
+
+EXTRA_DIST =
+
+include $(LEVEL)/Makefile.config
+
+MODULE_WITH_GC = Classpath
+
+include $(LEVEL)/Makefile.common
+
+CXX.Flags += -I$(PROJ_SRC_DIR)/../VMCore -I$(PROJ_SRC_DIR)/../../../include/j3 -I..

Modified: vmkit/trunk/lib/J3/Compiler/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/Makefile?rev=142939&r1=142938&r2=142939&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/Makefile (original)
+++ vmkit/trunk/lib/J3/Compiler/Makefile Tue Oct 25 14:46:45 2011
@@ -14,4 +14,4 @@
 
 include $(LEVEL)/Makefile.common
 
-CXX.Flags += -I$(PROJ_OBJ_DIR)/../LLVMRuntime -I$(PROJ_SRC_DIR)/../Classpath -I$(PROJ_SRC_DIR)/../VMCore
+CXX.Flags += -I$(PROJ_OBJ_DIR)/../LLVMRuntime -I$(PROJ_SRC_DIR)/../ClassLib/$(CLASSPATH_DIR) -I$(PROJ_SRC_DIR)/../VMCore

Modified: vmkit/trunk/lib/J3/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Makefile?rev=142939&r1=142938&r2=142939&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Makefile (original)
+++ vmkit/trunk/lib/J3/Makefile Tue Oct 25 14:46:45 2011
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 
-DIRS = LLVMRuntime VMCore Classpath Compiler
+DIRS = LLVMRuntime VMCore ClassLib Compiler
 
 include $(LEVEL)/Makefile.config
 include $(LEVEL)/Makefile.common

Modified: vmkit/trunk/lib/J3/VMCore/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Makefile?rev=142939&r1=142938&r2=142939&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Makefile (original)
+++ vmkit/trunk/lib/J3/VMCore/Makefile Tue Oct 25 14:46:45 2011
@@ -14,4 +14,4 @@
 
 include $(LEVEL)/Makefile.common
 
-CXX.Flags += -I$(PROJ_OBJ_DIR)/../Classpath -I$(PROJ_OBJ_DIR)/../LLVMRuntime -I$(PROJ_SRC_DIR)/../Classpath -I$(PROJ_SRC_DIR)/../../../include/j3
+CXX.Flags += -I$(PROJ_OBJ_DIR)/../ClassLib -I$(PROJ_OBJ_DIR)/../LLVMRuntime -I$(PROJ_SRC_DIR)/../ClassLib/$(CLASSPATH_DIR) -I$(PROJ_SRC_DIR)/../../../include/j3

More information about the vmkit-commits mailing list