@@ -74,13 +74,13 @@ | |||
</javac> | |||
</target> | |||
<target name="compile16" depends="prepare"> | |||
<target name="compile18" depends="prepare"> | |||
<javac srcdir="${src.dir}" | |||
destdir="${build.classes.dir}" | |||
debug="on" | |||
deprecation="on" | |||
source="1.6" | |||
target="1.6" | |||
source="1.8" | |||
target="1.8" | |||
optimize="off" | |||
includeantruntime="true" | |||
includes="**"> | |||
@@ -181,7 +181,7 @@ | |||
to ${build.classes.dir}.</echo> | |||
</target> | |||
<target name="jar" depends="compile16"> | |||
<target name="jar" depends="compile18"> | |||
<jar jarfile="${target.jar}" update="true" manifest="${src.dir}/META-INF/MANIFEST.MF"> | |||
<fileset dir="${build.classes.dir}"> | |||
<include name="**/*.class"/> |
@@ -440,4 +440,17 @@ public class JvstTest5 extends JvstTestRoot { | |||
assertTrue(names[0].equals("test5.NestHost$Foo") || names[0].equals("test5.NestHost$Bar")); | |||
assertTrue(names[1].equals("test5.NestHost$Foo") || names[1].equals("test5.NestHost$Bar")); | |||
} | |||
public void testNestMembersAttributeCopy() throws Exception { | |||
CtClass cc = sloader.get("test5.NestHost2"); | |||
cc.getClassFile().compact(); | |||
cc.writeFile(); | |||
make(cc.getName()); | |||
} | |||
public void testNestHostAttributeCopy() throws Exception { | |||
CtClass cc = sloader.get("test5.NestHost2$Foo"); | |||
cc.getClassFile().compact(); | |||
cc.toClass(); | |||
} | |||
} |
@@ -0,0 +1,11 @@ | |||
package test5; | |||
public class NestHost { | |||
private int value; | |||
public class Foo { | |||
int foo() { return value++; } | |||
} | |||
public class Bar { | |||
int bar() { return value++; } | |||
} | |||
} |
@@ -0,0 +1,11 @@ | |||
package test5; | |||
public class NestHost2 { | |||
private int value; | |||
public class Foo { | |||
int foo() { return value++; } | |||
} | |||
public class Bar { | |||
int bar() { return value++; } | |||
} | |||
} |