diff options
Diffstat (limited to '')
3 files changed, 26 insertions, 38 deletions
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj index 6ffcf9e..bd1a332 100644 --- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj +++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj | |||
@@ -76,64 +76,64 @@ | |||
76 | </ProjectReference> | 76 | </ProjectReference> |
77 | </ItemGroup> | 77 | </ItemGroup> |
78 | <ItemGroup> | 78 | <ItemGroup> |
79 | <Compile Include="MainMemory.cs"> | 79 | <Compile Include="ClassInstance.cs"> |
80 | <SubType>Code</SubType> | ||
81 | </Compile> | ||
82 | <Compile Include="ClassRecord.cs"> | ||
80 | <SubType>Code</SubType> | 83 | <SubType>Code</SubType> |
81 | </Compile> | 84 | </Compile> |
82 | <Compile Include="Heap.cs"> | 85 | <Compile Include="Heap.cs"> |
83 | <SubType>Code</SubType> | 86 | <SubType>Code</SubType> |
84 | </Compile> | 87 | </Compile> |
85 | <Compile Include="StackFrame.cs"> | 88 | <Compile Include="Interpreter.cs"> |
86 | <SubType>Code</SubType> | 89 | <SubType>Code</SubType> |
87 | </Compile> | 90 | </Compile> |
88 | <Compile Include="InterpreterLogic.cs"> | 91 | <Compile Include="InterpreterLogic.cs"> |
89 | <SubType>Code</SubType> | 92 | <SubType>Code</SubType> |
90 | </Compile> | 93 | </Compile> |
91 | <Compile Include="OpenSimJVM.cs"> | 94 | <Compile Include="InterpreterMethods.cs"> |
92 | <SubType>Code</SubType> | 95 | <SubType>Code</SubType> |
93 | </Compile> | 96 | </Compile> |
94 | <Compile Include="InterpreterMethods.cs"> | 97 | <Compile Include="InterpreterReturn.cs"> |
95 | <SubType>Code</SubType> | 98 | <SubType>Code</SubType> |
96 | </Compile> | 99 | </Compile> |
97 | <Compile Include="ClassInstance.cs"> | 100 | <Compile Include="MainMemory.cs"> |
98 | <SubType>Code</SubType> | 101 | <SubType>Code</SubType> |
99 | </Compile> | 102 | </Compile> |
100 | <Compile Include="InterpreterReturn.cs"> | 103 | <Compile Include="MethodMemory.cs"> |
101 | <SubType>Code</SubType> | 104 | <SubType>Code</SubType> |
102 | </Compile> | 105 | </Compile> |
103 | <Compile Include="Interpreter.cs"> | 106 | <Compile Include="Object.cs"> |
104 | <SubType>Code</SubType> | 107 | <SubType>Code</SubType> |
105 | </Compile> | 108 | </Compile> |
106 | <Compile Include="ClassRecord.cs"> | 109 | <Compile Include="OpenSimJVM.cs"> |
107 | <SubType>Code</SubType> | 110 | <SubType>Code</SubType> |
108 | </Compile> | 111 | </Compile> |
109 | <Compile Include="Stack.cs"> | 112 | <Compile Include="Stack.cs"> |
110 | <SubType>Code</SubType> | 113 | <SubType>Code</SubType> |
111 | </Compile> | 114 | </Compile> |
112 | <Compile Include="Object.cs"> | 115 | <Compile Include="StackFrame.cs"> |
113 | <SubType>Code</SubType> | 116 | <SubType>Code</SubType> |
114 | </Compile> | 117 | </Compile> |
115 | <Compile Include="Thread.cs"> | 118 | <Compile Include="Thread.cs"> |
116 | <SubType>Code</SubType> | 119 | <SubType>Code</SubType> |
117 | </Compile> | 120 | </Compile> |
118 | <Compile Include="MethodMemory.cs"> | ||
119 | <SubType>Code</SubType> | ||
120 | </Compile> | ||
121 | <Compile Include="Properties\AssemblyInfo.cs"> | 121 | <Compile Include="Properties\AssemblyInfo.cs"> |
122 | <SubType>Code</SubType> | 122 | <SubType>Code</SubType> |
123 | </Compile> | 123 | </Compile> |
124 | <Compile Include="Types\BaseType.cs"> | 124 | <Compile Include="Types\ArrayReference.cs"> |
125 | <SubType>Code</SubType> | 125 | <SubType>Code</SubType> |
126 | </Compile> | 126 | </Compile> |
127 | <Compile Include="Types\ArrayReference.cs"> | 127 | <Compile Include="Types\BaseType.cs"> |
128 | <SubType>Code</SubType> | 128 | <SubType>Code</SubType> |
129 | </Compile> | 129 | </Compile> |
130 | <Compile Include="Types\ObjectReference.cs"> | 130 | <Compile Include="Types\ObjectReference.cs"> |
131 | <SubType>Code</SubType> | 131 | <SubType>Code</SubType> |
132 | </Compile> | 132 | </Compile> |
133 | <Compile Include="Types\PrimitiveTypes\Char.cs"> | 133 | <Compile Include="Types\PrimitiveTypes\Byte.cs"> |
134 | <SubType>Code</SubType> | 134 | <SubType>Code</SubType> |
135 | </Compile> | 135 | </Compile> |
136 | <Compile Include="Types\PrimitiveTypes\Byte.cs"> | 136 | <Compile Include="Types\PrimitiveTypes\Char.cs"> |
137 | <SubType>Code</SubType> | 137 | <SubType>Code</SubType> |
138 | </Compile> | 138 | </Compile> |
139 | <Compile Include="Types\PrimitiveTypes\Float.cs"> | 139 | <Compile Include="Types\PrimitiveTypes\Float.cs"> |
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user deleted file mode 100644 index 082d673..0000000 --- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
2 | <PropertyGroup> | ||
3 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
5 | <ReferencePath>C:\sugilite\bin\</ReferencePath> | ||
6 | <LastOpenVersion>8.0.50727</LastOpenVersion> | ||
7 | <ProjectView>ProjectFiles</ProjectView> | ||
8 | <ProjectTrust>0</ProjectTrust> | ||
9 | </PropertyGroup> | ||
10 | <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> | ||
11 | <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> | ||
12 | </Project> | ||
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build index ac4d564..c5255db 100644 --- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build +++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build | |||
@@ -11,26 +11,26 @@ | |||
11 | <resources prefix="OpenSim.Scripting.EmbeddedJVM" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Scripting.EmbeddedJVM" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="MainMemory.cs" /> | 14 | <include name="ClassInstance.cs" /> |
15 | <include name="ClassRecord.cs" /> | ||
15 | <include name="Heap.cs" /> | 16 | <include name="Heap.cs" /> |
16 | <include name="StackFrame.cs" /> | 17 | <include name="Interpreter.cs" /> |
17 | <include name="InterpreterLogic.cs" /> | 18 | <include name="InterpreterLogic.cs" /> |
18 | <include name="OpenSimJVM.cs" /> | ||
19 | <include name="InterpreterMethods.cs" /> | 19 | <include name="InterpreterMethods.cs" /> |
20 | <include name="ClassInstance.cs" /> | ||
21 | <include name="InterpreterReturn.cs" /> | 20 | <include name="InterpreterReturn.cs" /> |
22 | <include name="Interpreter.cs" /> | 21 | <include name="MainMemory.cs" /> |
23 | <include name="ClassRecord.cs" /> | 22 | <include name="MethodMemory.cs" /> |
24 | <include name="Stack.cs" /> | ||
25 | <include name="Object.cs" /> | 23 | <include name="Object.cs" /> |
24 | <include name="OpenSimJVM.cs" /> | ||
25 | <include name="Stack.cs" /> | ||
26 | <include name="StackFrame.cs" /> | ||
26 | <include name="Thread.cs" /> | 27 | <include name="Thread.cs" /> |
27 | <include name="MethodMemory.cs" /> | ||
28 | <include name="Properties/AssemblyInfo.cs" /> | 28 | <include name="Properties/AssemblyInfo.cs" /> |
29 | <include name="Types/BaseType.cs" /> | ||
30 | <include name="Types/ArrayReference.cs" /> | 29 | <include name="Types/ArrayReference.cs" /> |
30 | <include name="Types/BaseType.cs" /> | ||
31 | <include name="Types/ObjectReference.cs" /> | 31 | <include name="Types/ObjectReference.cs" /> |
32 | <include name="Types/PrimitiveTypes/Char.cs" /> | ||
33 | <include name="Types/PrimitiveTypes/Byte.cs" /> | 32 | <include name="Types/PrimitiveTypes/Byte.cs" /> |
33 | <include name="Types/PrimitiveTypes/Char.cs" /> | ||
34 | <include name="Types/PrimitiveTypes/Float.cs" /> | 34 | <include name="Types/PrimitiveTypes/Float.cs" /> |
35 | <include name="Types/PrimitiveTypes/Int.cs" /> | 35 | <include name="Types/PrimitiveTypes/Int.cs" /> |
36 | </sources> | 36 | </sources> |