diff options
| author | Sven Gothel <[email protected]> | 2010-11-07 23:44:00 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-11-07 23:44:00 +0100 |
| commit | e024d6cab3b07ac2033630aac54e94d6494d8c5e (patch) | |
| tree | 3ba91dd2a15cdb5c690b8c4374048bb5cb5dc203 /make | |
| parent | 40ed7595d282f79eb332965c1684bb368674ac36 (diff) | |
Fix PCPP 'define' case; Keep PCPP output file if 'debug' ; GlueGen uses PCPP in same thread via File.
Fix PCPP 'define' case
------------------------
A recursive define like:
#define LALA ((int)1)
#define LILI LALA
was streamed out of PCPP, even though such 'macro defines' like
#define LILI ((int)1)
are disabled due to the parsers inability to digg those.
Added test on macro definition for replaced values.
GlueGen uses PCPP in same thread via File
------------------------------------------
To ease debugging we call PCPP from the same thread
and use normal temp files as i/o.
Keep PCPP output file if 'debug'
---------------------------------
Keep temp outfile if debug is enabled
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-junit.xml | 12 | ||||
| -rwxr-xr-x | make/build.xml | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/make/build-junit.xml b/make/build-junit.xml index 72428b4..f006a1c 100644 --- a/make/build-junit.xml +++ b/make/build-junit.xml @@ -252,7 +252,9 @@ config="${test.junit.generation.dir}/test1-gluegen.cfg" literalInclude="${test.junit.generation.dir}" includeRefid="stub.includes.fileset.test" - emitter="com.jogamp.gluegen.JavaEmitter"> + emitter="com.jogamp.gluegen.JavaEmitter" + dumpCPP="false" + debug="false"> <classpath refid="gluegen.classpath" /> </gluegen> @@ -261,7 +263,9 @@ config="${test.junit.generation.dir}/test1p1-gluegen.cfg" literalInclude="${test.junit.generation.dir}" includeRefid="stub.includes.fileset.test" - emitter="com.jogamp.gluegen.JavaEmitter"> + emitter="com.jogamp.gluegen.JavaEmitter" + dumpCPP="false" + debug="false"> <classpath refid="gluegen.classpath" /> </gluegen> @@ -270,7 +274,9 @@ config="${test.junit.generation.dir}/test1p2-gluegen.cfg" literalInclude="${test.junit.generation.dir}" includeRefid="stub.includes.fileset.test" - emitter="com.jogamp.gluegen.procaddress.ProcAddressEmitter"> + emitter="com.jogamp.gluegen.procaddress.ProcAddressEmitter" + dumpCPP="false" + debug="false"> <classpath refid="gluegen.classpath" /> </gluegen> </target> diff --git a/make/build.xml b/make/build.xml index 0017a3e..61a1e8c 100755 --- a/make/build.xml +++ b/make/build.xml @@ -152,19 +152,25 @@ <gluegen src="stub_includes/windows/dynamic-linker.h" config="dynlink-windows.cfg" includeRefId="stub.includes.fileset.windows" - emitter="com.jogamp.gluegen.JavaEmitter"> + emitter="com.jogamp.gluegen.JavaEmitter" + dumpCPP="false" + debug="false"> <classpath refid="gluegen.classpath" /> </gluegen> <gluegen src="stub_includes/unix/dynamic-linker.h" config="dynlink-unix.cfg" includeRefId="stub.includes.fileset.unix" - emitter="com.jogamp.gluegen.JavaEmitter"> + emitter="com.jogamp.gluegen.JavaEmitter" + dumpCPP="false" + debug="false"> <classpath refid="gluegen.classpath" /> </gluegen> <gluegen src="stub_includes/macosx/dynamic-linker.h" config="dynlink-macosx.cfg" includeRefId="stub.includes.fileset.macosx" - emitter="com.jogamp.gluegen.JavaEmitter"> + emitter="com.jogamp.gluegen.JavaEmitter" + dumpCPP="false" + debug="false"> <classpath refid="gluegen.classpath" /> </gluegen> </target> |