From: <ls...@us...> - 2008-08-19 20:07:45
|
Revision: 4469 http://jnode.svn.sourceforge.net/jnode/?rev=4469&view=rev Author: lsantha Date: 2008-08-19 20:07:41 +0000 (Tue, 19 Aug 2008) Log Message: ----------- Fixed ouput paths and module dependencies. This enables compiling the JNode sources with Idea. Modified Paths: -------------- trunk/JNode.ipr trunk/builder/builder.iml trunk/core/core.iml trunk/distr/distr.iml trunk/fs/fs.iml trunk/gui/gui.iml trunk/jnode.iml trunk/net/net.iml trunk/shell/shell.iml trunk/sound/sound.iml trunk/textui/textui.iml Modified: trunk/JNode.ipr =================================================================== --- trunk/JNode.ipr 2008-08-19 19:59:21 UTC (rev 4468) +++ trunk/JNode.ipr 2008-08-19 20:07:41 UTC (rev 4469) @@ -140,7 +140,7 @@ <option name="GENERATE_NO_WARNINGS" value="false" /> <option name="DEPRECATION" value="true" /> <option name="ADDITIONAL_OPTIONS_STRING" value="" /> - <option name="MAXIMUM_HEAP_SIZE" value="128" /> + <option name="MAXIMUM_HEAP_SIZE" value="1024" /> </component> <component name="JavadocGenerationManager"> <option name="OUTPUT_DIRECTORY" /> @@ -337,6 +337,7 @@ </entry> </map> </option> + <option name="myVersion" value="123" /> </component> <component name="VcsDirectoryMappings"> <mapping directory="" vcs="svn" /> Modified: trunk/builder/builder.iml =================================================================== --- trunk/builder/builder.iml 2008-08-19 19:59:21 UTC (rev 4468) +++ trunk/builder/builder.iml 2008-08-19 20:07:41 UTC (rev 4469) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <module relativePaths="true" type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/classes" /> + <output url="file://$MODULE_DIR$/build/classes" /> <exclude-output /> <exclude-exploded /> <content url="file://$MODULE_DIR$"> @@ -29,15 +29,6 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/dom4j.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> <orderEntry type="library" name="core" level="project" /> <orderEntry type="module-library"> <library> @@ -78,15 +69,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/classycle.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/lib/pmd/xmlParserAPIs-2.6.2.jar!/" /> </CLASSES> <JAVADOC /> @@ -96,7 +78,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/itext-1.3.jar!/" /> + <root url="jar://$MODULE_DIR$/../core/lib/asm-1.5.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -105,7 +87,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../core/lib/asm-1.5.3.jar!/" /> + <root url="jar://$MODULE_DIR$/../core/lib/asm-attrs-1.5.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -114,7 +96,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../core/lib/asm-attrs-1.5.3.jar!/" /> + <root url="jar://$MODULE_DIR$/../core/lib/asm-util-1.5.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -123,7 +105,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../core/lib/asm-util-1.5.3.jar!/" /> + <root url="jar://$MODULE_DIR$/lib/bcel-5.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -132,12 +114,13 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/bcel-5.1.jar!/" /> + <root url="jar://$MODULE_DIR$/lib/nanoxml-2.2.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module" module-name="fs" /> <orderEntryProperties /> </component> </module> Modified: trunk/core/core.iml =================================================================== --- trunk/core/core.iml 2008-08-19 19:59:21 UTC (rev 4468) +++ trunk/core/core.iml 2008-08-19 20:07:41 UTC (rev 4469) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <module relativePaths="true" type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/classes" /> + <output url="file://$MODULE_DIR$/build/classes" /> <exclude-output /> <exclude-exploded /> <content url="file://$MODULE_DIR$"> @@ -28,6 +28,24 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="core" level="project" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/lib/mmtk/mmtk.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/lib/mauve.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: trunk/distr/distr.iml =================================================================== --- trunk/distr/distr.iml 2008-08-19 19:59:21 UTC (rev 4468) +++ trunk/distr/distr.iml 2008-08-19 20:07:41 UTC (rev 4469) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <module relativePaths="true" type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/classes" /> + <output url="file://$MODULE_DIR$/build/classes" /> <exclude-output /> <exclude-exploded /> <content url="file://$MODULE_DIR$"> @@ -37,6 +37,7 @@ </library> </orderEntry> <orderEntry type="module" module-name="gui" /> + <orderEntry type="module" module-name="fs" /> <orderEntryProperties /> </component> </module> Modified: trunk/fs/fs.iml =================================================================== --- trunk/fs/fs.iml 2008-08-19 19:59:21 UTC (rev 4468) +++ trunk/fs/fs.iml 2008-08-19 20:07:41 UTC (rev 4469) @@ -4,7 +4,7 @@ <connections /> </component> <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/classes" /> + <output url="file://$MODULE_DIR$/build/classes" /> <exclude-output /> <exclude-exploded /> <content url="file://$MODULE_DIR$"> @@ -45,6 +45,24 @@ </library> </orderEntry> <orderEntry type="module" module-name="net" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../core/lib/junit.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../core/lib/jfunc.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: trunk/gui/gui.iml =================================================================== --- trunk/gui/gui.iml 2008-08-19 19:59:21 UTC (rev 4468) +++ trunk/gui/gui.iml 2008-08-19 20:07:41 UTC (rev 4469) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <module relativePaths="true" type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/classes" /> + <output url="file://$MODULE_DIR$/build/classes" /> <exclude-output /> <exclude-exploded /> <content url="file://$MODULE_DIR$"> Modified: trunk/jnode.iml =================================================================== --- trunk/jnode.iml 2008-08-19 19:59:21 UTC (rev 4468) +++ trunk/jnode.iml 2008-08-19 20:07:41 UTC (rev 4469) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <module relativePaths="true" type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/classes" /> + <output url="file://$MODULE_DIR$/build/classes" /> <exclude-output /> <exclude-exploded /> <content url="file://$MODULE_DIR$"> Modified: trunk/net/net.iml =================================================================== --- trunk/net/net.iml 2008-08-19 19:59:21 UTC (rev 4468) +++ trunk/net/net.iml 2008-08-19 20:07:41 UTC (rev 4469) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <module relativePaths="true" type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/classes" /> + <output url="file://$MODULE_DIR$/build/classes" /> <exclude-output /> <exclude-exploded /> <content url="file://$MODULE_DIR$"> @@ -24,6 +24,15 @@ <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" /> </library> </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../core/lib/commons-net-1.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: trunk/shell/shell.iml =================================================================== --- trunk/shell/shell.iml 2008-08-19 19:59:21 UTC (rev 4468) +++ trunk/shell/shell.iml 2008-08-19 20:07:41 UTC (rev 4469) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <module relativePaths="true" type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/classes" /> + <output url="file://$MODULE_DIR$/build/classes" /> <exclude-output /> <exclude-exploded /> <content url="file://$MODULE_DIR$"> @@ -13,6 +13,15 @@ <orderEntry type="library" name="shell" level="project" /> <orderEntry type="library" name="core" level="project" /> <orderEntry type="module" module-name="core" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/lib/bsh-2.0b5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: trunk/sound/sound.iml =================================================================== --- trunk/sound/sound.iml 2008-08-19 19:59:21 UTC (rev 4468) +++ trunk/sound/sound.iml 2008-08-19 20:07:41 UTC (rev 4469) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <module relativePaths="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/build/classes" /> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/driver" isTestSource="false" /> Modified: trunk/textui/textui.iml =================================================================== --- trunk/textui/textui.iml 2008-08-19 19:59:21 UTC (rev 4468) +++ trunk/textui/textui.iml 2008-08-19 20:07:41 UTC (rev 4469) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <module relativePaths="true" type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/classes" /> + <output url="file://$MODULE_DIR$/build/classes" /> <exclude-output /> <exclude-exploded /> <content url="file://$MODULE_DIR$"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |