Skip to content

Commit fef4c19

Browse files
tim-hoffmantim-hoffman
committed
Merge branch 'develop' into CustomizedSoot
2 parents 2b0bfa9 + d3059eb commit fef4c19

File tree

177 files changed

+17927
-2395
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

177 files changed

+17927
-2395
lines changed

‎.classpath

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<classpath>
33
<classpathentry kind="src" path="generated/jastadd"/>
44
<classpathentry excluding="soot/jimple/toolkits/ctl/CTLEvaluator.java|soot/jimple/toolkits/ctl/CopyOfCTLAnalysis.java|soot/jimple/toolkits/ctl/formula/AF.java|soot/jimple/toolkits/ctl/formula/AG.java|soot/jimple/toolkits/ctl/formula/AU.java|soot/jimple/toolkits/ctl/formula/AX.java|soot/jimple/toolkits/ctl/formula/EF.java|soot/jimple/toolkits/ctl/formula/And.java" kind="src" path="src"/>
5-
<classpathentry kind="src" path="tests"/>
5+
<classpathentry kind="src" output="testclasses" path="tests"/>
66
<classpathentry excluding="soot/AntTask.java" kind="src" path="generated/options"/>
77
<classpathentry kind="src" path="generated/sablecc"/>
88
<classpathentry kind="src" path="generated/singletons"/>
@@ -14,6 +14,11 @@
1414
<classpathentry kind="lib" path="libs/hamcrest-all-1.3.jar"/>
1515
<classpathentry kind="lib" path="libs/junit-4.11.jar"/>
1616
<classpathentry kind="lib" path="libs/asm-debug-all-5.0.3.jar"/>
17+
<classpathentry kind="lib" path="libs/cglib-nodep-2.2.2.jar"/>
18+
<classpathentry kind="lib" path="libs/java_cup.jar"/>
19+
<classpathentry kind="lib" path="libs/javassist-3.18.2-GA.jar"/>
20+
<classpathentry kind="lib" path="libs/mockito-all-1.10.8.jar"/>
21+
<classpathentry kind="lib" path="libs/powermock-mockito-1.6.1-full.jar"/>
1722
<classpathentry kind="lib" path="libs/dexlib2-2.0.5-dev.jar"/>
1823
<classpathentry kind="lib" path="libs/util-2.0.5-dev.jar"/>
1924
<classpathentry kind="lib" path="libs/commons-lang3-3.4.jar"/>

‎ant.settings.jenkins

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,6 @@ hamcrest.jar=libs/hamcrest-all-1.3.jar
4040
javacup.jar=libs/java_cup.jar
4141

4242
commons-lang.jar=libs/commons-lang3-3.4.jar
43+
mockito.jar=libs/mockito-all-1.10.8.jar
44+
powermock-mockito.jar=libs/powermock-mockito-1.6.1-full.jar
45+
javassist.jar=libs/javassist-3.18.2-GA.jar

‎ant.settings.template

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,6 @@ hamcrest.jar=libs/hamcrest-all-1.3.jar
4141
javacup.jar=../libs/java_cup.jar
4242

4343
commons-lang.jar=libs/commons-lang3-3.4.jar
44+
mockito.jar=libs/mockito-all-1.10.8.jar
45+
powermock-mockito.jar=libs/powermock-mockito-1.6.1-full.jar
46+
javassist.jar=libs/javassist-3.18.2-GA.jar

‎build.xml

Lines changed: 37 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,15 @@
3333
<pathelement location="${jasmin.jar}"/>
3434
<pathelement location="${heros.jar}"/>
3535
<pathelement location="${axmlprinter2.jar}"/>
36-
<pathelement location="${dexlib2.jar}"/>
37-
<pathelement location="${dexlib-utils.jar}"/>
38-
<pathelement location="${slf4j-api.jar}"/>
39-
<pathelement location="${slf4j-simple.jar}"/>
4036
<pathelement location="${asm.jar}"/>
4137
<pathelement location="${commons-lang.jar}"/>
42-
</classpath>
38+
39+
<pathelement location="${slf4j-api.jar}"/>
40+
<pathelement location="${slf4j-simple.jar}"/>
41+
42+
<pathelement location="${dexlib2.jar}"/>
43+
<pathelement location="${dexlib-utils.jar}"/>
44+
</classpath>
4345
<src path="src"/>
4446
<src path="generated/singletons"/>
4547
<src path="generated/sablecc"/>
@@ -202,11 +204,22 @@
202204
<target name="buildtests" depends="compile,settings">
203205
<mkdir dir="testclasses"/>
204206
<javac
207+
source="1.6"
208+
target="1.6"
205209
srcdir="tests"
206210
destdir="testclasses"
207-
classpath="classes:${polyglot.jar}:${jasmin.jar}:${junit.jar}:${hamcrest.jar}"
208-
debug="true"
209-
/>
211+
debug="true">
212+
<classpath>
213+
<pathelement location="classes"/>
214+
<pathelement location="${polyglot.jar}"/>
215+
<pathelement location="${jasmin.jar}"/>
216+
<pathelement location="${asm.jar}"/>
217+
<pathelement location="${junit.jar}"/>
218+
<pathelement location="${hamcrest.jar}"/>
219+
<pathelement location="${mockito.jar}"/>
220+
<pathelement location="${powermock-mockito.jar}"/>
221+
</classpath>
222+
</javac>
210223
</target>
211224

212225
<target name="runtests" depends="buildtests,settings">
@@ -217,20 +230,30 @@
217230
<pathelement location="classes"/>
218231
<pathelement location="${polyglot.jar}"/>
219232
<pathelement location="${jasmin.jar}"/>
220-
<pathelement location="${junit.jar}"/>
221-
<pathelement location="${hamcrest.jar}"/>
222-
<pathelement location="${dexlib2.jar}"/>
233+
<pathelement location="${axmlprinter2.jar}"/>
234+
<pathelement location="${dexlib2.jar}"/>
223235
<pathelement location="${dexlib-utils.jar}"/>
224236
<pathelement location="${heros.jar}"/>
225237
<pathelement location="${asm.jar}"/>
226-
</classpath>
238+
<pathelement location="${javassist.jar}"/>
239+
<pathelement location="${xmlprinter.jar}"/>
240+
<pathelement location="${commons-lang.jar}"/>
241+
242+
<pathelement location="${slf4j-api.jar}"/>
243+
<pathelement location="${slf4j-simple.jar}"/>
244+
245+
<pathelement location="${junit.jar}"/>
246+
<pathelement location="${hamcrest.jar}"/>
247+
<pathelement location="${mockito.jar}"/>
248+
<pathelement location="${powermock-mockito.jar}"/>
249+
</classpath>
227250

228251
<jvmarg value="-ea" />
229252

230253
<formatter type="xml" usefile="true" />
231254
<batchtest todir="reports">
232-
<fileset dir="testclasses" includes="**/Test*.class"/>
233-
<fileset dir="testclasses" includes="**/*Test.class"/>
255+
<fileset dir="testclasses" includes="**/Test*.class" excludes="**/Abstract*.class" />
256+
<fileset dir="testclasses" includes="**/*Test.class" excludes="**/Abstract*.class" />
234257
</batchtest>
235258
</junit>
236259
</target>

‎doc/soot_options.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
th {
2+
text-align: left;
3+
}
4+
5+
.value {
6+
font-family: monospace;
7+
font-size: small;
8+
}

0 commit comments

Comments
 (0)