Fix inference-dev script and update Eclipse project config (#78)

Author: jyluo

.classpath

@@ -1,23 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="tests"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/annotation-file-utilities"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/dataflow"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jsr308-langtools"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/scene-lib"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/checker"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/framework"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/javacutil"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/plume-lib"/>
-	<classpathentry kind="lib" path="dist/gson-1.7.2.jar"/>
-	<classpathentry kind="lib" path="dist/json-simple-1.1.1.jar"/>
-	<classpathentry kind="lib" path="dist/mockito-all-1.8.4.jar"/>
-	<classpathentry kind="lib" path="dist/org.ow2.sat4j.core-2.3.4.jar"/>
-        <classpathentry kind="lib" path="dist/org.ow2.sat4j.core-2.3.4-tests.jar"/>
-	<classpathentry kind="lib" path="dist/org.ow2.sat4j.maxsat-2.3.4.jar"/>
-	<classpathentry kind="lib" path="dist/org.ow2.sat4j.pb-2.3.4.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" output="build/classes/java/main" path="src"/>
+	<classpathentry kind="src" output="build/classes/java/test" path="tests"/>
+	<classpathentry kind="src" path="/checker"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="lib" path="dist/dependencies.jar"/>
+	<classpathentry kind="output" path="build/default"/>
 </classpath>

.gitignore

@@ -30,3 +30,5 @@ tags
 *.orig
 .DS_Store
 
+# Gradle outputs
+/build/

.travis-build.sh

@@ -7,4 +7,7 @@ set -e
 export SHELLOPTS
 
 . ./.travis-build-without-test.sh
+
+./gradlew testCheckerInferenceDevScript
+
 ./gradlew test

README.md

@@ -27,9 +27,30 @@ https://drive.google.com/drive/u/1/folders/0B7vOZvme6aAOfjQ0bWlFU1VoeVZCVjExVmJL
 That information is being moved to here in the repository.
 
 
-Requirements
+Configure Eclipse to edit Checker Framework Inference
 ------------
 
+The instructions here assumes you have cloned this project into a folder called `checker-framework-inference`.
+
+1) Follow the instructions in the [Checker Framework Manual](https://checkerframework.org/manual/#building-eclipse)
+to download, build, and configure Eclipse to edit the Checker Framework. The Checker Framework Inference Eclipse
+project depends on the eclipse projects from Checker Framework.
+
+2) Follow the instructions below to build Checker Framework Inference
+
+3) Build the dependencies jar file:
+
+````
+gradle dependenciesJar
+````
+
+4) Enter the main Eclipse working screen and in the “File” menu, select “Import” -> “General” -> “Existing Projects into workspace”.
+After the “Import Projects” window appears, select “Select Root Directory”, and select the `checker-framework-inference` directory.
+Eclipse should successfully build all the imported projects.
+
+Requirements
+===============
+
 You will need a JDK (version 8) and gradle.
 
 Following the instructions in the Checker Framework manual to install the Checker Framework from source.

build.gradle

@@ -45,7 +45,7 @@ dependencies {
     compile files("${checkerJar}")
     compile 'org.plumelib:options:0.3.1'
     // Serialize constraints
-    compile 'com.googlecode.json-simple:json-simple:1.1.1'
+    compile 'com.googlecode.json-simple:json-simple:1.1'
     // Pretty print serialized constraints
     compile 'com.google.code.gson:gson:1.7.2'
 
@@ -148,6 +148,7 @@ task dependenciesJar(type: Jar) {
     description 'Create a jar file with all the dependencies.'
     from {
         configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+        configurations.testCompile.collect { it.isDirectory() ? it : zipTree(it) }
     }
     archiveName 'dependencies.jar'
     destinationDir file("${projectDir}/dist/")
@@ -192,6 +193,15 @@ task release(type: Zip) {
     baseName = 'release'
 }
 
+task testCheckerInferenceDevScript(type: Exec, dependsOn: [dist, dependenciesJar]) {
+    description 'Basic sanity check of scripts/inference-dev'
+    executable './scripts/inference-dev'
+    args = ['--mode', 'INFER',
+            '--checker', 'interning.InterningChecker',
+            '--solver', 'checkers.inference.solver.MaxSat2TypeSolver',
+            'testdata/interning/MapAssignment.java']
+}
+
 /// Commented out because plugins section is commented out
 // /* Configuration for formatting */
 // googleJavaFormat {

scripts/inference-dev

@@ -24,12 +24,15 @@ annoToolsDir="$ROOT"/annotation-tools
 stubparserDir="$ROOT"/stubparser
 cfDir="$ROOT"/checker-framework
 cfiDir="$ROOT"/checker-framework-inference
+afuDir="${annoToolsDir}"/annotation-file-utilities
+classes="build/classes/java"
+resources="build/resources/main"
 
 distDir="$cfiDir"/dist
 
-jdkPaths="${cfDir}"/jdk/annotated
+jdkPaths="${cfDir}"/checker/dist/jdk8.jar
 
-CFBuild="${langtoolsDir}"/build/classes:"${annoToolsDir}"/scene-lib/bin:"${cfDir}"/dataflow/build:"${cfDir}"/javacutil/build:"${stubparserDir}"/stubparser.jar:"${cfDir}"/framework/build:"${cfDir}"/checker/build
+CFBuild="${cfDir}"/dataflow/"${classes}":"${cfDir}"/javacutil/"${classes}":"${cfDir}"/framework/"${classes}":"${cfDir}"/framework/"${resources}":"${cfDir}"/checker/"${classes}":"${cfDir}"/checker/"${resources}":"${annoToolsDir}"/scene-lib/bin:"${langtoolsDir}"/build/classes:"${stubparserDir}"/javaparser-core/stubparser.jar:"${afuDir}"/lib/options-all-0.3.1.jar:"${afuDir}"/lib/plume-util-0.0.1.jar:"${afuDir}"/lib/guava-20.0.jar
 
 CFIBuild="${cfiDir}/build/classes/java/main"