From 9a1b43908b3bb1cd5dd5fadafb3b23d6e9a2cf46 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 25 Mar 2010 22:49:16 +0100
Subject: http://www.jogamp.org/bugzilla/show_bug.cgi?id=390
Adding 'plain' junit tests.
Plain stands for the simple processing of:
ant.junit.compile: gluegen -> java/c files, javac/cc, jar
ant.junit.run: junit batch run
Avoiding 'black magic', ie kicking off gluegen and ant-compilation
from within the junit tests.
Same methodology as the JOGL junit tests,
junit test sources are under 'src/junit'
This way, the migration to other platform tests might be easier,
as well as the we don't need to pass through ant properties (ant - junit - ant),
see 3a32650d4229f9b4ad1f527d9e30c24ddb69bb3f.
---
make/lib/gluegen-cpptasks-linux-32bit.xml | 50 +++++++++++++++++++++++++++++++
make/lib/gluegen.compiler.linux-32bit.xml | 38 -----------------------
2 files changed, 50 insertions(+), 38 deletions(-)
create mode 100644 make/lib/gluegen-cpptasks-linux-32bit.xml
delete mode 100644 make/lib/gluegen.compiler.linux-32bit.xml
(limited to 'make/lib')
diff --git a/make/lib/gluegen-cpptasks-linux-32bit.xml b/make/lib/gluegen-cpptasks-linux-32bit.xml
new file mode 100644
index 0000000..c05033d
--- /dev/null
+++ b/make/lib/gluegen-cpptasks-linux-32bit.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ This is an example of how to add custom compiler/linker
+ arguments for a crosscompiler.
+
+ You can use such files with setting the property 'gluegen-cpptasks.file', ie:
+
+ -Dgluegen-cpptasks.file=`pwd`/lib/gluegen-cpptasks-linux-32bit.xml
+
+ In case you want to compile for 32bit on a 64bit machine,
+ you might also need to set the 'os.arch' to 'x86'.
+ Example: gluegen/make/make.gluegen.all.linux-x86.sh
+ -->
+
+<project name="GlueGen-cpptasks" basedir="." >
+
+<import file="../gluegen-cpptasks-base.xml" optional="false" />
+
+<target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir">
+ <echo message="Custom forced compiler.cfg.linux, linker.cfg.linux" />
+ <compiler id="compiler.cfg.linux" name="gcc">
+ <compilerarg value="-m32" />
+ <compilerarg value="-Wall" />
+ <defineset>
+ <define name="LINUX" />
+ </defineset>
+ </compiler>
+
+ <linker id="linker.cfg.linux" name="gcc">
+ <linkerarg value="-m32" />
+ </linker>
+
+</target>
+
+<target name="gluegen.cpptasks.declare.compiler" depends="setup.java.home.dir">
+ <echo message="Custom forced Linux.x86" />
+ <!--
+ <property name="isLinux" value="true"/>
+ <property name="isLinuxX86" value="true"/>
+ -->
+ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/i386" />
+ <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
+</target>
+
+</project>
+
+
diff --git a/make/lib/gluegen.compiler.linux-32bit.xml b/make/lib/gluegen.compiler.linux-32bit.xml
deleted file mode 100644
index ce1554c..0000000
--- a/make/lib/gluegen.compiler.linux-32bit.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- This is an example of how to add custom compiler/linker
- arguments for a crosscompiler.
-
- You can use such files with setting the property 'gluegen.user.compiler.file', ie:
-
- -Dgluegen.user.compiler.file=`pwd`/lib/gluegen.compiler.xml
-
- or by having such file in your home directory, ie:
-
- ~/gluegen.compiler.xml
-
- In case you want to compile for 32bit on a 64bit machine,
- you might also need to set the 'os.arch' to 'x86'.
- Example: gluegen/make/make.gluegen.all.linux-x86.sh
-
- More properties need to be overwritten in case you like to change the
- target OS .. and/or components, see gluegen-cpptasks.xml for more information.
- -->
-
-<project name="GlueGen-cpptasks" basedir="." >
-
-<target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir">
- <compiler id="compiler.cfg.linux" name="gcc">
- <compilerarg value="-m32" />
- <compilerarg value="-Wall" />
- <defineset>
- <define name="LINUX" />
- </defineset>
- </compiler>
-
- <linker id="linker.cfg.linux" name="gcc">
- <linkerarg value="-m32" />
- </linker>
-</target>
-</project>
--
cgit v1.2.3