fixed project settings

krka · Jun 18, 2010 · a909689 · a909689
1 parent 8ced22e
commit a909689
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 19 deletions.
diff --git a/.idea/libraries/interpreter.xml b/.idea/libraries/interpreter.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/build.xml b/build.xml
@@ -37,7 +37,7 @@
     <path id="interpreter.dependencies">
         <path refid="j2se.dependencies" />
         <pathelement path="${classes.dir}/j2se"/>
-        <pathelement location="${baseDir}/j2se/lib/jsyntaxpane-0.9.5.jar" />
+        <pathelement location="${baseDir}/interpreter/lib/jsyntaxpane-0.9.5.jar" />
     </path>
 
 	<path id="main.classpath">

diff --git a/cldc11/src/se/krka/kahlua/cldc11/CLDC11Platform.java b/cldc11/src/se/krka/kahlua/cldc11/CLDC11Platform.java
@@ -1,11 +1,11 @@
 package se.krka.kahlua.cldc11;
 
+import se.krka.kahlua.Version;
 import se.krka.kahlua.stdlib.BaseLib;
 import se.krka.kahlua.stdlib.CoroutineLib;
 import se.krka.kahlua.stdlib.StringLib;
 import se.krka.kahlua.stdlib.TableLib;
 import se.krka.kahlua.vm.*;
-import se.krka.kahlua.vm.Version;
 
 public class CLDC11Platform implements Platform {
 	private static CLDC11Platform INSTANCE = new CLDC11Platform();

diff --git a/core/src/se/krka/kahlua/Version.java b/core/src/se/krka/kahlua/Version.java
@@ -19,7 +19,7 @@ of this software and associated documentation files (the "Software"), to deal
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-package se.krka.kahlua.vm;
+package se.krka.kahlua;
 
 
 /**

diff --git a/interpreter/interpreter.iml b/interpreter/interpreter.iml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="j2se" />
+    <orderEntry type="module" module-name="core" />
+    <orderEntry type="library" name="interpreter" level="project" />
+    <orderEntry type="module" module-name="core-dep" />
+  </component>
+</module>
+
diff --git a/j2se/lib/jsyntaxpane-0.9.5.jar → interpreter/lib/jsyntaxpane-0.9.5.jar b/j2se/lib/jsyntaxpane-0.9.5.jar → interpreter/lib/jsyntaxpane-0.9.5.jar
diff --git a/j2se/j2se.iml b/j2se/j2se.iml
@@ -21,15 +21,6 @@
       </library>
     </orderEntry>
     <orderEntry type="library" name="libs" level="project" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/jsyntaxpane-0.9.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
   </component>
 </module>
 
diff --git a/j2se/src/se/krka/kahlua/j2se/J2SEPlatform.java b/j2se/src/se/krka/kahlua/j2se/J2SEPlatform.java
@@ -1,16 +1,11 @@
 package se.krka.kahlua.j2se;
 
+import se.krka.kahlua.Version;
 import se.krka.kahlua.luaj.compiler.LuaCompiler;
-import se.krka.kahlua.stdlib.BaseLib;
-import se.krka.kahlua.stdlib.CoroutineLib;
-import se.krka.kahlua.stdlib.OsLib;
-import se.krka.kahlua.stdlib.RandomLib;
-import se.krka.kahlua.stdlib.StringLib;
-import se.krka.kahlua.stdlib.TableLib;
+import se.krka.kahlua.stdlib.*;
 import se.krka.kahlua.test.UserdataArray;
 import se.krka.kahlua.threading.BlockingKahluaThread;
 import se.krka.kahlua.vm.*;
-import se.krka.kahlua.vm.Version;
 
 import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;