Continue moving javax.media.nwi -> javax.media.nativewindow

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1881 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 19 insertions, 18 deletions

diff --git a/make/build.xml b/make/build.xml
index 2980d4139..2f141d216 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -11,35 +11,36 @@
         <property name="build" value="${project.root}/${rootrel.build}" />
         <property name="src" value="${project.root}/src" />
 
-        <property name="nwi.make.dir" value="." />
-        <property name="nwi.build.xml" value="${nwi.make.dir}/build-nwi.xml" />
+        <property name="nativewindow.make.dir" value="." />
+        <property name="nativewindow.build.xml" value="${nativewindow.make.dir}/build-nativewindow.xml" />
         <property name="jogl.make.dir" value="." />
         <property name="jogl.build.xml" value="${jogl.make.dir}/build-jogl.xml" />
         <property name="newt.make.dir" value="." />
         <property name="newt.build.xml" value="${newt.make.dir}/build-newt.xml" />
 
-        <property name="all.srcj.path" value="${src}/nwi/classes;${src}/jogl/classes;${src}/newt/classes" />
-        <property name="all.genj.path" value="${build}-nwi/gensrc/classes;${build}-jogl/gensrc/classes;${build}-newt/gensrc/classes" />
+        <property name="all.srcj.path" value="${src}/nativewindow/classes;${src}/jogl/classes;${src}/newt/classes" />
+        <property name="all.genj.path" value="${build}-nativewindow/gensrc/classes;${build}-jogl/gensrc/classes;${build}-newt/gensrc/classes" />
 
         <!-- The javadoc dirs. -->
-        <property name="javadoc" value="${project.root}/javadoc_joglnwinewt_public" />
-        <property name="javadoc.spec" value="${project.root}/javadoc_joglnwinewt_spec" />
-        <property name="javadoc.dev" value="${project.root}/javadoc_joglnwinewt_dev" />
+        <property name="javadoc" value="${project.root}/javadoc_public" />
+        <property name="javadoc.spec" value="${project.root}/javadoc_spec" />
+        <property name="javadoc.dev" value="${project.root}/javadoc_dev" />
         <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" />
-        <property name="javadoc.windowtitle" value="JOGL, NWI and NEWT API -- JSR-231 ${base_version} Specification" />
+        <property name="javadoc.windowtitle" value="JOGL, NativeWindow and NEWT APIs" />
+        <property name="javadoc.spec.windowtitle" value="JOGL and NativeWindow APIs -- JSR-231 ${base_version} Specification" />
         <property name="javadoc.overview" value="spec-overview.html" />
-        <property name="javadoc.spec.packagenames" value="javax.media.nwi.*, javax.media.opengl.*, com.sun.javafx.newt, com.sun.javafx.newt.opengl" />
-        <property name="javadoc.packagenames" value="${javadoc.spec.packagenames},com.sun.opengl.util.*" />
-        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.sun.opengl.impl.*,com.sun.nwi.impl.*,com.sun.javafx.newt.*,com.sun.gluegen,com.sun.gluegen.runtime" />
+        <property name="javadoc.spec.packagenames" value="javax.media.nativewindow.*, javax.media.opengl.*" />
+        <property name="javadoc.packagenames" value="${javadoc.spec.packagenames},com.sun.opengl.util.*,com.sun.javafx.newt, com.sun.javafx.newt.opengl" />
+        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.sun.opengl.impl.*,com.sun.nativewindow.impl.*,com.sun.javafx.newt.*,com.sun.gluegen,com.sun.gluegen.runtime" />
     <property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
 
         <property name="gluegen-rt.jar" value="../../gluegen/${rootrel.build}/gluegen-rt.jar" />
-        <property name="nwi.all.jar" value="../${rootrel.build}-nwi/nwi.all.jar" />
+        <property name="nativewindow.all.jar" value="../${rootrel.build}-nativewindow/nativewindow.all.jar" />
         <property name="jogl.all.jar" value="../${rootrel.build}-jogl/jogl.all.jar" />
         <property name="newt.all.jar" value="../${rootrel.build}-newt/newt.all.jar" />
 
         <path id="all.classpath">
-            <pathelement location="${nwi.all.jar}" />
+            <pathelement location="${nativewindow.all.jar}" />
             <pathelement location="${gluegen-rt.jar}" />
             <pathelement location="${jogl.all.jar}" />
             <pathelement location="${newt.all.jar}" />
@@ -47,8 +48,8 @@
 
     </target>
 
-    <target name="build.nwi" depends="init">
-        <ant antfile="${nwi.build.xml}" dir="${nwi.make.dir}" target="all" inheritAll="false"/>
+    <target name="build.nativewindow" depends="init">
+        <ant antfile="${nativewindow.build.xml}" dir="${nativewindow.make.dir}" target="all" inheritAll="false"/>
     </target>
 
     <target name="build.jogl" depends="init">
@@ -59,10 +60,10 @@
         <ant antfile="${newt.build.xml}" dir="${newt.make.dir}" target="all" inheritAll="false"/>
     </target>
 
-    <target name="all" description="Build nwi, jogl and newt projects" depends="init,build.nwi,build.jogl,build.newt" />
+    <target name="all" description="Build nativewindow, jogl and newt projects" depends="init,build.nativewindow,build.jogl,build.newt" />
 
     <target name="clean" depends="init">
-        <ant antfile="${nwi.build.xml}" dir="${nwi.make.dir}" target="clean" inheritAll="false"/>
+        <ant antfile="${nativewindow.build.xml}" dir="${nativewindow.make.dir}" target="clean" inheritAll="false"/>
         <ant antfile="${jogl.build.xml}" dir="${jogl.make.dir}" target="clean" inheritAll="false"/>
         <ant antfile="${newt.build.xml}" dir="${newt.make.dir}" target="clean" inheritAll="false"/>
     </target>        
@@ -109,7 +110,7 @@
         </javadoc>
     </target>
 
-    <target name="all.doc" description="Build NWI, JOGL and NEWT docs" depends="init,javadoc,javadoc.spec,javadoc.dev" />
+    <target name="all.doc" description="Build NativeWindow, JOGL and NEWT docs" depends="init,javadoc,javadoc.spec,javadoc.dev" />
 
 </project>