diff options
| author | Julien Gouesse <[email protected]> | 2015-11-27 07:53:57 +0100 |
|---|---|---|
| committer | Julien Gouesse <[email protected]> | 2015-11-27 07:53:57 +0100 |
| commit | 1f346b49dd7ad6ea6a15988713e4584c1f37cc4f (patch) | |
| tree | 0e18ac85f81db72a9e213788acec7b353f5599cb | |
| parent | c658d3657620ce0d1a3f1632f869465ee184d61c (diff) | |
| parent | f93d5392f8cb5ca85b718a10fd9e472907512c0b (diff) | |
Merge pull request #2 from scijava/maven
Build the project using Maven
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | README-FIRST.txt | 2 | ||||
| -rw-r--r-- | README-build.html | 162 | ||||
| -rw-r--r-- | build-old.xml | 908 | ||||
| -rw-r--r-- | build.xml | 138 | ||||
| -rw-r--r-- | pom.xml | 231 | ||||
| -rw-r--r-- | templates/javax/media/j3d/VersionInfo.java (renamed from build-tools/VersionInfo.java) | 26 |
7 files changed, 248 insertions, 1224 deletions
@@ -1 +1,4 @@ -/build/ +/.classpath +/.project +/.settings/ +/target/ diff --git a/README-FIRST.txt b/README-FIRST.txt index dd87e0d..05809d2 100644 --- a/README-FIRST.txt +++ b/README-FIRST.txt @@ -9,8 +9,6 @@ The source code license information for this project is in LICENSE.txt Additional information and license restrictions for third party source code are found in the THIRDPARTY-LICENSE-*.txt files. -Instructions for building this project are in README-build.html - Note that the source code in this directory is untested and presumed incompatible with the Java 3D(TM) API specification. You must only use this code in accordance with the terms under which the code is diff --git a/README-build.html b/README-build.html deleted file mode 100644 index c12cd7f..0000000 --- a/README-build.html +++ /dev/null @@ -1,162 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <meta content="text/html; charset=ISO-8859-1" - http-equiv="content-type"> - <title>README-build: build instructions for the j3d-core project</title> -</head> -<body> -<h3><span style="font-weight: bold; text-decoration: underline;">Building -the 3D packages</span></h3> -<p><span style="text-decoration: underline;"><span - style="font-weight: bold;"></span></span><span - style="font-weight: bold; text-decoration: underline;"> </span></p> -<p>To -build the 3D packages, you must clone the following three -repositories:<br> -</p> -<ul> - <li><a href="https://github.com/hharrison/java3d-core/">j3d-core</a></li> - <li><a href="https://github.com/hharrison/java3d-utils/">j3d-utils</a></li> - <li><a href="https://github.com/hharrison/vecmath/">vecmath</a></li> -</ul> -<p>These three top-level directories must be named exactly as -shown above and they must be sibling directories. To ensure this, run -the git clone command for each of the respositories from the same -parent directory. You will also need the gluegen and jogl builds for at least -version 2.3.1. For example:<br> -</p> -<ul> - <code>cd <j3d-root-dir></code><br> - <code>git clone git://github.com/hharrison/vecmath</code><br> - <code>git clone git://github.com/hharrison/java3d-core j3d-core</code><br> - <code>git clone git://github.com/hharrison/java3d-utils j3d-utils</code><br> - <code>mkdir jogl-v2.3.1</code><br> - <code>curl http://jogamp.org/deployment/v2.3.1/jar/gluegen-rt.jar > jogl-v2.3.1/gluegen-rt.jar</code><br> - <code>curl http://jogamp.org/deployment/v2.3.1/jar/jogl-all.jar > jogl-v2.3.1/jogl-all.jar</code> -</ul> -<p>NOTE: you must first build the javax.vecmath package before building -the javax.media.j3d and com.sun.j3d.* packages. See the <a - href="../vecmath/README-build.html">README-build.html</a> file in the -"vecmath" directory for instructions.<br> -</p> -<h3><span style="font-weight: bold; text-decoration: underline;"></span><span - style="text-decoration: underline;">System Requirements</span></h3> -<p><span style="font-weight: bold; text-decoration: underline;"></span></p> -<p><span style="font-weight: bold; text-decoration: underline;"></span>The -following operating environments have been tested:<br> -</p> -<ul> - <li>Solaris: Sparc (Ultra60 or better) running Solaris 9 with Forte C -compiler version 6.2 or GNU gcc version 3.3.2</li> - <li>Linux: i386/i586 running SuSE 9 or RedHat 9.0</li> - <li>Windows: Windows/XP with Microsoft Visual C++ 6.0 or the gcc that -comes with <a href="http://www.mingw.org">MinGW version 3.1.0-1</a> -(Windows 2000 should work, but is untested)<br> - </li> -</ul> -<p> The following software must be installed:<br> -</p> -<ul> - <li><a href="http://java.sun.com/j2se">JDK 1.5.0 </a><br> - </li> - <li><a href="http://jakarta.apache.org/ant">Apache Ant 1.6.1</a><br> - </li> - <li>C Compiler (Either one of the following depending on the platform)<br> - </li> - <ul> - <li>Solaris:<br> - </li> - <ul> - <li>Sun ONE Studio 8 (formerly Forte Tools)'s Compiler or GNU -Compiler Collection, <a href="http://gcc.gnu.org">GCC version 3.3.2</a><br> - </li> - </ul> - <li>Linux:<br> - </li> - <ul> - <li>GNU Compiler Collection, <a href="http://gcc.gnu.org">GCC -version 3.2.2</a><br> - </li> - </ul> - <li>Windows<br> - </li> - <ul> - <li>Microsoft Visual C++ 6.0 or later or GNU Compiler -Collection, GCC version 3.2.3 that comes with<a - href="http://www.mingw.org"> MinGW version 3.1.0-1</a><span - style="font-weight: bold; text-decoration: underline;"><br> - </span></li> - </ul> - </ul> -</ul> -<h3><span style="font-weight: bold; text-decoration: underline;">Building the 3D packages</span></h3> -<p><span style="font-weight: bold; text-decoration: underline;"></span><span - style="font-weight: bold; text-decoration: underline;"></span>Before -you start building, your PATH must include the -following directories: -</p> -<ul> - <li><ant-root-dir>/bin<br> - </li> - <li><jdk-root-dir>/bin<br> - </li> - <li><compiler-root-dir>/bin<br> - </li> -</ul> -<p>The default target, jar-opt, creates an optimized jar files -and native libraries. -</p> -<p>On Amd64 platform an OutOfMemoryError can be seen. In this case set -the environment variable ANT_OPTS to -Xmx256m.<br> -</p> -<p>Steps: -</p> -<ul> - <code> cd <j3d-root-dir>/j3d-core<br> -ant</code> -</ul> -<p>The above steps build both the Java and native code for -javax.media.j3d and com.sun.j3d.* -packages. -</p> -<p>The build will be placed in j3d-core/build/<platform>/opt -where <platform> is determined from the <code>ant -echo</code> command: -</p> -<ul> - <code>ant echo</code> -</ul> -To see other targets that are available, type "ant --projecthelp". Note that ant must be run from the top-level -directory. -<p>The default compiler for native code compilation is set to "gcc". -This -value is set in the <a href="build.properties">build.properties</a> -file located -in the j3d-core directory. The compiler property is "build.comp".<br> -</p> -<p>On a Solaris platform with Forte compiler installed, -build.comp -can be set to "forte". On a Windows platform installed Visual C++, -build.properties -can be set to "vc".<br> -</p> -<p>NOTE: For Windows platform only, the property "build.rend" in -build.properties can be modified to use "d3d" (Direct3D API for -rendering) besides the default value "ogl".<br> -</p> -<p>NOTE: You can also modify the properties via command-line options to -ant, -for example, "ant -Dbuild.comp=vc"<br> -</p> -<h3><span style="font-weight: bold; text-decoration: underline;">Running -the 3D examples</span></h3> -<p>Please refer to <a - href="../j3d-examples/README-build.html">README-build.html</a> in -j3d-examples for -details -on building and running the 3D example programs.<br> -</p> -</body> -</html> diff --git a/build-old.xml b/build-old.xml deleted file mode 100644 index b444cc5..0000000 --- a/build-old.xml +++ /dev/null @@ -1,908 +0,0 @@ -<?xml version="1.0"?> - -<project name="j3d-1.6.0" default="jar-debug" basedir="."> - - <!-- - ********************************************************************* - * - * The following properties may be set on the command line to - * specify the compiler used or the renderer to be built. They are - * specified using "ant -Dprop.name=value", where the actual - * property and and value are substituted for "prop.name" and - * "value" - * - * build.comp=gcc Use GCC compilers (default, all platforms) - * build.comp=forte Use Forte compilers (Solaris only) - * build.comp=vc Use Visual C++ compilers (Windows only) - * - * build.rend=ogl build OpenGL native library (default) - * build.rend=d3d build DirectX (D3D) native library - * - * For example: - * - * ant -Dbuild.comp=vc -Dbuild.rend=d3d ... - * - ********************************************************************* - --> - - <!-- *************************************** --> - <!-- *** Begin build-specific properties *** --> - <!-- *************************************** --> - - <!-- - * The following property specifies the build number of the current - * version of 3D being built. This build number is a monotonically - * increasing number that is incremented for each new stable, beta, - * fcs, or patch build. Each non-daily build will have a unique - * build number that is greater than the previous build's build - * number. - --> - <property name="version_buildnum" value="1"/> - - <!-- - * The following property specifies the beta revision of the current - * version of 3D being built. It is ignored for non-beta builds. - --> - <property name="version_betastr" value="beta1"/> - - <!-- - * The following property specifies the patch revision of the current - * version of 3D being built. It is ignored for non-beta builds. - --> - <property name="version_patchstr" value="01"/> - - <!-- - * The following properties specify the current version of 3D. - * The "version_base" property specifies the dot-dot base version - * number of 3D; it must contain exactly three integer numbers - * separated by "periods ("."). The version_base_file property must - * be the same version number as version_base with "_" replacing ".". - --> - <property name="version_base" value="1.6.0"/> - <property name="version_base_file" value="1_6_0"/> - - - <!-- ************************************* --> - <!-- *** End build-specific properties *** --> - <!-- ************************************* --> - - <!-- - ********************************************************************* - * - * A build of j3d is one of the following five types: daily - * build, stable build, beta build (or release candidate), fcs build, - * patch build. Daily builds are identified with a "-preN-YYMMDDHHMM" - * suffix; stable builds are identified with a "-buildN" suffix; beta - * builds are identified with a "-betaN" or "-rcN" suffix; fcs builds - * have no suffix; and patch builds are identified with an "_N" - * suffix. - * - * The default is to do a daily build. This may be overriden by setting - * the build.type property on the command line to do a different kind - * of build: - * - * build.type=daily Do a daily build (default) - * build.type=stable Do a stable build : -buildN - * build.type=beta Do a beta or RC production build : -betaN or -rcN - * build.type=fcs Do an FCS production build : [no suffix] - * build.type=patch Do an FCS+patch production build : _PP - * - * For example: - * - * ant -Dbuild.type=stable ... - * - ********************************************************************* - --> - - <!-- Set global properties for this build --> - <property name="vecmath_home" location="../vecmath"/> - <property name="core_utils_home" location="../j3d-core-utils"/> - - <property name="src" location="src"/> - <property name="vecmath_src" location="${vecmath_home}/src"/> - <property name="core_utils_src" location="${core_utils_home}/src"/> - <property name="build-tools" location="build-tools"/> - <property name="build" location="build"/> - <property name="dist" location="dist"/> - <property name="build.comp" value="gcc"/> - <property name="build.rend" value="ogl"/> - - <property name="build.spec.title" value="3D Graphics API for the Java Platform"/> - <property name="build.impl.title" value="3D Graphics API for the Java Platform"/> - <property name="build.spec.vendor" value=""/> - <property name="build.impl.vendor" value=""/> - <property name="build.impl.vendor.id" value=""/> - <property name="build.javadoc.name" value="3D"/> - <property name="build.relprefix" value="j3d"/> - - <target name="echo" depends="setupPlatform"> - <echo message="platform = ${platform}"/> - <echo message="wstype = ${wstype}"/> - <echo message="os.arch = ${os.arch}"/> - <echo message="os.name = ${os.name}"/> - <echo message="ant.home = ${ant.home}"/> - <echo message="java.home = ${java.home}"/> - <echo message="core_utils_home = ${core_utils_home}"/> - <echo message="vecmath_home = ${vecmath_home}"/> - <echo message="user.name = ${user.name}"/> - <echo message="user.home = ${user.home}"/> - - <echo message=""/> - <echo message="build.type = ${build.type}"/> - <echo message="build.rend = ${build.rend}"/> - <echo message="build.comp = ${build.comp}"/> - <echo message="is_dev_phase = ${is_dev_phase}"/> - <echo message="is_production = ${is_production}"/> - <echo message="use_verbose_buildtime = ${use_verbose_buildtime}"/> - - <echo message="version_build = ${version_build}"/> - <echo message="version_suffix = ${version_suffix}"/> - - <echo message="version = ${version}"/> - <echo message="version_file = ${version_file}"/> - </target> - - <target name="setupSolaris" if="isSolarisOnSparc"> - <property name="isUnix" value="true"/> - <property name="shell" value="/usr/bin/ksh"/> - <property name="wstype" value="x11"/> - <property name="platformname" value="solaris-sparc"/> - <property name="platform" value="solaris-sparc-${build.comp}"/> - <property name="install.bin" value="lib/sparc"/> - </target> - - <target name="setupSolarisX86" if="isSolarisOnX86"> - <property name="isUnix" value="true"/> - <property name="shell" value="/usr/bin/ksh"/> - <property name="wstype" value="x11"/> - <property name="platformname" value="solaris-x86"/> - <property name="platform" value="solaris-x86-${build.comp}"/> - <property name="install.bin" value="lib/i386"/> - </target> - - <target name="setupLinux" if="isLinuxOnX86"> - <property name="isUnix" value="true"/> - <property name="shell" value="/bin/sh"/> - <property name="wstype" value="x11"/> - <property name="platformname" value="linux-i586"/> - <property name="platform" value="linux-i586"/> - <property name="install.bin" value="lib/i386"/> - </target> - - <target name="setupLinuxAmd64" if="isLinuxOnAmd64"> - <property name="isUnix" value="true"/> - <property name="shell" value="/bin/sh"/> - <property name="wstype" value="x11"/> - <property name="platformname" value="linux-amd64"/> - <property name="platform" value="linux-amd64"/> - <property name="install.bin" value="lib/amd64"/> - </target> - - <target name="setupLinuxIA64" if="isLinuxOnIA64"> - <property name="isUnix" value="true"/> - <property name="shell" value="/bin/sh"/> - <property name="wstype" value="x11"/> - <property name="platformname" value="linux-ia64"/> - <property name="platform" value="linux-ia64"/> - <property name="install.bin" value="lib/ia64"/> - </target> - - <target name="setupLinuxPPC" if="isLinuxOnPPC"> - <property name="isUnix" value="true"/> - <property name="shell" value="/bin/sh"/> - <property name="wstype" value="x11"/> - <property name="platformname" value="linux-ppc"/> - <property name="platform" value="linux-ppc"/> - <property name="install.bin" value="lib/ppc"/> - </target> - - <!-- win32 should be rename as windows --> - <target name="setupWindows" if="isWindowsOnX86"> - <property name="isWindows" value="true"/> - <property name="wstype" value="win32"/> - <property name="platformname" value="windows-i586"/> - <property name="platform" value="windows-i586-${build.comp}"/> - <property name="install.bin" value="bin"/> - </target> - - <target name="setupWindowsAmd64" if="isWindowsOnAmd64"> - <property name="isWindows" value="true"/> - <property name="wstype" value="win32"/> - <property name="platformname" value="windows-amd64"/> - <property name="platform" value="windows-amd64-${build.comp}"/> - <property name="install.bin" value="bin"/> - </target> - - <target name="setupMacOSX" if="isMacOSX"> - <property name="wstype" value="jogl"/> - <property name="platformname" value="macosx"/> - <property name="platform" value="macosx"/> - </target> - - <target name="init-jogl" if="build.jogl"> - <property name="jogl.pipeline.srcdir" location="${src}/classes/jogl"/> - <echo message="Building JoglPipeline"/> - </target> - - <target name="init-no-jogl" unless="build.jogl"> - <property name="jogl.pipeline.srcdir" value=""/> - </target> - - <target name="setupJogl" depends="init-jogl,init-no-jogl"> - </target> - - <target name="setupPlatform" - depends="init, setupBuildType, setupSolaris, setupSolarisX86, setupLinux, setupLinuxAmd64, setupLinuxIA64, setupLinuxPPC, setupWindows, setupWindowsAmd64, setupMacOSX, setupJogl"> - <property name="build-debug-gen" location="${build}/${platform}/debug/gen"/> - <property name="build-opt-gen" location="${build}/${platform}/opt/gen"/> - <property name="docname" value="${build.relprefix}-${version_file}-doc"/> - </target> - - - <target name="setupBuildType" depends="initBuildType, setupBuildPatch, setupBuildFcs, setupBuildBeta, setupBuildStable, setupBuildDaily, checkBuildType"> - <echo message="build.type = ${build.type}"/> - </target> - - <target name="initBuildType"> - <!-- Default value is "daily", overridden on command line --> - <property name="build.type" value="daily"/> - <property name="buildType_${build.type}" value="true"/> - </target> - - - <!-- Set properties for PATCH build --> - <target name="setupBuildPatch" if="buildType_patch"> - <property name="buildTypeSet" value="true"/> - - <property name="releaseType_final" value="true"/> - <property name="is_dev_phase" value="false"/> - <property name="is_production" value="true"/> - <property name="use_verbose_buildtime" value="false"/> - - <property name="version_build" value="build${version_buildnum}"/> - <property name="version_suffix" value="${version_patchstr}"/> - - <property name="version" value="${version_base}_${version_suffix}"/> - <property name="version_file" value="${version_base_file}_${version_suffix}"/> - </target> - - - <!-- Set properties for FCS build --> - <target name="setupBuildFcs" if="buildType_fcs"> - <property name="buildTypeSet" value="true"/> - - <property name="releaseType_final" value="true"/> - <property name="is_dev_phase" value="false"/> - <property name="is_production" value="true"/> - <property name="use_verbose_buildtime" value="false"/> - - <property name="version_build" value="build${version_buildnum}"/> - <property name="version_suffix" value=""/> - - <property name="version" value="${version_base}"/> - <property name="version_file" value="${version_base_file}"/> - </target> - - - <!-- Set properties for BETA build --> - <target name="setupBuildBeta" if="buildType_beta"> - <property name="buildTypeSet" value="true"/> - - <property name="releaseType_milestone" value="true"/> - <property name="releaseType_dailyOrMilestone" value="true"/> - <property name="is_dev_phase" value="false"/> - <property name="is_production" value="true"/> - <property name="use_verbose_buildtime" value="true"/> - - <property name="version_build" value="build${version_buildnum}"/> - <property name="version_suffix" value="${version_betastr}"/> - - <property name="version" value="${version_base}-${version_suffix}"/> - <property name="version_file" value="${version_base_file}-${version_suffix}"/> - </target> - - - <!-- Set properties for STABLE build --> - <target name="setupBuildStable" if="buildType_stable"> - <property name="buildTypeSet" value="true"/> - - <property name="releaseType_milestone" value="true"/> - <property name="releaseType_dailyOrMilestone" value="true"/> - <property name="is_dev_phase" value="true"/> - <property name="is_production" value="false"/> - <property name="use_verbose_buildtime" value="true"/> - - <property name="version_build" value="build${version_buildnum}"/> - <property name="version_suffix" value="${version_build}"/> - - <property name="version" value="${version_base}-${version_suffix}"/> - <property name="version_file" value="${version_base_file}-${version_suffix}"/> - </target> - - - <!-- Set properties for DAILY build --> - <target name="setupBuildDaily" if="buildType_daily"> - <property name="buildTypeSet" value="true"/> - - <property name="releaseType_daily" value="true"/> - <property name="releaseType_dailyOrMilestone" value="true"/> - <property name="is_dev_phase" value="true"/> - <property name="is_production" value="false"/> - <property name="use_verbose_buildtime" value="true"/> - - <property name="version_build" value="pre${version_buildnum}"/> - <property name="version_suffix" value="${version_build}"/> - - <property name="version" value="${version_base}-${version_suffix}-${buildtime}"/> - <property name="version_file" value="${version_base_file}-${version_suffix}-${buildtime}"/> - </target> - - - <!-- Check buildType --> - <target name="checkBuildType" unless="buildTypeSet"> - <fail message="Unknown build.type = ${build.type}"/> - </target> - - - <target name="init"> - <!-- Create the time stamp --> - <tstamp> - <format property="buildtime_verbose" pattern="dd MMM yyyy HH:mm:ss z"/> - <format property="buildtime" pattern="yyMMddHHmm"/> - </tstamp> - - <echo message="buildtime = ${buildtime_verbose}"/> - - <!-- Create the base build directory --> - <mkdir dir="${build}"/> - - <!-- ========== determine platform ========== --> - <condition property="isWindowsOnX86"> - <os family="windows" arch="x86"/> - </condition> - - - <condition property="isWindowsOnAmd64"> - <os family="windows" arch="amd64"/> - </condition> - - <condition property="isLinuxOnX86"> - <os name="linux" arch="i386"/> - </condition> - - <condition property="isLinuxOnAmd64"> - <os name="linux" arch="amd64"/> - </condition> - - <condition property="isLinuxOnIA64"> - <os name="linux" arch="ia64"/> - </condition> - - <condition property="isLinuxOnPPC"> - <os name="linux" arch="ppc"/> - </condition> - - <condition property="isSolarisOnSparc"> - <os name="SunOS" arch="sparc"/> - </condition> - - <condition property="isSolarisOnX86"> - <os name="SunOS" arch="x86"/> - </condition> - - <condition property="isa_amd64"> - <contains string="${sun.cpu.isalist}" substring="amd64"/> - </condition> - - <condition property="isMacOSX"> - <and> - <os family="mac"/> - <os family="unix"/> - </and> - </condition> - - <available file="${java.home}/lib/amd64/libjawt.so" property="jre_amd64_present"/> - - <!-- flag indicating that a 64-bit JVM is available for Solaris/x86 --> - <condition property="isSolarisOnX86_64"> - <and> - <isset property="isSolarisOnX86"/> - <isset property="isa_amd64"/> - <isset property="jre_amd64_present"/> - </and> - </condition> - - </target> - - <target name="compile-debug" depends="setupPlatform"> -<!-- <ant dir="${vecmath_home}" target="jar-debug"/>--> - <ant dir="src/classes" target="compile-debug"/> - <antcall target="compile-debug-native"/> - </target> - - <target name="compile-debug-native" unless="build.javaonly"> - <ant dir="src/native" target="compile-debug"/> - </target> - - <target name="compile-opt" depends="setupPlatform"> -<!-- <ant dir="${vecmath_home}" target="jar-opt"/>--> - <ant dir="src/classes" target="compile-opt"/> - <antcall target="compile-opt-native"/> - </target> - - <target name="compile-opt-native" unless="build.javaonly"> - <ant dir="src/native" target="compile-opt"/> - </target> - - <target name="compile" depends="compile-debug,compile-opt" /> - - <target name="jar-debug" depends="compile-debug"> - <ant dir="src/classes" target="jar-debug"/> - </target> - - <target name="jar-debug-javaonly"> - <property name="build.javaonly" value="true"/> - <antcall target="jar-debug"/> - </target> - - <target name="jar-opt" depends="compile-opt"> - <ant dir="src/classes" target="jar-opt"/> - </target> - - <target name="jar-opt-javaonly"> - <property name="build.javaonly" value="true"/> - <antcall target="jar-opt"/> - </target> - - <target name="jar" depends="jar-debug,jar-opt" /> - - <target name="docs-jcp" depends="setupPlatform"> - <ant dir="src/classes" target="docs-jcp"/> - </target> - - <target name="docs-public" depends="setupPlatform" unless="nojavadoc"> - <ant dir="src/classes" target="docs-public"/> - </target> - - <target name="docs-private" depends="setupPlatform"> - <ant dir="src/classes" target="docs-private"/> - </target> - - <target name="docs" depends="setupPlatform"> - <ant dir="src/classes" target="docs"/> - </target> - - <target name="setupCheckBuild" depends="setupPlatform"> - <available file="${build}/linux-i586/opt/lib/ext/j3dcore.jar" property="buildLinuxFilesExist"/> - <available file="${build}/windows-i586-vc/opt/lib/ext/j3dcore.jar" property="buildWindowsFilesExist"/> - </target> - - <target name="checkBuildLinux" unless="buildLinuxFilesExist"> - <fail message="You must run the jar-opt target on Linux before running dist-common" /> - </target> - - <target name="checkBuildWindows" unless="buildWindowsFilesExist"> - <fail message="You must run the jar-opt target on Windows before running dist-common" /> - </target> - - <target name="checkBuildPlatform" unless="isLinuxOnX86"> - <fail message="You must run the dist-common target on linux-i586 platform" /> - </target> - - <target name="checkBuild" depends="setupCheckBuild,checkBuildPlatform,checkBuildLinux,checkBuildWindows"> - </target> - - <target name="dist-common" depends="setupPlatform,checkBuild"> - <ant dir="src/classes" target="dist-common"/> - </target> - - <target name="setupCheckDist" depends="setupPlatform"> - <available file="${dist}/common/lib/ext/j3dcore.jar" property="distCommonFilesExist"/> - </target> - - <target name="checkDistCommon" unless="distCommonFilesExist"> - <fail message="You must run the dist-common target before running dist" /> - </target> - - <target name="checkDist" depends="setupCheckDist,checkDistCommon"> - </target> - - <!-- NOTE: the dist target no longer depends on jar-opt; you must run the - jar-opt and dist-common (linux-only) targets prior to dist --> - <target name="dist" depends="setupPlatform,checkDist,src"> - <ant dir="src/classes" target="dist"/> - <ant dir="src/native" target="dist"/> - </target> - - <!-- NOTE: the all target no longer depends on dist, which must be run separately --> - <target name="all" depends="jar,docs"/> - - <target name="release" description="Package distribution for release" - depends="dist,init-release,release-daily,release-milestone,release-final"> - </target> - - <target name="init-release"> - <property name="platformTmp" location="${dist}/${platform}/tmp"/> - <property name="platformTmpBund" location="${platformTmp}/bund"/> - <property name="platformTmpInst" location="${platformTmp}/inst"/> - <property name="release_name" value="${build.relprefix}-${version_file}-${platformname}"/> - <property name="inst_name" value="j3d-instfiles-${version_file}-${platformname}"/> - <mkdir dir="${dist}/release"/> - </target> - - <target name="release-daily" depends="init-release,release-zip-bund-pre" if="releaseType_daily"> - </target> - - <target name="release-zip-bund-pre" if="releaseType_dailyOrMilestone"> - <mkdir dir="${platformTmpBund}/${release_name}"/> - - <zip destfile="${platformTmpBund}/${release_name}/j3d-jre.zip"> - <fileset dir="${dist}/${platform}" - includes="lib/**" - /> - <fileset dir="${dist}/${platform}" - includes="bin/**" - /> - </zip> - <copy todir="${platformTmpBund}/${release_name}"> - <fileset dir="." includes="COPYRIGHT.txt"/> - <fileset dir="release-info/pre-release" - includes="LICENSE*.txt README*.txt README-unzip.html" - /> - </copy> - <zip destfile="${dist}/release/${release_name}.zip"> - <fileset dir="${platformTmpBund}" - includes="${release_name}/**" - /> - </zip> - </target> - - <target name="release-milestone" depends="init-release,release-zip-bund-pre,release-zip-inst-pre" if="releaseType_milestone"> - </target> - - <target name="release-zip-inst-pre" if="releaseType_milestone"> - <antcall target="release-zip-inst-pre-unix"/> - <antcall target="release-zip-inst-pre-windows"/> - </target> - - <target name="release-zip-inst-pre-unix" if="isUnix"> - <mkdir dir="${platformTmpInst}/${release_name}"/> - - <copy todir="${platformTmpInst}/${release_name}"> - <fileset dir="${dist}/${platform}" - includes="lib/**"/> - <fileset dir="${dist}/${platform}" - includes="bin/**"/> - </copy> - - <copy tofile="${platformTmpInst}/${release_name}/LICENSE.txt"> - <fileset dir="release-info/pre-release" - includes="LICENSE*.txt"/> - </copy> - - <chmod dir="${platformTmpInst}/${release_name}" perm="755" - includes="**/*.so"/> - - <copy todir="${platformTmpInst}"> - <fileset dir="${build-tools}/${platformname}" - includes="script*.txt, unzipsfx"/> - </copy> - - <exec dir="${platformTmpInst}/${release_name}" executable="${shell}"> - <arg line="${build-tools}/genzip ${release_name} LICENSE.txt lib"/> - </exec> - - <copy file="${platformTmpInst}/${release_name}.bin" todir="${dist}/release"/> - - <chmod file="${dist}/release/${release_name}.bin" perm="755"/> - </target> - - <target name="release-zip-inst-pre-windows" if="isWindows"> - <property name="tmpInstDir" location="${platformTmpInst}/${inst_name}"/> - <mkdir dir="${tmpInstDir}/j3d-binaries"/> - - <copy todir="${tmpInstDir}"> - <fileset dir="release-info/pre-release" - includes="LICENSE*.rtf README.html"/> - </copy> - - <copy todir="${tmpInstDir}/j3d-binaries"> - <fileset dir="${dist}/${platform}" - includes="lib/**"/> - <fileset dir="${dist}/${platform}" - includes="bin/**"/> - </copy> - - <chmod dir="${tmpInstDir}/j3d-binaries" perm="755" - includes="**/*.dll"/> - - <zip destfile="${dist}/release/${inst_name}.zip"> - <fileset dir="${platformTmpInst}" - includes="${inst_name}/**"/> - </zip> - </target> - - <target name="release-final" depends="init-release,release-zip-bund-final,release-zip-inst-final" if="releaseType_final"> - </target> - - <target name="release-zip-bund-final" if="releaseType_final"> - <mkdir dir="${platformTmpBund}/${release_name}"/> - - <zip destfile="${platformTmpBund}/${release_name}/j3d-jre.zip"> - <fileset dir="${dist}/${platform}" - includes="lib/**" - /> - <fileset dir="${dist}/${platform}" - includes="bin/**" - /> - </zip> - <copy todir="${platformTmpBund}/${release_name}"> - <fileset dir="." includes="COPYRIGHT.txt"/> - <fileset dir="release-info/fcs-${version_base_file}" - includes="LICENSE*.txt README*.txt README-unzip.html" - /> - </copy> - <zip destfile="${dist}/release/${release_name}.zip"> - <fileset dir="${platformTmpBund}" - includes="${release_name}/**" - /> - </zip> - </target> - - <target name="release-zip-inst-final" if="releaseType_final"> - <antcall target="release-zip-inst-final-unix"/> - <antcall target="release-zip-inst-final-windows"/> - </target> - - <target name="release-zip-inst-final-unix" if="isUnix"> - <mkdir dir="${platformTmpInst}/${release_name}"/> - - <copy todir="${platformTmpInst}/${release_name}"> - <fileset dir="${dist}/${platform}" - includes="lib/**"/> - <fileset dir="${dist}/${platform}" - includes="bin/**"/> - </copy> - - <copy tofile="${platformTmpInst}/${release_name}/LICENSE.txt"> - <fileset dir="release-info/fcs-${version_base_file}" - includes="LICENSE*.txt"/> - </copy> - - <chmod dir="${platformTmpInst}/${release_name}" perm="755" - includes="**/*.so"/> - - <copy todir="${platformTmpInst}"> - <fileset dir="${build-tools}/${platformname}" - includes="script*.txt, unzipsfx"/> - </copy> - - <exec dir="${platformTmpInst}/${release_name}" executable="${shell}"> - <arg line="${build-tools}/genzip ${release_name} LICENSE.txt lib"/> - </exec> - - <copy file="${platformTmpInst}/${release_name}.bin" todir="${dist}/release"/> - - <chmod file="${dist}/release/${release_name}.bin" perm="755"/> - </target> - - <target name="release-zip-inst-final-windows" if="isWindows"> - <property name="tmpInstDir" location="${platformTmpInst}/${inst_name}"/> - <mkdir dir="${tmpInstDir}/j3d-binaries"/> - - <copy todir="${tmpInstDir}"> - <fileset dir="release-info/fcs-${version_base_file}" - includes="LICENSE*.rtf README.html"/> - </copy> - - <copy todir="${tmpInstDir}/j3d-binaries"> - <fileset dir="${dist}/${platform}" - includes="lib/**"/> - <fileset dir="${dist}/${platform}" - includes="bin/**"/> - </copy> - - <chmod dir="${tmpInstDir}/j3d-binaries" perm="755" - includes="**/*.dll"/> - - <zip destfile="${dist}/release/${inst_name}.zip"> - <fileset dir="${platformTmpInst}" - includes="${inst_name}/**"/> - </zip> - </target> - - <target name="initSrc" depends="setupPlatform"> - <property name="platformSrc" location="${dist}/${platform}/src"/> - <property name="j3dZip" value="j3d-${version_file}-src.zip"/> - <property name="vecmathZip" value="vecmath-${version_file}-src.zip"/> - - <property name="j3dZipFile" location="${platformSrc}/${j3dZip}"/> - <property name="vecmathZipFile" location="${platformSrc}/${vecmathZip}"/> - <property name="cvsRootDir" location=".."/> - - <mkdir dir="${platformSrc}"/> - </target> - - <target name="echoSrc"> - <echo message="j3dZipFile = ${j3dZipFile}"/> - <echo message="vecmathZipFile = ${vecmathZipFile}"/> - <echo message="cvsRootDir = ${cvsRootDir}"/> - </target> - - <target name="src" depends="initSrc, echoSrc, j3dSrc, vecmathSrc"> - </target> - - <target name="j3dSrc"> - <zip destfile="${j3dZipFile}"> - - <fileset dir="${cvsRootDir}/j3d-core/release-info/src-release/j3d" - includes="README.txt"/> - - <zipfileset dir="${cvsRootDir}/j3d-core" prefix="javax" - includes="COPYRIGHT.txt *LICENSE*.*"/> - - <fileset dir="${cvsRootDir}/j3d-core/src/classes/share" - includes="*/**" - excludes="**/doc-files/** **/package.html"/> - - <fileset dir="${cvsRootDir}/j3d-core/src/classes/jogl" - includes="*/**" - excludes="**/doc-files/** **/package.html"/> - -<!-- We will not include platform specific source files in this release - - <fileset dir="${cvsRootDir}/j3d-core/src/classes/win32" - includes="*/**" - excludes="**/doc-files/** **/package.html"/> - <fileset dir="${cvsRootDir}/j3d-core/src/classes/x11" - includes="*/**" - excludes="**/doc-files/** **/package.html"/> ---> - - <zipfileset dir="${cvsRootDir}/j3d-core-utils" prefix="com" - includes="COPYRIGHT.txt *LICENSE*.*"/> - - <fileset dir="${cvsRootDir}/j3d-core-utils/src/classes/share" - includes="*/**" - excludes="**/doc-files/** **/package.html"/> - </zip> - </target> - - <target name="vecmathSrc"> - <zip destfile="${vecmathZipFile}"> - - <fileset dir="${cvsRootDir}/j3d-core/release-info/src-release/vecmath" - includes="README.txt"/> - - <zipfileset dir="${cvsRootDir}/vecmath" prefix="javax" - includes="COPYRIGHT.txt *LICENSE*.*"/> - - <fileset dir="${cvsRootDir}/vecmath/src" - includes="*/**" - excludes="*/doc-files/** **/package.html VECMATH.MF"/> - </zip> - </target> - - <target name="clean-dist"> - <!-- Delete the ${dist} directory tree --> - <delete dir="${dist}"/> - </target> - - <target name="clean-default" unless="build.concurrent"> - <delete dir="${build}/default"/> - </target> - - <target name="clean-dist-common" if="isLinuxOnX86"> - <delete dir="${dist}/common"/> - </target> - - <target name="clean" depends="setupPlatform,clean-default,clean-dist-common"> - <!-- Delete the ${build}, and ${dist} directory trees for current platform --> - <delete dir="${build}/${platform}"/> - <delete dir="${dist}/${platform}"/> - </target> - - <target name="clean-all"> - <!-- Delete the ${build}, and ${dist} directory trees --> - <delete dir="${build}"/> - <delete dir="${dist}"/> - </target> - - <target name="clean-javaonly" depends="setupPlatform"> - <!-- Delete only the java portions of $[build} for the current platform --> - <delete dir="${build}/${platform}/debug/classes"/> - <delete dir="${build}/${platform}/debug/lib/ext"/> - <delete dir="${build}/${platform}/opt/classes"/> - <delete dir="${build}/${platform}/opt/lib/ext"/> - </target> - - <target name="install-debug" depends="jar-debug"> - <ant dir="src/classes" target="install-debug"/> - </target> - - <target name="install-opt" depends="jar-opt"> - <ant dir="src/classes" target="install-opt"/> - </target> - - <target name="uninstall" depends="setupPlatform"> - <ant dir="src/classes" target="uninstall"/> - </target> - - <description> -The following ant targets are available ("jar-opt" is the default): - - all - execute targets jar-debug and dist. - - clean - removes build/ and dist/ for current platform - - clean-all - removes build/ and dist/ for all platforms - - clean-dist - removes dist. - - clean-javaonly - removes java portion of build for current platform - - compile - execute targets compile-debug and compile-opt. - - compile-debug - builds all classes and native layer in src into - class files under build/${platform}/debug/classes/ and - native files under build/${platform}/debug/native/ - - compile-opt - builds all classes and native layer in src into - class files under build/${platform}/opt/classes/ and - native files under build/${platform}/opt/native/ - - dist - THIS TARGET IS FOR RELEASE ENGINEERING ONLY; DEVELOPERS NEED NOT - USE THIS TARGET. - Copies the shared jars, and the platform-specific native - libraries, src files, and javadoc to dist/${platform}. - The dist-common target must be run first. - - dist-common - THIS TARGET IS FOR RELEASE ENGINEERING ONLY; DEVELOPERS NEED NOT - USE THIS TARGET. - This target must be run on a 32-bit Linux-x86 system. - Creates the shared jar from the linux-i586 and - windows-i586-vc build directories. - The jar-opt target must be run first. - - docs - builds all classes in src into javadoc under - build/javadocs. - - docs-jcp - builds JCP docs of all classes in src into javadoc - under build/javadocs/docs-jcp. - - docs-private - builds private docs of all classes in src into javadoc - under build/javadocs/docs-private. - - docs-public - builds public docs of all classes in src into javadoc - under build/javadocs/docs-public. - - echo - echo some useful information, such as user.home, - ant.home, java.home and platform. - - jar - execute targets jar-debug and jar-opt. - - jar-debug - creates build/${platform}/debug/lib for all jar - files and libraries from class and native code files under - build/${platform}/debug/classes and - build/${platform}/debug/native. - - jar-debug-javaonly - - compiles only the java portion of j3d and builds - jars in same locations as jar-debug - - jar-opt - creates build/${platform}/opt/lib for all jar - files and libraries from class and native code files under - build/${platform}/opt/classes and - build/${platform}/opt/native. - - jar-opt-javaonly - - compiles only the java portion of j3d and builds - jars in same location as jar-opt - - install-debug - installs the debug build into the JDK pointed to by JAVA_HOME - - src - generate a zip file j3d project source code. - - uninstall - uninstalls j3d from the JDK pointed to by JAVA_HOME - </description> -</project> diff --git a/build.xml b/build.xml deleted file mode 100644 index 9bfe448..0000000 --- a/build.xml +++ /dev/null @@ -1,138 +0,0 @@ -<?xml version="1.0"?> - -<project name="j3dall" default="jar" basedir="."> - - <property name="src.dir" location="src"/> - <property name="build.dir" location="build"/> - <property name="gen.dir" location="${build.dir}/gen"/> - <property name="class.dir" location="${build.dir}/classes"/> - - <property name="j3dtools.dir" location="../j3d-utils"/> - <property name="j3dtools.src.dir" location="${j3dtools.dir}/src"/> - - <property name="vecmath.lib" location="../vecmath/build/jars/vecmath.jar"/> - <property name="jogl.lib" location="../jogl-v2.3.2/jogl-all.jar"/> - <property name="gluegen.lib" location="../jogl-v2.3.2/gluegen-rt.jar"/> - - <property name="version_base" value="1.6.0"/> - <property name="build.spec.title" value="3D Graphics API for the Java Platform"/> - <property name="build.spec.vendor" value=""/> - <property name="build.impl.title" value="3D Graphics API for the Java Platform"/> - <property name="build.impl.vendor" value=""/> - <property name="build.impl.vendor.id" value=""/> - - <property name="build.type" value="daily"/> - <property name="buildtime" value="daily"/> - <property name="buildtime_verbose" value="daily"/> - <property name="is_dev_phase" value="true"/> - <property name="is_production" value="false"/> - <property name="use_verbose_buildtime" value="true"/> - <property name="version_buildnum" value="12"/> - <property name="version_build" value="pre${version_buildnum}"/> - <property name="version_suffix" value="${version_build}"/> - - <target name="clean"> - <delete dir="${build.dir}"/> - </target> - - <target name="gen"> - <mkdir dir="${gen.dir}"/> - - <copy todir="${class.dir}/javax"> - <fileset dir="." includes="COPYRIGHT.txt"/> - <fileset dir="." includes="LICENSE.txt"/> - </copy> - - <copy todir="${class.dir}/com"> - <fileset dir="${j3dtools.dir}" includes="COPYRIGHT.txt"/> - <fileset dir="${j3dtools.dir}" includes="*LICENSE*.txt"/> - </copy> - - - <copy file="build-tools/VersionInfo.java" - todir="${gen.dir}/src/javax/media/j3d" - overwrite="true"> - <filterset> - <filter token="BUILD_TYPE" value="${build.type}"/> - <filter token="BUILDTIME" value="${buildtime}"/> - <filter token="BUILDTIME_VERBOSE" value="${buildtime_verbose}"/> - <filter token="IS_DEBUG" value="false"/> - <filter token="IS_DEV_PHASE" value="${is_dev_phase}"/> - <filter token="IS_PRODUCTION" value="${is_production}"/> - <filter token="USE_VERBOSE_BUILDTIME" value="${use_verbose_buildtime}"/> - <filter token="VERSION_BASE" value="${version_base}"/> - <filter token="VERSION_BUILD" value="${version_build}"/> - <filter token="VERSION_SUFFIX" value="${version_suffix}"/> - <filter token="SPEC_TITLE" value="${build.spec.title}"/> - <filter token="SPEC_VENDOR" value="${build.spec.vendor}"/> - <filter token="IMPL_TITLE" value="${build.impl.title}"/> - <filter token="IMPL_VENDOR" value="${build.impl.vendor}"/> - </filterset> - </copy> - </target> - - <target name="compile" depends="gen"> - <javac srcdir="${src.dir}:${j3dtools.src.dir}/classes/share:${gen.dir}/src" - destdir="${class.dir}" - source="1.5" - target="1.5" - debug="true" - debuglevel="lines,source" - deprecation="off" - includeantruntime="false" - classpath="${vecmath.lib}:${jogl.lib}:${gluegen.lib}"/> - - <copy todir="${class.dir}"> - <fileset dir="${src.dir}" includes="**/*.properties"/> - <fileset dir="${j3dtools.src.dir}/classes/share" includes="META-INF/** **/*.properties"/> - </copy> - </target> - - <target name="jar" depends="compile"> - <jar jarfile="${build.dir}/jars/j3dcore.jar" - update="no" compress="false"> - <manifest> - <attribute name="Manifest-Version" value="1.0"/> - <attribute name="Specification-Title" value="${build.spec.title}"/> - <attribute name="Specification-Version" value="1.6"/> - <attribute name="Specification-Vendor" value="${build.spec.vendor}"/> - <attribute name="Implementation-Title" value="${build.impl.title}"/> - <attribute name="Implementation-Version" value="${version_base}"/> - <attribute name="Implementation-Vendor" value="${build.impl.vendor}"/> - <attribute name="Extension-Name" value="javax.media.j3d"/> - <attribute name="Implementation-Vendor-Id" value="${build.impl.vendor.id}"/> - </manifest> - <fileset dir="${class.dir}" includes="javax/**/*"/> - </jar> - - <jar jarfile="${build.dir}/jars/j3dutils.jar" - update="no" compress="false"> - <manifest> - <attribute name="Manifest-Version" value="1.0"/> - <attribute name="Specification-Title" value="${build.spec.title}"/> - <attribute name="Specification-Version" value="1.6"/> - <attribute name="Specification-Vendor" value="${build.spec.vendor}"/> - <attribute name="Implementation-Title" value="3D Utilities"/> - <attribute name="Implementation-Version" value="${version_base}"/> - <attribute name="Implementation-Vendor" value="${build.impl.vendor}"/> - <attribute name="Extension-Name" value="javax.media.j3d"/> - <attribute name="Implementation-Vendor-Id" value="${build.impl.vendor.id}"/> - </manifest> - <fileset dir="${class.dir}" includes="META-INF/** com/**/*"/> - </jar> - - <zip destfile="${build.dir}/jars/j3dcore-src.zip"> - <fileset dir="${src.dir}" includes="javax/**/*.java"/> - <fileset dir="${gen.dir}/src" includes="javax/**/*.java"/> - <fileset dir="." includes="COPYRIGHT.txt"/> - <fileset dir="." includes="LICENSE.txt"/> - </zip> - - <zip destfile="${build.dir}/jars/j3dutils-src.zip"> - <fileset dir="${j3dtools.src.dir}/classes/share" includes="com/**/*.java"/> - <fileset dir="${j3dtools.dir}" includes="COPYRIGHT.txt"/> - <fileset dir="${j3dtools.dir}" includes="*LICENSE*.txt"/> - </zip> - - </target> -</project> @@ -0,0 +1,231 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.jogamp.java3d</groupId> + <artifactId>j3dcore</artifactId> + <version>1.6.0-SNAPSHOT</version> + + <name>Java 3D Core</name> + <description>3D Graphics API for the Java Platform</description> + + <licenses> + <license> + <name>GPLv2 with Classpath exception</name> + <url>http://www.gnu.org/licenses/gpl-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + + <developers> + <developer> + <id>gouessej</id> + <name>Julien Gouesse</name> + <url>https://github.com/gouessej</url> + <organization>JogAmp</organization> + <organizationUrl>http://jogamp.org/</organizationUrl> + </developer> + <developer> + <id>hharrison</id> + <name>Harvey Harrison</name> + <url>https://github.com/hharrison</url> + <organization>JogAmp</organization> + <organizationUrl>http://jogamp.org/</organizationUrl> + </developer> + </developers> + <contributors> + <contributor> + <name>Kevin Rushforth</name> + <url>https://www.linkedin.com/in/kevin-rushforth-8ba3b43</url> + <organization>Oracle Corporation</organization> + <organizationUrl>http://oracle.com/</organizationUrl> + </contributor> + <contributor> + <name>Chien Yang</name> + <url>https://www.linkedin.com/in/chien-yang-0884122</url> + <organization>Oracle Corporation</organization> + <organizationUrl>http://oracle.com/</organizationUrl> + </contributor> + <contributor> + <name>Curtis Rueden</name> + <url>http://loci.wisc.edu/people/curtis-rueden</url> + <organization>UW-Madison LOCI</organization> + <organizationUrl>http://loci.wisc.edu/</organizationUrl> + </contributor> + <contributor> + <name>Alessandro Borges</name> + </contributor> + <contributor> + <name>August Lammersdorf</name> + </contributor> + <contributor> + <name>Kavon Farvardin</name> + </contributor> + <contributor> + <name>Ken Russell</name> + </contributor> + <contributor> + <name>Saeid Nourian</name> + </contributor> + <contributor> + <name>Ken Mc Neill</name> + </contributor> + <contributor> + <name>Julian Ibarz</name> + </contributor> + </contributors> + + <properties> + <jogl.version>2.3.2</jogl.version> + + <!-- NB: Token values for filtering VersionInfo.java. --> + <version_base>1.6.0</version_base> + <build.spec.title>${project.name}</build.spec.title> + <build.spec.vendor></build.spec.vendor> + <build.impl.title>${project.name}</build.impl.title> + <build.impl.vendor></build.impl.vendor> + <build.impl.vendor.id></build.impl.vendor.id> + <build.type>daily</build.type> + <buildtime>daily</buildtime> + <buildtime_verbose>daily</buildtime_verbose> + <is_debug>false</is_debug> + <is_dev_phase>true</is_dev_phase> + <is_production>false</is_production> + <use_verbose_buildtime>true</use_verbose_buildtime> + <version_buildnum>11</version_buildnum> + <version_build>pre${version_buildnum}</version_build> + <version_suffix>${version_build}</version_suffix> + + <!-- NB: Avoid platform encoding warning when copying resources. --> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + </properties> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vecmath</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.jogamp.gluegen</groupId> + <artifactId>gluegen-rt</artifactId> + <version>${jogl.version}</version> + </dependency> + <dependency> + <groupId>org.jogamp.jogl</groupId> + <artifactId>jogl-all</artifactId> + <version>${jogl.version}</version> + </dependency> + </dependencies> + + <build> + <defaultGoal>install</defaultGoal> + + <sourceDirectory>${basedir}/src</sourceDirectory> + <resources> + <resource> + <directory>${project.basedir}/src</directory> + <excludes> + <exclude>**/*.java</exclude> + <exclude>**/package.html</exclude> + </excludes> + </resource> + </resources> + + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.1</version> + <configuration> + <source>1.7</source> + <target>1.7</target> + </configuration> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <version>2.5</version> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.9.1</version> + <configuration> + <javadocDirectory>${project.basedir}/src</javadocDirectory> + <links> + <link>http://docs.oracle.com/javase/7/docs/api/</link> + </links> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>templating-maven-plugin</artifactId> + <version>1.0-alpha-3</version> + <executions> + <execution> + <goals> + <goal>filter-sources</goal> + </goals> + </execution> + </executions> + <configuration> + <sourceDirectory>${basedir}/templates</sourceDirectory> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>only-eclipse</id> + <activation> + <property> + <name>m2e.version</name> + </property> + </activation> + <build> + <pluginManagement> + <plugins> + <plugin> + <!-- + NB: Make Eclipse generate code in a full build; see: + http://wiki.eclipse.org/M2E_plugin_execution_not_covered + --> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.codehaus.mojo</groupId> + <artifactId>templating-maven-plugin</artifactId> + <versionRange>1.0-alpha-3</versionRange> + <goals> + <goal>filter-sources</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute> + <runOnConfiguration>true</runOnConfiguration> + <runOnIncremental>false</runOnIncremental> + </execute> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + </profile> + </profiles> +</project> diff --git a/build-tools/VersionInfo.java b/templates/javax/media/j3d/VersionInfo.java index f76df88..9545370 100644 --- a/build-tools/VersionInfo.java +++ b/templates/javax/media/j3d/VersionInfo.java @@ -51,7 +51,7 @@ package javax.media.j3d; * </ol> * * <p> - * The tags of the form @STRING@ are populated by ant when the project is built + * The tags of the form ${string} are populated by Maven when the project is built * * @see VirtualUniverse#getProperties */ @@ -86,7 +86,7 @@ class VersionInfo extends Object { /** * Constant that indicates whether or not this is a debug build. */ - static final boolean isDebug = @IS_DEBUG@; + static final boolean isDebug = ${is_debug}; /** * This static final variable is used to enable debugging and @@ -100,7 +100,7 @@ class VersionInfo extends Object { * This parameter is controlled by ant via the build.xml file. The * default value is true. */ - static final boolean isDevPhase = @IS_DEV_PHASE@; + static final boolean isDevPhase = ${is_dev_phase}; /** * This static final variable is used indicate a production @@ -109,7 +109,7 @@ class VersionInfo extends Object { * This parameter is controlled by ant via the build.xml file. The * default value is false. */ - static final boolean isProduction = @IS_PRODUCTION@; + static final boolean isProduction = ${is_production}; /** * If this flag is set to true, the verbose buildtime string @@ -118,14 +118,14 @@ class VersionInfo extends Object { * This parameter is controlled by ant via the build.xml file. The * default value is true. */ - private static final boolean useVerboseBuildTime = @USE_VERBOSE_BUILDTIME@; + private static final boolean useVerboseBuildTime = ${use_verbose_buildtime}; /** * String identifying the type of build, one of: * "daily", "stable", "beta", "fcs", or "patch". The default value * is "daily". */ - private static final String BUILD_TYPE = "@BUILD_TYPE@"; + private static final String BUILD_TYPE = "${build.type}"; /** * String identifying the build number in the format @@ -136,7 +136,7 @@ class VersionInfo extends Object { * For production builds, this string appears parenthetically, * after the first space. */ - private static final String VERSION_BUILD = "@VERSION_BUILD@"; + private static final String VERSION_BUILD = "${version_build}"; /** * String identifying the particular build of the 3D API, for @@ -149,14 +149,14 @@ class VersionInfo extends Object { * This us used as part of the j3d.version that appears before the * optional first space. */ - private static final String VERSION_SUFFIX = "@VERSION_SUFFIX@"; + private static final String VERSION_SUFFIX = "${version_suffix}"; /** * Date stamp * * This is only used for daily builds. */ - private static final String BUILDTIME = "@BUILDTIME@"; + private static final String BUILDTIME = "${buildtime}"; /** * Specification version (major and minor version only). This @@ -167,12 +167,12 @@ class VersionInfo extends Object { /** * Specification vendor. */ - private static final String SPECIFICATION_VENDOR = "@SPEC_VENDOR@"; + private static final String SPECIFICATION_VENDOR = "${build.spec.vendor}"; /** * Primary implementation vendor. */ - private static final String VENDOR_PRIMARY = "@IMPL_VENDOR@"; + private static final String VENDOR_PRIMARY = "${build.impl.vendor}"; /** * Base version number. This is the major.minor.subminor version @@ -180,7 +180,7 @@ class VersionInfo extends Object { * major and minor version <i>must</i> be the same as the specification * version. */ - private static final String VERSION_BASE = "@VERSION_BASE@"; + private static final String VERSION_BASE = "${project.version}"; /** * Boolean flag indicating that the version of the 3D API is @@ -210,7 +210,7 @@ class VersionInfo extends Object { * will automatically be added) and before the optional dev * string. This string is only used for non-fcs builds. */ - private static final String BUILDTIME_VERBOSE = "@BUILDTIME_VERBOSE@"; + private static final String BUILDTIME_VERBOSE = "${buildtime_verbose}"; private static boolean isNonEmpty(String str) { if ((str == null) || (str.length() == 0)) { |