From d19cd1049d55f93580c37f6a9599f7583e160258 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 22 Jan 2012 19:42:23 +0100
Subject: Fix Bug 516 (Determine Java Version) / Fix OS X 10.5 linkage (weak
 framework, NEWT)

- Fix Bug 516 (Determine Java Version).
  See gluegen: 64639b805a32338385421f168e12c1ef7f749d00

- Fix OS X 10.5 linkage (weak framework, NEWT)
    - Use weak framework linkage for all modules and frameworks:
      AppKit, QuartzCore, Cocoa, OpenGL, JavaNativeFoundation

    - NEWT: Handle NS exception while calling OS X >= 10.6 only methods:
            - 'setAllowsConcurrentViewDrawing()'
            - 'setCanDrawConcurrently()'
---
 make/build-common.xml | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'make/build-common.xml')

diff --git a/make/build-common.xml b/make/build-common.xml
index a7fef8ba6..b1e5159af 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -192,18 +192,9 @@
         </condition>
         <echo message="isSWTRuntimeAvailable=${isSWTRuntimeAvailable}" />
 
-        <property name="target.sourcelevel" value="1.5" />
-        <property name="host.sourcelevel"   value="1.5" />
-
         <!-- property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" /-->
-        <property name="javadoc.link" value="http://download.oracle.com/javase/1.5.0/docs/api/" />
-
-        <!-- NOTE: the value of the debug and optimise attributes will not be overridden if already set externally -->
-        <property name="javacdebug"       value="true" /> 
-        <property name="javacdebuglevel"  value="source,lines" /> 
-        <!--property name="javacdebuglevel"  value="source,lines,vars" /--> 
-        <!-- property name="javac.memorymax"  value="128m" /-->  <!-- I ran out of memory with these .. linux x86_64 6u14 -->
-        <property name="javac.memorymax"  value="512m" /> 
+        <!-- property name="javadoc.link" value="http://download.oracle.com/javase/1.5.0/docs/api/" /-->
+        <property name="javadoc.link" value="http://docs.oracle.com/javase/6/docs/api/" />
 
         <!-- Names of directories relative to the project root.
              Some of these are used in FileMappers later for dependence information
-- 
cgit v1.2.3