Build scripts updated to make MDR extras buildable with the current trunk. MapJava ant task enhanced - added attribute for file header specification.
1.1 --- a/mdr/extras/mdrant/build.xml Sun Jun 06 20:00:05 2004 +0000
1.2 +++ b/mdr/extras/mdrant/build.xml Mon Jun 07 14:04:00 2004 +0000
1.3 @@ -17,13 +17,12 @@
1.4 -->
1.5
1.6 <project name="mdrant" basedir="." default="all">
1.7 -
1.8 <property name="nbroot" location="../../../"/>
1.9 <property name="nbext" location="${nbroot}/nbbuild"/>
1.10 <property name="build.compiler.debug" value="true"/>
1.11 <property name="build.compiler.deprecation" value="true"/>
1.12 - <property name="build.dir" location="."/>
1.13 - <property name="build.mdr.classes.dir" location="${build.dir}/src"/>
1.14 + <property name="build.dir" location="dist"/>
1.15 + <property name="build.classes.dir" location="build/classes"/>
1.16 <property name="standard-jar-excludes.txt" location="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
1.17
1.18 <!-- all external files and directories -->
1.19 @@ -31,14 +30,15 @@
1.20 <property name="jmi.jar.dir" location="${mdrroot}/external"/>
1.21
1.22 <property name="nbantext.jar" location="${nbext}/nbantext.jar"/>
1.23 - <property name="openide-lookup.jar" location="${nbroot}/openide/util/netbeans/lib/openide-util.jar"/>
1.24 + <property name="openide-lookup.jar" location="${nbroot}/openide/util/build/netbeans/lib/openide-util.jar"/>
1.25
1.26
1.27 <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar"
1.28 classpath="${nbantext.jar}"/>
1.29
1.30 <target name="init">
1.31 -
1.32 + <mkdir dir="${build.classes.dir}"/>
1.33 + <mkdir dir="${build.dir}"/>
1.34 </target>
1.35
1.36 <target name="compile" depends="mdrant-compile">
1.37 @@ -57,13 +57,15 @@
1.38 <ant dir="${nbroot}/openide" target="libs"/>
1.39 </target>
1.40
1.41 - <target name="mdrant-compile" depends="lookup-standalone">
1.42 - <javac srcdir="src" destdir="src"
1.43 + <target name="mdrant-compile" depends="init,lookup-standalone">
1.44 + <javac srcdir="src" destdir="${build.classes.dir}"
1.45 debug="${build.compiler.debug}"
1.46 deprecation="${build.compiler.deprecation}">
1.47 <classpath>
1.48 <!--pathelement location="${openide-13javac-workaround.jar}"/-->
1.49 - <pathelement location="${mdrroot}/src"/>
1.50 + <pathelement location="${mdrroot}/mdrapi/build/classes"/>
1.51 + <pathelement location="${mdrroot}/jmiutils/dist/jmiutils.jar"/>
1.52 + <pathelement location="${mdrroot}/dist/mdr.jar"/>
1.53 <pathelement location="${openide-lookup.jar}"/>
1.54 <fileset dir="${jmi.jar.dir}">
1.55 <include name="jmi*.jar"/>
1.56 @@ -75,19 +77,15 @@
1.57 </target>
1.58
1.59 <target name="mdrant-clean">
1.60 - <delete>
1.61 - <fileset dir="${build.mdr.classes.dir}/org/netbeans/mdrant">
1.62 - <include name="**/*.class"/>
1.63 - </fileset>
1.64 - </delete>
1.65 - <delete dir="${build.dir}/release"/>
1.66 + <delete dir="${build.classes.dir}"/>
1.67 + <delete dir="${build.dir}"/>
1.68 </target>
1.69
1.70 - <target name="mdrant-jar" depends="init,mdrant-compile">
1.71 - <locjar jarfile="${build.dir}/release/mdrant.jar"
1.72 + <target name="mdrant-jar" depends="mdrant-compile">
1.73 + <locjar jarfile="${build.dir}/mdrant.jar"
1.74 compress="false">
1.75 <!--manifest="manifest-mdrant.mf" -->
1.76 - <fileset dir="${build.mdr.classes.dir}" excludesfile="${standard-jar-excludes.txt}">
1.77 + <fileset dir="${build.classes.dir}" excludesfile="${standard-jar-excludes.txt}">
1.78 <include name="org/netbeans/mdrant/"/>
1.79 </fileset>
1.80 <fileset dir="src" excludesfile="${standard-jar-excludes.txt}">
2.1 --- a/mdr/extras/mdrant/src/org/netbeans/mdrant/MapJava.java Sun Jun 06 20:00:05 2004 +0000
2.2 +++ b/mdr/extras/mdrant/src/org/netbeans/mdrant/MapJava.java Mon Jun 07 14:04:00 2004 +0000
2.3 @@ -13,8 +13,12 @@
2.4
2.5 package org.netbeans.mdrant;
2.6
2.7 +import java.io.BufferedReader;
2.8 import java.io.File;
2.9 import java.io.FileOutputStream;
2.10 +import java.io.FileReader;
2.11 +import java.io.IOException;
2.12 +import java.io.StringWriter;
2.13
2.14 import javax.jmi.reflect.*;
2.15
2.16 @@ -31,7 +35,7 @@
2.17 public class MapJava extends MdrTask.Sub {
2.18
2.19 private File dir;
2.20 -
2.21 + private File headerFile;
2.22 private String extent;
2.23
2.24 /** Creates a new instance of PrintExtentsNames */
2.25 @@ -64,10 +68,26 @@
2.26 this.extent = extent;
2.27 }
2.28
2.29 + public void setHeaderFile(File headerFile) {
2.30 + this.headerFile = headerFile;
2.31 + }
2.32 +
2.33 // Protected methods -------------------------------------------------------
2.34
2.35 - protected JMIMapper getMapper() {
2.36 - return new JMIMapperImpl();
2.37 + protected JMIMapper getMapper() throws IOException {
2.38 + JMIMapperImpl result = new JMIMapperImpl();
2.39 + if (headerFile != null) {
2.40 + BufferedReader reader = new BufferedReader(new FileReader(headerFile));
2.41 + StringWriter header = new StringWriter();
2.42 + int ch;
2.43 + while ((ch = reader.read()) != -1) {
2.44 + header.write(ch);
2.45 + }
2.46 + reader.close();
2.47 + header.close();
2.48 + result.setHeader(header.toString());
2.49 + }
2.50 + return result;
2.51 }
2.52
2.53
3.1 --- a/mdr/extras/uml2mof/build.xml Sun Jun 06 20:00:05 2004 +0000
3.2 +++ b/mdr/extras/uml2mof/build.xml Mon Jun 07 14:04:00 2004 +0000
3.3 @@ -12,35 +12,31 @@
3.4 Microsystems, Inc. All Rights Reserved.
3.5 -->
3.6 <project basedir="." default="jars" name="uml2mof">
3.7 - <!-- =========================================================== -->
3.8 - <!-- == Properties ============================================= -->
3.9 - <!-- =========================================================== -->
3.10 - <property file="ant.properties"/>
3.11 <property location="../../../" name="nbroot"/>
3.12 + <import file="${nbroot}/nbbuild/default-properties.xml"/>
3.13 +
3.14 <property location="${nbroot}/nbbuild" name="nbext"/>
3.15 <property name="build.compiler.debug" value="true"/>
3.16 <property name="build.compiler.deprecation" value="true"/>
3.17 - <property name="homepage.base" value="netbeans.org"/>
3.18 - <property name="dist.base" value="www.netbeans.org/download/nbms/40/MDR"/>
3.19 - <property location="release" name="build.dir"/>
3.20 - <property location="src" name="build.classes.dir"/>
3.21 + <property location="dist" name="build.dir"/>
3.22 + <property location="build/classes" name="build.classes.dir"/>
3.23 <property location="common" name="common.dir"/>
3.24
3.25 <!-- all external files and directories -->
3.26 - <property name="openide-lookup.jar" value="${nbroot}/openide/util/netbeans/lib/openide-util.jar"/>
3.27 + <property name="openide-lookup.jar" value="${nbroot}/openide/util/build/netbeans/lib/openide-util.jar"/>
3.28 <property name="standard-jar-excludes.txt" value="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
3.29 <property name="standard-nbm-license.txt" value="${nbroot}/nbbuild/standard-nbm-license.txt"/>
3.30 - <property name="jmi.jar" value="${nbroot}/mdr/netbeans/modules/autoload/jmi.jar"/>
3.31 - <property name="mof.jar" value="${nbroot}/mdr/netbeans/modules/autoload/mof.jar"/>
3.32 - <property name="mdrapi.jar" value="${nbroot}/mdr/netbeans/modules/autoload/mdrapi.jar"/>
3.33 - <property name="jmiutils.jar" value="${nbroot}/mdr/netbeans/modules/autoload/ext/jmiutils.jar"/>
3.34 - <property name="nbmdr.jar" value="${nbroot}/mdr/netbeans/modules/ext/nbmdr.jar"/>
3.35 + <property name="jmi.jar" value="${nbroot}/mdr/external/jmi.jar"/>
3.36 + <property name="mof.jar" value="${nbroot}/mdr/external/mof.jar"/>
3.37 + <property name="mdrapi.jar" value="${mdr/mdrapi.dir}/${nb.modules.dir}/org-netbeans-api-mdr.jar"/>
3.38 + <property name="jmiutils.jar" value="${nbroot}/mdr/jmiutils/dist/jmiutils.jar"/>
3.39 + <property name="nbmdr.jar" value="${nbroot}/mdr/dist/mdr.jar"/>
3.40 <property name="fileupload.jar" value="${common.dir}/commons-fileupload-1.0-beta-1.jar"/>
3.41 <property name="servlet.jar" value="${nbroot}/web/external/servlet-2.3.jar"/>
3.42 <property name="umlclasses.dir" value="uml"/>
3.43 <property name="umlmetamodel.xml" value="${nbroot}/mdr/xmidiffs/01-02-15.xml"/>
3.44 <property name="umlmetamodel.diff" value="${nbroot}/mdr/xmidiffs/01-02-15_Diff.xml"/>
3.45 - <property name="mdrant.jar" value="${nbroot}/mdr/extras/mdrant/release/mdrant.jar"/>
3.46 + <property name="mdrant.jar" value="${nbroot}/mdr/extras/mdrant/dist/mdrant.jar"/>
3.47 <property name="storage.file" value="build"/>
3.48 <property name="warfile" value="uml2mof.war"/>
3.49
3.50 @@ -128,12 +124,12 @@
3.51 </fileset>
3.52 </jar>
3.53
3.54 - <copy file="${jmi.jar}" todir="${build.dir}"/>
3.55 - <copy file="${mof.jar}" todir="${build.dir}"/>
3.56 - <copy file="${mdrapi.jar}" todir="${build.dir}"/>
3.57 - <copy file="${nbmdr.jar}" todir="${build.dir}"/>
3.58 - <copy file="${jmiutils.jar}" todir="${build.dir}"/>
3.59 - <copy file="${openide-lookup.jar}" todir="${build.dir}"/>
3.60 + <copy file="${jmi.jar}" tofile="${build.dir}/jmi.jar"/>
3.61 + <copy file="${mof.jar}" tofile="${build.dir}/mof.jar"/>
3.62 + <copy file="${mdrapi.jar}" tofile="${build.dir}/mdrapi.jar"/>
3.63 + <copy file="${nbmdr.jar}" tofile="${build.dir}/nbmdr.jar"/>
3.64 + <copy file="${jmiutils.jar}" tofile="${build.dir}/jmiutils.jar"/>
3.65 + <copy file="${openide-lookup.jar}" tofile="${build.dir}/openide-util.jar"/>
3.66
3.67 <jar compress="false" jarfile="${build.dir}/uml2mof.jar" manifest="manifest.mf">
3.68 <fileset dir="${build.classes.dir}" excludesfile="${standard-jar-excludes.txt}">