aboutsummaryrefslogtreecommitdiffstats
path: root/make/build.xml
diff options
context:
space:
mode:
authorMichael Bien <[email protected]>2011-02-09 15:04:48 +0100
committerMichael Bien <[email protected]>2011-02-09 15:04:48 +0100
commite20879b9f124ecca8bc7467013e118d1b7f5782b (patch)
tree30b0fe9a9d048a3a55264798a993929c5f848e25 /make/build.xml
parent1f3c9cfe8d1c5890780ad150b23b7cdb0d8e7692 (diff)
parent67dfcd32379b50dd451a1e979096e30e24ad0e68 (diff)
Merge branch 'master' of github.com:sgothel/gluegen
Diffstat (limited to 'make/build.xml')
-rw-r--r--make/build.xml84
1 files changed, 6 insertions, 78 deletions
diff --git a/make/build.xml b/make/build.xml
index f4fcdc8..aecfbe0 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -38,10 +38,8 @@
<target name="init" depends="gluegen.properties.load.user,gluegen.cpptasks.detect.os,setup-excludes-1,setup-excludes-2">
<!-- Declare all paths and user defined variables. -->
- <property name="javac.bootclasspath-cdc.jar" value="lib/cdc_fp.jar" />
-
- <!--property name="javadoc.link" value="http://download.oracle.com/javase/1.4.2/docs/api/"/-->
- <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" />
+ <!-- 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/" />
<!-- The source and build directories. -->
<property name="project.root" value=".." />
@@ -68,20 +66,16 @@
<!-- The generated source directories. -->
<property name="src.generated" value="${build}/gensrc" />
<property name="src.generated.java" value="${src.generated}/java" />
- <property name="src.generated.java-cdc" value="${src.generated}/java-cdc" />
<!-- The compiler output directories. -->
<property name="classes" value="${build}/classes" />
- <property name="classes-cdc" value="${build}/classes-cdc" />
<!-- Call the external config validator script to make sure the config is ok and consistent -->
<ant antfile="validate-properties.xml" inheritall="true"/>
<!-- Create the required output directories. -->
<mkdir dir="${src.generated.java}" />
- <mkdir dir="${src.generated.java-cdc}" />
<mkdir dir="${classes}" />
- <mkdir dir="${classes-cdc}" />
<!-- Create the classpath for ANTLR. This requires the user-defined
- "antlr.jar" property. -->
@@ -430,29 +424,6 @@
<antcall target="c.manifest" inheritRefs="true" />
</target>
- <target name="gluegen.build.gluegen-rt.cdc" >
- <!-- Build just the gluegen-rt.cdc.jar classes using the Java CDC
- boot classes -->
- <copy todir="${classes-cdc}">
- <fileset dir="${classes}"
- includes="com/** net/**"
- excludes="com/jogamp/gluegen/runtime/** com/jogamp/gluegen/test/**" />
- </copy>
-
- <!-- bootclasspath="${javac.bootclasspath-cdc.jar}"-->
- <javac destdir="${classes-cdc}"
- source="1.4"
- debug="true"
- debuglevel="source,lines,vars"
- includeAntRuntime="false"
- excludes="${gluegen.excludes}"
- >
- <src path="${src.java}" />
- <src path="${src.generated.java-cdc}" />
- <classpath refid="antlr.classpath" />
- </javac>
- </target>
-
<!-- ================================================================== -->
<!--
- Build GlueGen.
@@ -582,9 +553,9 @@
<property name="gluegen-rt.classes" value="com/jogamp/gluegen/runtime/**"/>
<property name="jogamp.common.classes" value="com/jogamp/common/**"/>
- <!--compile gluegen-rt with source=1.4 first-->
+ <!--compile gluegen-rt with source=1.5 first-->
<javac destdir="${classes}"
- source="1.4"
+ source="1.5"
debug="true"
debuglevel="source,lines,vars"
includeAntRuntime="false"
@@ -636,19 +607,8 @@
</filterset>
</copy>
- <copy file="Manifest-rt.cdc"
- tofile="${build}/Manifest-rt.cdc.temp"
- overwrite="true">
- <filterset>
- <filter token="VERSION" value="${gluegen.version}"/>
- <filter token="SCM_BRANCH" value="${gluegen.build.branch}"/>
- <filter token="SCM_COMMIT" value="${gluegen.build.commit}"/>
- <filter token="BASEVERSION" value="${gluegen_base_version}"/>
- </filterset>
- </copy>
-
<!-- Build the (native code) NativeLibrary support for
- gluegen-rt[-cdc].jar using the just-built GlueGen. -->
+ gluegen-rt.jar using the just-built GlueGen. -->
<antcall target="c.build" inheritRefs="true" />
<!-- Build gluegen-rt.jar. -->
@@ -656,6 +616,7 @@
<fileset dir="${classes}">
<include name="com/jogamp/gluegen/runtime/*.class" />
<include name="com/jogamp/common/**" />
+ <include name="jogamp/common/**" />
</fileset>
</jar>
<jar destfile="${build}/gluegen-rt-natives-${os.and.arch}.jar" manifest="${build}/Manifest-rt.temp">
@@ -664,30 +625,6 @@
</fileset>
</jar>
- <!-- Build just the gluegen-rt.cdc.jar classes using the Java CDC
- boot classes. -->
- <antcall target="gluegen.build.gluegen-rt.cdc" inheritRefs="true" />
-
- <!-- Build gluegen-rt.cdc.jar. -->
- <jar destfile="${build}/gluegen-rt.cdc.jar" manifest="${build}/Manifest-rt.cdc.temp">
- <fileset dir="${classes-cdc}">
- <include name="com/jogamp/gluegen/runtime/*.class" />
- <include name="com/jogamp/common/impl/*.class" />
- <include name="com/jogamp/common/jvm/*.class" />
- <include name="com/jogamp/common/type/*.class" />
- <include name="com/jogamp/common/util/*.class" />
- <include name="com/jogamp/common/util/locks/*.class" />
- <include name="com/jogamp/common/nio/*.class" />
- <include name="com/jogamp/common/os/*.class" />
- <include name="com/jogamp/common/*.class" />
- </fileset>
- </jar>
- <jar destfile="${build}/gluegen-rt-natives-${os.and.arch}-cdc.jar" manifest="${build}/Manifest-rt.cdc.temp">
- <fileset dir="${build}/obj">
- <include name="*gluegen-rt.${native.library.suffix-cdc}" />
- </fileset>
- </jar>
-
<!-- Copy antlr.jar into build directory for convenience so
gluegen.jar can be run via "java -jar". antlr.jar is
referenced via a Class-Path entry in the Manifest of
@@ -743,7 +680,6 @@
maxmemory="256m" >
<classpath path="${classes}"/>
<link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
- <excludepackage name="com.jogamp.common.impl"/>
</javadoc>
<zip destfile="${build}/javadoc.zip"
basedir="${javadoc.root.path}"
@@ -876,14 +812,6 @@
<param name="artifactId" value="gluegen-rt-natives"/>
<param name="description" value="GlueGen runtime native libraries for ${os.and.arch}"/>
</antcall>
- <!--<antcall target="maven.${mvn.task}.artifact" inheritall="true">-->
- <!--<param name="artifactId" value="gluegen-rt-cdc"/>-->
- <!--<param name="description" value="Gluegen CDC Runtime"/>-->
- <!--</antcall>-->
- <!--<antcall target="maven.${mvn.task}.artifact" inheritall="true">-->
- <!--<param name="artifactId" value="gluegen-rt-natives-cdc"/>-->
- <!--<param name="description" value="Gluegen CDC runtime native libraries for ${os.and.arch}"/>-->
- <!--</antcall>-->
</target>
<target name="maven.install" depends="init, gluegen.build">