From 35886260cf5f304317737f33e2c6fa0aaa8c82f1 Mon Sep 17 00:00:00 2001
From: Kevin Rushforth <kcr@dev.java.net>
Date: Tue, 16 Nov 2004 17:25:00 +0000
Subject: Updated build numbering scheme for beta and fcs builds in preparation
 for beta1 release

git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@78 ba19aa83-45c5-6ac9-afd3-db810772062c
---
 src/classes/build.xml                           | 26 +++++++++++++++----------
 src/classes/share/javax/media/j3d/J3dDebug.java |  4 ++--
 2 files changed, 18 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/classes/build.xml b/src/classes/build.xml
index 30004b0..6b63d5e 100644
--- a/src/classes/build.xml
+++ b/src/classes/build.xml
@@ -39,13 +39,16 @@
           todir="${build-debug-gen}/classes/javax/media/j3d"
           overwrite="true">
         <filterset>
-            <filter token="VERSION_BUILD" value="${version_build}"/>
-            <filter token="VERSION_BASE" value="${version_base}"/>
-            <filter token="IS_DEBUG" value="true"/>
-            <filter token="DEV_PHASE" value="true"/>
-            <filter token="DAILY_BUILD" value="${daily_build}"/>
+            <filter token="BUILD_TYPE" value="${build.type}"/>
             <filter token="BUILDTIME" value="${buildtime}"/>
             <filter token="BUILDTIME_VERBOSE" value="${buildtime_verbose}"/>
+            <filter token="IS_DEBUG" value="true"/>
+            <filter token="IS_DEV_PHASE" value="true"/>
+            <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}"/>
         </filterset>
     </copy>
 
@@ -80,13 +83,16 @@
           todir="${build-opt-gen}/classes/javax/media/j3d"
           overwrite="true">
         <filterset>
-            <filter token="VERSION_BUILD" value="${version_build}"/>
-            <filter token="VERSION_BASE" value="${version_base}"/>
-            <filter token="IS_DEBUG" value="false"/>
-            <filter token="DEV_PHASE" value="${dev_phase}"/>
-            <filter token="DAILY_BUILD" value="${daily_build}"/>
+            <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}"/>
         </filterset>
     </copy>
 
diff --git a/src/classes/share/javax/media/j3d/J3dDebug.java b/src/classes/share/javax/media/j3d/J3dDebug.java
index 564d61a..8490d5e 100644
--- a/src/classes/share/javax/media/j3d/J3dDebug.java
+++ b/src/classes/share/javax/media/j3d/J3dDebug.java
@@ -14,7 +14,7 @@ package javax.media.j3d;
 
 class J3dDebug  {
 
-    // For production release devPhase must be set to false.
+    // For production release devPhase is set to false.
     
     // Do no debugging.
     static final int NO_DEBUG			= 0;
@@ -37,7 +37,7 @@ class J3dDebug  {
     // uncovering potential bugs during code development. This
     // variable should be turned off during production release as it
     // may cause performance hit.
-    static final boolean devPhase = VersionInfo.devPhase;
+    static final boolean devPhase = VersionInfo.isDevPhase;
 
     // This is a property variable. It allows a true/false be sent to
     // J3d from command line, to on/off code segments.  To avoid
-- 
cgit v1.2.3