Browse Source

More work on IDEA setup.

Make plugins its own module, exclude a load of junk.

Change-Id: I92e2665c42f26bc7b5e87b6e7e2ff43581805f6b
Reviewed-on: http://gerrit.dmdirc.com/3680
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>
pull/1/head
Chris Smith 9 years ago
parent
commit
bb582c81f0
6 changed files with 47 additions and 4 deletions
  1. 1
    0
      .gitignore
  2. 2
    0
      .idea/libraries/plugins_build.xml
  3. 14
    0
      .idea/libraries/plugins_test.xml
  4. 1
    0
      .idea/modules.xml
  5. 21
    0
      .idea/plugins.iml
  6. 8
    4
      DMDirc.iml

+ 1
- 0
.gitignore View File

42
 /test_profile
42
 /test_profile
43
 /*.key
43
 /*.key
44
 /teamcity-info.xml
44
 /teamcity-info.xml
45
+/.idea/workspace.xml

+ 2
- 0
.idea/libraries/plugins_build.xml View File

9
       <root url="jar://$PROJECT_DIR$/modules/plugins/lib/build/jgit-describe.jar!/" />
9
       <root url="jar://$PROJECT_DIR$/modules/plugins/lib/build/jgit-describe.jar!/" />
10
       <root url="jar://$PROJECT_DIR$/modules/plugins/lib/build/jsch.jar!/" />
10
       <root url="jar://$PROJECT_DIR$/modules/plugins/lib/build/jsch.jar!/" />
11
       <root url="jar://$PROJECT_DIR$/modules/plugins/lib/build/org.eclipse.jgit.jar!/" />
11
       <root url="jar://$PROJECT_DIR$/modules/plugins/lib/build/org.eclipse.jgit.jar!/" />
12
+      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/build/dagger-compiler.jar!/" />
13
+      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/build/dagger.jar!/" />
12
     </CLASSES>
14
     </CLASSES>
13
     <JAVADOC />
15
     <JAVADOC />
14
     <SOURCES />
16
     <SOURCES />

+ 14
- 0
.idea/libraries/plugins_test.xml View File

1
+<component name="libraryTable">
2
+  <library name="plugins test">
3
+    <CLASSES>
4
+      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/test/clover.jar!/" />
5
+      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/test/hamcrest-core.jar!/" />
6
+      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/test/junit.jar!/" />
7
+      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/test/mockito-all.jar!/" />
8
+    </CLASSES>
9
+    <JAVADOC />
10
+    <SOURCES>
11
+      <root url="jar://$PROJECT_DIR$/modules/plugins/lib/test/mockito-all.jar!/" />
12
+    </SOURCES>
13
+  </library>
14
+</component>

+ 1
- 0
.idea/modules.xml View File

3
   <component name="ProjectModuleManager">
3
   <component name="ProjectModuleManager">
4
     <modules>
4
     <modules>
5
       <module fileurl="file://$PROJECT_DIR$/DMDirc.iml" filepath="$PROJECT_DIR$/DMDirc.iml" />
5
       <module fileurl="file://$PROJECT_DIR$/DMDirc.iml" filepath="$PROJECT_DIR$/DMDirc.iml" />
6
+      <module fileurl="file://$PROJECT_DIR$/.idea//plugins.iml" filepath="$PROJECT_DIR$/.idea//plugins.iml" />
6
     </modules>
7
     </modules>
7
   </component>
8
   </component>
8
 </project>
9
 </project>

+ 21
- 0
.idea/plugins.iml View File

1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<module type="JAVA_MODULE" version="4">
3
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
4
+    <exclude-output />
5
+    <content url="file://$MODULE_DIR$/modules/plugins">
6
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/src" isTestSource="false" />
7
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/test" isTestSource="true" />
8
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/build" />
9
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/dist" />
10
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/etc" />
11
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/lib" />
12
+    </content>
13
+    <orderEntry type="inheritedJdk" />
14
+    <orderEntry type="sourceFolder" forTests="false" />
15
+    <orderEntry type="library" name="plugins build" level="project" />
16
+    <orderEntry type="library" name="plugins main" level="project" />
17
+    <orderEntry type="library" name="plugins test" level="project" />
18
+    <orderEntry type="module" module-name="DMDirc" />
19
+  </component>
20
+</module>
21
+

+ 8
- 4
DMDirc.iml View File

6
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
6
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
7
       <sourceFolder url="file://$MODULE_DIR$/modules/util/src" isTestSource="false" />
7
       <sourceFolder url="file://$MODULE_DIR$/modules/util/src" isTestSource="false" />
8
       <sourceFolder url="file://$MODULE_DIR$/modules/util/test" isTestSource="true" />
8
       <sourceFolder url="file://$MODULE_DIR$/modules/util/test" isTestSource="true" />
9
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/src" isTestSource="false" />
10
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/test" isTestSource="true" />
11
       <sourceFolder url="file://$MODULE_DIR$/modules/parser/src" isTestSource="false" />
9
       <sourceFolder url="file://$MODULE_DIR$/modules/parser/src" isTestSource="false" />
12
       <sourceFolder url="file://$MODULE_DIR$/modules/parser/test" isTestSource="true" />
10
       <sourceFolder url="file://$MODULE_DIR$/modules/parser/test" isTestSource="true" />
13
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
11
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
12
+      <excludeFolder url="file://$MODULE_DIR$/.clover" />
13
+      <excludeFolder url="file://$MODULE_DIR$/dist" />
14
+      <excludeFolder url="file://$MODULE_DIR$/etc" />
15
+      <excludeFolder url="file://$MODULE_DIR$/installer" />
16
+      <excludeFolder url="file://$MODULE_DIR$/junitreports" />
17
+      <excludeFolder url="file://$MODULE_DIR$/lib" />
18
+      <excludeFolder url="file://$MODULE_DIR$/nbproject" />
19
+      <excludeFolder url="file://$MODULE_DIR$/reports" />
14
     </content>
20
     </content>
15
     <orderEntry type="inheritedJdk" />
21
     <orderEntry type="inheritedJdk" />
16
     <orderEntry type="sourceFolder" forTests="false" />
22
     <orderEntry type="sourceFolder" forTests="false" />
17
     <orderEntry type="library" name="build" level="project" />
23
     <orderEntry type="library" name="build" level="project" />
18
     <orderEntry type="library" name="main" level="project" />
24
     <orderEntry type="library" name="main" level="project" />
19
-    <orderEntry type="library" name="plugins build" level="project" />
20
-    <orderEntry type="library" name="plugins main" level="project" />
21
     <orderEntry type="library" name="test" level="project" />
25
     <orderEntry type="library" name="test" level="project" />
22
   </component>
26
   </component>
23
 </module>
27
 </module>

Loading…
Cancel
Save