From 7cc4bb2a8bcc4c16b6a12826abbd874bf38f9dc1 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 8 Apr 2010 02:22:12 +0200
Subject: http://jogamp.org/bugzilla/show_bug.cgi?id=393

Fixed junit test: test1

- Create seperate native libraries to reflect a real world example:

    test1 - the library to bind to (no more declaring __stdcall @nn functions)

    BindingTest1p1 - the dynamic fixed linkage binding test1p1,
                     references dynamic library test1 at linktime.

    BindingTest1p2 - the dynamic runtime linkage binding test1p2,
                     loads dynamic library test1 at runtime.

Generic:

- gluegen-cpptasks-base.xml

  - target 'gluegen.cpptasks.detect.os'
    Set new property 'system.env.library.path'
        DYLD_LIBRARY_PATH (macosx)
        LD_LIBRARY_PATH   (unix)
        PATH              (windows)

  - target 'gluegen.cpptasks.striplibs'
    Strips the symbols out of the native libraries
    in case c.compiler.debug is false.
    Maybe configured with the properties:
        c.strip.tool, c.strip.args

- Using system.env.library.path in junit call
  to find the test1 library in case of runtime linkage and lookup (test1p2).

- Use gluegen.cpptasks.striplibs for all native libs ..

- Added macosx32 in analogy to macosx64, both defaults to true now

- com.jogamp.common.os.WindowsDynamicLinkerImpl:lookupSymbol()
  - Added lookup for __stdcall @nn (stepping alignment 4, max-args: 12)
    in case no undecorated __cdecl symbol is found.

Fixed Windows platform:

- Use proper path.seperator on Windows.
- test1.dll needs proper soname inside for fixed linkage (test1p1)
  hence the output name must be test1.dll, not libtest1.so

+++

http://jogamp.org/bugzilla/show_bug.cgi?id=394

Fix MacOsX platform:

The commit of cpptasks.jar, git hash 129e783741d91e9ee5cd7da5d5c962c32ec96b0b,
broke the universal binary build on MacOSX.

The above change used cpptasks-1.05b with a few patches in regards to crosscompilation,
but missed one, which accepts the '-arch' argument for GccLinker undecorated.

The new cpptasks.jar is vanilla 1.05b + cpptasks-1.0b5-darwin-patch.diff,
the latter a more refined one.
This version accepts the '-arch' argument undecorated on the darwin platform.

+++
---
 test/junit/com/sun/gluegen/BasicTest.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'test/junit/com')

diff --git a/test/junit/com/sun/gluegen/BasicTest.java b/test/junit/com/sun/gluegen/BasicTest.java
index b186c53..77868c5 100644
--- a/test/junit/com/sun/gluegen/BasicTest.java
+++ b/test/junit/com/sun/gluegen/BasicTest.java
@@ -44,8 +44,9 @@ public class BasicTest {
     @Test
     public void bindingTest() throws Exception {
 
-        String nativesPath = testOutput + "/build/natives";
-        System.load(nativesPath + "/librofl.so");
+        // String nativesPath = testOutput + "/build/natives";
+        // System.load(nativesPath + "/librofl.so");
+        System.loadLibrary("rofl");
 
         Class<?> clazz = Class.forName("test.BindingTest");
 
-- 
cgit v1.2.3