Adding some stuff chennai_demo_branch_root
authortboudreau@netbeans.org
Thu, 09 Feb 2006 04:18:19 +0000
changeset 1746a652b32a383c
parent 1745 ea2ac773bdd0
child 1747 751a8ebbca70
Adding some stuff
workspaceswitcher/ChennaiDemoApplication/nbproject/build-impl.xml
workspaceswitcher/ChennaiDemoApplication/nbproject/genfiles.properties
workspaceswitcher/ChennaiDemoApplication/src/chennaidemoapplication/Main.java
workspaceswitcher/ChennaiDemoApplication/src/chennaidemoapplication/NewClass.java
     1.1 --- a/workspaceswitcher/ChennaiDemoApplication/nbproject/build-impl.xml	Wed Feb 08 09:46:44 2006 +0000
     1.2 +++ b/workspaceswitcher/ChennaiDemoApplication/nbproject/build-impl.xml	Thu Feb 09 04:18:19 2006 +0000
     1.3 @@ -54,6 +54,12 @@
     1.4                  </not>
     1.5              </and>
     1.6          </condition>
     1.7 +        <condition property="manifest.available+main.class+mkdist.available">
     1.8 +            <and>
     1.9 +                <istrue value="${manifest.available+main.class}"/>
    1.10 +                <isset property="libs.CopyLibs.classpath"/>
    1.11 +            </and>
    1.12 +        </condition>
    1.13          <condition property="have.tests">
    1.14              <or>
    1.15                  <available file="${test.src.dir}"/>
    1.16 @@ -280,18 +286,51 @@
    1.17      <target name="-do-jar-with-manifest" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" unless="manifest.available+main.class">
    1.18          <j2seproject1:jar manifest="${manifest.file}"/>
    1.19      </target>
    1.20 -    <target name="-do-jar-with-mainclass" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class">
    1.21 +    <target name="-do-jar-with-mainclass" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" unless="manifest.available+main.class+mkdist.available">
    1.22          <j2seproject1:jar manifest="${manifest.file}">
    1.23              <j2seproject1:manifest>
    1.24                  <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
    1.25              </j2seproject1:manifest>
    1.26          </j2seproject1:jar>
    1.27 +        <echo>To run this application from the command line without Ant, try:</echo>
    1.28 +        <property name="build.classes.dir.resolved" location="${build.classes.dir}"/>
    1.29 +        <property name="dist.jar.resolved" location="${dist.jar}"/>
    1.30 +        <pathconvert property="run.classpath.with.dist.jar">
    1.31 +            <path path="${run.classpath}"/>
    1.32 +            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
    1.33 +        </pathconvert>
    1.34 +        <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
    1.35 +    </target>
    1.36 +    <target name="-do-jar-with-libraries" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available">
    1.37 +        <property name="build.classes.dir.resolved" location="${build.classes.dir}"/>
    1.38 +        <pathconvert property="run.classpath.without.build.classes.dir">
    1.39 +            <path path="${run.classpath}"/>
    1.40 +            <map from="${build.classes.dir.resolved}" to=""/>
    1.41 +        </pathconvert>
    1.42 +        <pathconvert property="jar.classpath" pathsep=" ">
    1.43 +            <path path="${run.classpath.without.build.classes.dir}"/>
    1.44 +            <chainedmapper>
    1.45 +                <flattenmapper/>
    1.46 +                <globmapper from="*" to="lib/*"/>
    1.47 +            </chainedmapper>
    1.48 +        </pathconvert>
    1.49 +        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" name="copylibs" classpath="${libs.CopyLibs.classpath}"/>
    1.50 +        <copylibs manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}" jarfile="${dist.jar}" compress="${jar.compress}">
    1.51 +            <fileset dir="${build.classes.dir}"/>
    1.52 +            <manifest>
    1.53 +                <attribute name="Main-Class" value="${main.class}"/>
    1.54 +                <attribute name="Class-Path" value="${jar.classpath}"/>
    1.55 +            </manifest>
    1.56 +        </copylibs>
    1.57 +        <echo>To run this application from the command line without Ant, try:</echo>
    1.58 +        <property name="dist.jar.resolved" location="${dist.jar}"/>
    1.59 +        <echo>java -jar "${dist.jar.resolved}"</echo>
    1.60      </target>
    1.61      <target name="-post-jar">
    1.62          <!-- Empty placeholder for easier customization. -->
    1.63          <!-- You can override this target in the ../build.xml file. -->
    1.64      </target>
    1.65 -    <target name="jar" depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-post-jar" description="Build JAR."/>
    1.66 +    <target name="jar" depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR."/>
    1.67      <!--
    1.68      =================
    1.69      EXECUTION SECTION
    1.70 @@ -397,6 +436,9 @@
    1.71                  <patternset includes="${javac.includes}"/>
    1.72              </customize>
    1.73          </j2seproject3:javac>
    1.74 +        <copy todir="${build.test.classes.dir}">
    1.75 +            <fileset dir="${test.src.dir}" excludes="**/*.java"/>
    1.76 +        </copy>
    1.77      </target>
    1.78      <target name="-post-compile-test-single">
    1.79          <!-- Empty placeholder for easier customization. -->
     2.1 --- a/workspaceswitcher/ChennaiDemoApplication/nbproject/genfiles.properties	Wed Feb 08 09:46:44 2006 +0000
     2.2 +++ b/workspaceswitcher/ChennaiDemoApplication/nbproject/genfiles.properties	Thu Feb 09 04:18:19 2006 +0000
     2.3 @@ -4,5 +4,5 @@
     2.4  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     2.5  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
     2.6  nbproject/build-impl.xml.data.CRC32=6a8f5110
     2.7 -nbproject/build-impl.xml.script.CRC32=55c1b761
     2.8 -nbproject/build-impl.xml.stylesheet.CRC32=b4de0fc8
     2.9 +nbproject/build-impl.xml.script.CRC32=904d0606
    2.10 +nbproject/build-impl.xml.stylesheet.CRC32=5d04000d
     3.1 --- a/workspaceswitcher/ChennaiDemoApplication/src/chennaidemoapplication/Main.java	Wed Feb 08 09:46:44 2006 +0000
     3.2 +++ b/workspaceswitcher/ChennaiDemoApplication/src/chennaidemoapplication/Main.java	Thu Feb 09 04:18:19 2006 +0000
     3.3 @@ -23,7 +23,7 @@
     3.4     * @param args the command line arguments
     3.5     */
     3.6    public static void main(String[] args) {
     3.7 -    // TODO code application logic here
     3.8 +    System.out.println("Hello world");
     3.9      AJFrame.main(args);
    3.10    }
    3.11    
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/workspaceswitcher/ChennaiDemoApplication/src/chennaidemoapplication/NewClass.java	Thu Feb 09 04:18:19 2006 +0000
     4.3 @@ -0,0 +1,22 @@
     4.4 +/*
     4.5 + * NewClass.java
     4.6 + *
     4.7 + * Created on February 8, 2006, 8:18 PM
     4.8 + *
     4.9 + * To change this template, choose Tools | Template Manager
    4.10 + * and open the template in the editor.
    4.11 + */
    4.12 +
    4.13 +package chennaidemoapplication;
    4.14 +
    4.15 +/**
    4.16 + *
    4.17 + * @author Timothy Boudreau
    4.18 + */
    4.19 +public class NewClass {
    4.20 +    
    4.21 +    /** Creates a new instance of NewClass */
    4.22 +    public NewClass() {
    4.23 +    }
    4.24 +    
    4.25 +}