#40598 Partialy commiting the proposed patch, don't removing suggested modules from build - waiting for approval
1.1 --- a/schema2beans/build.xml Wed Mar 03 16:25:00 2004 +0000
1.2 +++ b/schema2beans/build.xml Thu Mar 04 17:03:47 2004 +0000
1.3 @@ -8,40 +8,21 @@
1.4 http://www.sun.com/
1.5
1.6 The Original Code is NetBeans. The Initial Developer of the Original
1.7 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
1.8 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
1.9 Microsystems, Inc. All Rights Reserved.
1.10 -->
1.11
1.12 +<project name="schema2beans" default="fail" basedir=".">
1.13
1.14 -<project name="schema2beans" default="netbeans" basedir=".">
1.15 + <target name="fail">
1.16 + <fail>There is no default target.</fail>
1.17 + </target>
1.18
1.19 <property name="nbroot" location=".."/>
1.20 - <property name="nbext" location="${nbroot}/nbbuild"/>
1.21 - <property name="license.file" value="${nbroot}/nbbuild/standard-nbm-license.txt"/>
1.22 - <property name="homepage.base" value="netbeans.org"/>
1.23 - <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
1.24 -
1.25 - <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext}/nbantext.jar"/>
1.26 - <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext}/nbantext.jar"/>
1.27 - <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar"/>
1.28
1.29 <!-- Primary targets. -->
1.30
1.31 - <target name="netbeans" depends="jars">
1.32 - <genlist targetname="nbm" outputfiledir="netbeans"/>
1.33 - </target>
1.34 -
1.35 - <target name="nbm">
1.36 - <ant dir="rt" antfile="build.xml" target="nbm"/>
1.37 - <ant dir="dev" antfile="build.xml" target="nbm"/>
1.38 - </target>
1.39 -
1.40 <target name="clean">
1.41 - <delete dir="netbeans"/>
1.42 - <delete dir="javadoc"/>
1.43 - <delete file="schema2beans.nbm"/>
1.44 - <delete file="schema2beansdev.nbm"/>
1.45 - <delete dir="Info"/>
1.46 <ant dir="rt" antfile="build.xml" target="clean"/>
1.47 <ant dir="dev" antfile="build.xml" target="clean"/>
1.48 <ant dir="nbgui" antfile="build.xml" target="clean"/>
1.49 @@ -63,33 +44,6 @@
1.50
1.51 <!-- Secondary targets. -->
1.52
1.53 - <target name="jars">
1.54 - <echo message="Building rt jars"/>
1.55 - <ant dir="rt" antfile="build.xml" target="jars"/>
1.56 - <echo message="Building dev jars"/>
1.57 - <ant dir="dev" antfile="build.xml" target="jars"/>
1.58 - <echo message="Building anttask jars"/>
1.59 - <ant dir="anttask" antfile="build.xml" target="jars"/>
1.60 - <echo message="Building nbgui jars"/>
1.61 - <ant dir="nbgui" antfile="build.xml" target="jars"/>
1.62 - <mkdir dir="netbeans"/>
1.63 - <copy todir="netbeans">
1.64 - <fileset dir="rt/netbeans"/>
1.65 - </copy>
1.66 - <copy todir="netbeans">
1.67 - <fileset dir="dev/netbeans"/>
1.68 - </copy>
1.69 - </target>
1.70 -
1.71 - <target name="compile">
1.72 - <echo message="Doing rt compile"/>
1.73 - <ant dir="rt" antfile="build.xml" target="compile"/>
1.74 - <echo message="Doing dev compile"/>
1.75 - <ant dir="dev" antfile="build.xml" target="compile"/>
1.76 - <echo message="Doing nbgui compile"/>
1.77 - <ant dir="nbgui" antfile="build.xml" target="compile"/>
1.78 - </target>
1.79 -
1.80 <target name="javadoc" description="Build schema2beans module API documentation.">
1.81 <tstamp/>
1.82 <property name="apis-footer" value="<font size=-2 color=gray>Built on ${TODAY}.&nbsp;&nbsp;|&nbsp;&nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.</font>"/>
1.83 @@ -113,27 +67,12 @@
1.84 </javadoc>
1.85 </target>
1.86
1.87 - <target name="dev" description="A development target to compile with symbols and copy jar file(s)" depends="jars">
1.88 - <copy todir="${nbroot}/nbbuild/netbeans/modules/">
1.89 - <fileset dir="netbeans/modules/">
1.90 - <exclude name="**/locale/*"/>
1.91 - <exclude name="**/*-test.jar" />
1.92 - </fileset>
1.93 - </copy>
1.94 - </target>
1.95 -
1.96 - <target name="f4dev" description="A development target to compile with symbols and copy jar file(s)" depends="jars">
1.97 - <copy todir="${f4jroot}/f4jbuild/firststart/modules/">
1.98 - <fileset dir="netbeans/modules/">
1.99 - <exclude name="**/locale/*"/>
1.100 - <exclude name="**/*-test.jar" />
1.101 - </fileset>
1.102 - </copy>
1.103 - </target>
1.104 -
1.105 - <target name="test" depends="jars">
1.106 + <target name="test">
1.107 + <ant dir="rt"/>
1.108 + <ant dir="dev"/>
1.109 <ant dir="test" antfile="build.xml" />
1.110 </target>
1.111
1.112 - <target name="cleantest" depends="clean,jars,test"/>
1.113 + <target name="cleantest" depends="clean,test"/>
1.114 +
1.115 </project>
2.1 --- a/schema2beans/nbgui/build.xml Wed Mar 03 16:25:00 2004 +0000
2.2 +++ b/schema2beans/nbgui/build.xml Thu Mar 04 17:03:47 2004 +0000
2.3 @@ -8,11 +8,10 @@
2.4 http://www.sun.com/
2.5
2.6 The Original Code is NetBeans. The Initial Developer of the Original
2.7 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
2.8 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
2.9 Microsystems, Inc. All Rights Reserved.
2.10 -->
2.11
2.12 -
2.13 <project name="schema2beansnbgui" default="netbeans" basedir=".">
2.14
2.15 <property name="nbroot" location="../.."/>
2.16 @@ -80,7 +79,7 @@
2.17 <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
2.18 <classpath>
2.19 <pathelement location="${nbroot}/schema2beans/rt/netbeans/modules/autoload/schema2beans.jar"/>
2.20 - <pathelement location="${nbroot}/schema2beans/rt/netbeans/modules/autoload/schema2beansdev.jar"/>
2.21 + <pathelement location="${nbroot}/schema2beans/dev/netbeans/modules/autoload/schema2beansdev.jar"/>
2.22 </classpath>
2.23 <patternset>
2.24 <include name="org/netbeans/modules/schema2beansnbgui/"/>
3.1 --- a/schema2beans/test/build-unit.xml Wed Mar 03 16:25:00 2004 +0000
3.2 +++ b/schema2beans/test/build-unit.xml Thu Mar 04 17:03:47 2004 +0000
3.3 @@ -8,7 +8,7 @@
3.4 http://www.sun.com/
3.5
3.6 The Original Code is NetBeans. The Initial Developer of the Original
3.7 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2000 Sun
3.8 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
3.9 Microsystems, Inc. All Rights Reserved.
3.10 -->
3.11
3.12 @@ -138,8 +138,8 @@
3.13 <!-- If you need e.g. openide.jar, write this:
3.14 <pathelement location="../netbeans/lib/openide.jar"/>
3.15 -->
3.16 - <pathelement location="../netbeans/modules/autoload/schema2beans.jar"/>
3.17 - <pathelement location="../netbeans/modules/autoload/schema2beansdev.jar"/>
3.18 + <pathelement location="../rt/netbeans/modules/autoload/schema2beans.jar"/>
3.19 + <pathelement location="../dev/netbeans/modules/autoload/schema2beansdev.jar"/>
3.20 </path>
3.21 </target>
3.22
3.23 @@ -186,8 +186,8 @@
3.24 <pathelement location="../netbeans/lib/openide.jar"/>
3.25 -->
3.26 <!-- <pathelement location="/home/cliffwd/cvs/current/f4j_all/jwsdp/release/modules/autoload/ext/jax-qname.jar"/> -->
3.27 - <pathelement location="../netbeans/modules/autoload/schema2beans.jar"/>
3.28 - <pathelement location="../netbeans/modules/autoload/schema2beansdev.jar"/>
3.29 + <pathelement location="../rt/netbeans/modules/autoload/schema2beans.jar"/>
3.30 + <pathelement location="../dev/netbeans/modules/autoload/schema2beansdev.jar"/>
3.31 </path>
3.32 </target>
3.33
3.34 @@ -218,6 +218,5 @@
3.35 <pathelement location="${netbeans.home}/modules/autoload/schema2beansdev.jar"/>
3.36 </path>
3.37 </target>
3.38 -
3.39
3.40 </project>