Skip to content

Commit 4c5f3d8

Browse files
sgothelsgothel
committed
Bump jcpp (merged w/ jcpp upstream v1.4.14) and adopt to changes
1 parent 0e6d18c commit 4c5f3d8

File tree

5 files changed

+55
-19
lines changed

5 files changed

+55
-19
lines changed

‎.classpath

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,6 @@
3333
</attributes>
3434
</classpathentry>
3535
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Android-24"/>
36+
<classpathentry kind="lib" path="jcpp/lib/guava-32.1.2-jre.jar"/>
3637
<classpathentry kind="output" path="build/eclipse-classes"/>
3738
</classpath>

‎jcpp

Submodule jcpp updated 43 files

‎make/build-test.xml

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<property name="test.junit.generation.dir" value="${test.base.dir}/${test.junit.generation.rel}" />
3838

3939
<property name="test.jcpp.base.dir" value="${project.root}/jcpp/src/test/java" />
40+
<property name="test.jcpp.guava.jar" value="${project.root}/jcpp/lib/guava-32.1.2-jre.jar" />
4041

4142
<property name="tempdir" value="${project.root}/build-temp" />
4243
<property name="build" location="${project.root}/${rootrel.build}" />
@@ -81,20 +82,27 @@
8182
</path>
8283

8384
<path id="junit.compile.classpath">
85+
<pathelement location="${semver.jar}" />
8486
<pathelement location="${junit.jar}" />
87+
<pathelement location="${gluegen.jar}" />
88+
</path>
89+
<path id="jcpp.junit.compile.classpath">
8590
<pathelement location="${semver.jar}" />
91+
<pathelement location="${junit.jar}" />
8692
<pathelement location="${gluegen.jar}" />
93+
<pathelement location="${test.jcpp.guava.jar}" />
8794
</path>
88-
8995
<path id="junit.run.classpath">
90-
<pathelement location="${junit.jar}" />
9196
<pathelement location="${semver.jar}" />
97+
<pathelement location="${junit.jar}" />
9298
<pathelement location="${TestJarsInJar.jar}" />
9399
<pathelement location="${gluegen-rt.jar}" />
94100
<pathelement location="${gluegen.jar}" />
95101
<pathelement location="${gluegen-test-util.jar}" />
96102
<pathelement location="${gluegen-test.jar}" />
103+
<pathelement location="${test.jcpp.guava.jar}" />
97104
</path>
105+
98106
<property name="junit.run.jars" value="${junit.jar}${path.separator}${ant.jar}${path.separator}${semver.jar}${path.separator}${TestJarsInJar.jar}${path.separator}${gluegen.root}/${rootrel.build}/gluegen-rt.jar${path.separator}${gluegen.root}/${rootrel.build}/gluegen.jar${path.separator}${build}/gluegen-test-util.jar${path.separator}${build_t}/gluegen-test.jar"/>
99107
<property name="junit.run.remote.jars" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit4.jar${path.separator}${semver.jar}${path.separator}${gluegen.root}/make/lib/TestJarsInJar.jar${path.separator}${gluegen.root}/${rootrel.build}/gluegen-rt.jar${path.separator}${gluegen.root}/${rootrel.build}/gluegen.jar${path.separator}${build}/gluegen-test-util.jar${path.separator}${build_t}/gluegen-test.jar"/>
100108
<property name="junit.run.remote.apks" value="${gluegen.root}/${rootrel.build}/jogamp-android-launcher.apk${path.separator}${ant-junit-all.apk}${path.separator}${gluegen.root}/${rootrel.build}/gluegen-rt-android-${android.abi}.apk${path.separator}${build_t}/gluegen-test.apk${path.separator}${gluegen.root}/make/lib/TestJarsInJar.apk"/>
@@ -160,7 +168,7 @@
160168
<src path="${build_t.gen}/classes/com/jogamp/gluegen/test/junit/structgen" />
161169
</javac>
162170

163-
<!-- Javac All - Third -->
171+
<!-- GlueGen Tests - Third -->
164172
<!-- This has a hard Java8 target spec test: source, target + bootclasspath -->
165173
<javac destdir="${build_t.java}"
166174
fork="yes"
@@ -175,6 +183,21 @@
175183
<classpath refid="junit.compile.classpath"/>
176184
<compilerarg value="-proc:none"/>
177185
<src path="${test.base.dir}"/>
186+
<src path="${build_t.gen}" />
187+
</javac>
188+
189+
<!-- JCPP Tests - Fourth -->
190+
<!-- This has a soft Java8 bytecote target only (Using some build time APIs): target -->
191+
<javac destdir="${build_t.java}"
192+
fork="yes"
193+
includeAntRuntime="false"
194+
memoryMaximumSize="${javac.memorymax}"
195+
encoding="UTF-8"
196+
source="${target.sourcelevel}"
197+
target="${target.targetlevel}"
198+
debug="${javacdebug}" debuglevel="${javacdebuglevel}">
199+
<classpath refid="jcpp.junit.compile.classpath"/>
200+
<compilerarg value="-proc:none"/>
178201
<src path="${test.jcpp.base.dir}"/>
179202
<src path="${build_t.gen}" />
180203
</javac>

‎make/scripts/runtest.sh

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ X_ARGS="-Drootrel.build=$ROOTREL_BUILD -Dgluegen.root=$GLUEGEN_ROOT"
7878
#D_ARGS="-Djogamp.debug.Logging"
7979

8080
function onetest() {
81-
#USE_CLASSPATH=lib/junit.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/gluegen-rt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar
82-
USE_CLASSPATH=lib/junit.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/gluegen-rt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar:"$builddir"/gluegen-rt-natives.jar
83-
#USE_CLASSPATH=lib/junit.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/gluegen-rt-alt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar
84-
#USE_CLASSPATH=lib/junit.jar:$ANT_JARS:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/classes:"$builddir"/test/build/classes
81+
#USE_CLASSPATH=lib/junit.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/gluegen-rt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar:../jcpp/lib/guava-32.1.2-jre.jar
82+
USE_CLASSPATH=lib/junit.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/gluegen-rt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar:"$builddir"/gluegen-rt-natives.jar:../jcpp/lib/guava-32.1.2-jre.jar
83+
#USE_CLASSPATH=lib/junit.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/gluegen-rt-alt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar:../jcpp/lib/guava-32.1.2-jre.jar
84+
#USE_CLASSPATH=lib/junit.jar:$ANT_JARS:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/classes:"$builddir"/test/build/classes:../jcpp/lib/guava-32.1.2-jre.jar
8585
#libspath="${builddirAbs}"/test/build/natives
8686
libspath="${builddirAbs}"/obj:"${builddirAbs}"/test/build/natives
8787
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$libspath
@@ -151,21 +151,30 @@ function onetest() {
151151
#onetest com.jogamp.gluegen.test.junit.internals.TestType 2>&1 | tee -a $LOG
152152

153153
#onetest com.jogamp.gluegen.test.junit.generation.TestPCPP 2>&1 | tee -a $LOG
154-
#onetest com.jogamp.gluegen.jcpp.IncludeAbsoluteTest 2>&1 | tee -a $LOG
155154
#onetest com.jogamp.gluegen.jcpp.CppReaderTest 2>&1 | tee -a $LOG
156-
#onetest com.jogamp.gluegen.jcpp.TokenPastingWhitespaceTest 2>&1 | tee -a $LOG
155+
#onetest com.jogamp.gluegen.jcpp.ErrorTest 2>&1 | tee -a $LOG
156+
#onetest com.jogamp.gluegen.jcpp.IncludeAbsoluteTest 2>&1 | tee -a $LOG
157+
#onetest com.jogamp.gluegen.jcpp.JavaFileSystemTest 2>&1 | tee -a $LOG
158+
#onetest com.jogamp.gluegen.jcpp.JoinReaderTest 2>&1 | tee -a $LOG
159+
#onetest com.jogamp.gluegen.jcpp.LexerSourceTest 2>&1 | tee -a $LOG
160+
#onetest com.jogamp.gluegen.jcpp.NumericValueTest 2>&1 | tee -a $LOG
161+
onetest com.jogamp.gluegen.jcpp.PragmaTest 2>&1 | tee -a $LOG
157162
#onetest com.jogamp.gluegen.jcpp.PreprocessorTest 2>&1 | tee -a $LOG
163+
#onetest com.jogamp.gluegen.jcpp.RegressionTest 2>&1 | tee -a $LOG
164+
#onetest com.jogamp.gluegen.jcpp.TokenPastingWhitespaceTest 2>&1 | tee -a $LOG
165+
#onetest com.jogamp.gluegen.jcpp.VaArgsPastingTest 2>&1 | tee -a $LOG
166+
158167

159168
#onetest com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter 2>&1 | tee -a $LOG
160169
#onetest com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter 2>&1 | tee -a $LOG
161170
#onetest com.jogamp.gluegen.test.junit.generation.Test1p2LoadJNIAndImplLib 2>&1 | tee -a $LOG
162-
onetest com.jogamp.gluegen.test.junit.generation.Test1p2DynamicLibraryBundle 2>&1 | tee -a $LOG
163-
onetest com.jogamp.gluegen.test.junit.generation.Test2p1FuncPtr 2>&1 | tee -a $LOG
164-
onetest com.jogamp.gluegen.test.junit.generation.Test2p2FuncPtr 2>&1 | tee -a $LOG
165-
onetest com.jogamp.gluegen.test.junit.generation.Test3p1PtrStorage 2>&1 | tee -a $LOG
166-
onetest com.jogamp.gluegen.test.junit.generation.Test3p2PtrStorage 2>&1 | tee -a $LOG
167-
onetest com.jogamp.gluegen.test.junit.generation.Test4p1JavaCallback 2>&1 | tee -a $LOG
168-
onetest com.jogamp.gluegen.test.junit.generation.Test4p2JavaCallback 2>&1 | tee -a $LOG
171+
#onetest com.jogamp.gluegen.test.junit.generation.Test1p2DynamicLibraryBundle 2>&1 | tee -a $LOG
172+
#onetest com.jogamp.gluegen.test.junit.generation.Test2p1FuncPtr 2>&1 | tee -a $LOG
173+
#onetest com.jogamp.gluegen.test.junit.generation.Test2p2FuncPtr 2>&1 | tee -a $LOG
174+
#onetest com.jogamp.gluegen.test.junit.generation.Test3p1PtrStorage 2>&1 | tee -a $LOG
175+
#onetest com.jogamp.gluegen.test.junit.generation.Test3p2PtrStorage 2>&1 | tee -a $LOG
176+
#onetest com.jogamp.gluegen.test.junit.generation.Test4p1JavaCallback 2>&1 | tee -a $LOG
177+
#onetest com.jogamp.gluegen.test.junit.generation.Test4p2JavaCallback 2>&1 | tee -a $LOG
169178
#onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen01 2>&1 | tee -a $LOG
170179
#onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen02 2>&1 | tee -a $LOG
171180

‎src/junit/com/jogamp/gluegen/test/junit/generation/BuildEnvironment.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,10 @@
3838
*/
3939
public final class BuildEnvironment {
4040

41+
public static final String rootrel_build;
4142
public static final String gluegenRoot;
4243
public static final String testOutput;
43-
public static final String rootrel_build;
44+
public static final String build;
4445

4546
static {
4647

@@ -63,8 +64,10 @@ public final class BuildEnvironment {
6364
gluegenRoot = gluegen_root_tmp;
6465
out.println("gluegen.root: " + gluegenRoot);
6566

66-
testOutput = gluegenRoot + "/" + rootrel_build + "/test";
67+
build = gluegenRoot + "/" + rootrel_build;
68+
out.println("build: " + build);
6769

70+
testOutput = build + "/test";
6871
out.println("testOutput: "+testOutput);
6972
out.println(" - - - - - - - - - - - - ");
7073
}

0 commit comments

Comments
 (0)