This commit is contained in:
edburns%acm.org 2007-09-10 20:02:32 +00:00
Родитель a65510b0db
Коммит a495880392
5 изменённых файлов: 16 добавлений и 21 удалений

Просмотреть файл

@ -95,7 +95,6 @@ is divided into following sections:
</condition> </condition>
<condition property="have.sources"> <condition property="have.sources">
<or> <or>
<available file="${src.EmptyMainClass.dir}"/>
<available file="${src.java.dir}"/> <available file="${src.java.dir}"/>
<available file="${src.java2.dir}"/> <available file="${src.java2.dir}"/>
</or> </or>
@ -125,7 +124,6 @@ is divided into following sections:
<!-- You can override this target in the ../build.xml file. --> <!-- You can override this target in the ../build.xml file. -->
</target> </target>
<target name="-init-check" depends="-pre-init,-init-private,-init-user,-init-project,-do-init"> <target name="-init-check" depends="-pre-init,-init-private,-init-user,-init-project,-do-init">
<fail unless="src.EmptyMainClass.dir">Must set src.EmptyMainClass.dir</fail>
<fail unless="src.java.dir">Must set src.java.dir</fail> <fail unless="src.java.dir">Must set src.java.dir</fail>
<fail unless="src.java2.dir">Must set src.java2.dir</fail> <fail unless="src.java2.dir">Must set src.java2.dir</fail>
<fail unless="build.dir">Must set build.dir</fail> <fail unless="build.dir">Must set build.dir</fail>
@ -148,7 +146,7 @@ is divided into following sections:
</target> </target>
<target name="-init-macrodef-javac"> <target name="-init-macrodef-javac">
<macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3"> <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
<attribute name="srcdir" default="${src.EmptyMainClass.dir}:${src.java.dir}:${src.java2.dir}"/> <attribute name="srcdir" default="${src.java.dir}:${src.java2.dir}"/>
<attribute name="destdir" default="${build.classes.dir}"/> <attribute name="destdir" default="${build.classes.dir}"/>
<attribute name="classpath" default="${javac.classpath}"/> <attribute name="classpath" default="${javac.classpath}"/>
<attribute name="debug" default="${javac.debug}"/> <attribute name="debug" default="${javac.debug}"/>
@ -276,7 +274,6 @@ is divided into following sections:
<target name="-do-compile" depends="init,deps-jar,-pre-pre-compile,-pre-compile" if="have.sources"> <target name="-do-compile" depends="init,deps-jar,-pre-pre-compile,-pre-compile" if="have.sources">
<j2seproject3:javac/> <j2seproject3:javac/>
<copy todir="${build.classes.dir}"> <copy todir="${build.classes.dir}">
<fileset dir="${src.EmptyMainClass.dir}" excludes="${build.classes.excludes}"/>
<fileset dir="${src.java.dir}" excludes="${build.classes.excludes}"/> <fileset dir="${src.java.dir}" excludes="${build.classes.excludes}"/>
<fileset dir="${src.java2.dir}" excludes="${build.classes.excludes}"/> <fileset dir="${src.java2.dir}" excludes="${build.classes.excludes}"/>
</copy> </copy>
@ -428,14 +425,11 @@ is divided into following sections:
<path path="${javac.classpath}"/> <path path="${javac.classpath}"/>
</classpath> </classpath>
<sourcepath> <sourcepath>
<pathelement location="${src.EmptyMainClass.dir}"/>
<pathelement location="${src.java.dir}"/> <pathelement location="${src.java.dir}"/>
<pathelement location="${src.java2.dir}"/> <pathelement location="${src.java2.dir}"/>
</sourcepath> </sourcepath>
<packageset dir="${src.EmptyMainClass.dir}" includes="*/**"/>
<packageset dir="${src.java.dir}" includes="*/**"/> <packageset dir="${src.java.dir}" includes="*/**"/>
<packageset dir="${src.java2.dir}" includes="*/**"/> <packageset dir="${src.java2.dir}" includes="*/**"/>
<fileset dir="${src.EmptyMainClass.dir}" includes="*.java"/>
<fileset dir="${src.java.dir}" includes="*.java"/> <fileset dir="${src.java.dir}" includes="*.java"/>
<fileset dir="${src.java2.dir}" includes="*.java"/> <fileset dir="${src.java2.dir}" includes="*.java"/>
</javadoc> </javadoc>

Просмотреть файл

@ -3,6 +3,6 @@ build.xml.script.CRC32=4cc13411
build.xml.stylesheet.CRC32=240b97a2 build.xml.stylesheet.CRC32=240b97a2
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=c09404ce nbproject/build-impl.xml.data.CRC32=f51cc540
nbproject/build-impl.xml.script.CRC32=d63e7ed7 nbproject/build-impl.xml.script.CRC32=d0159abd
nbproject/build-impl.xml.stylesheet.CRC32=20b9345e nbproject/build-impl.xml.stylesheet.CRC32=65d7ca21

Просмотреть файл

@ -20,10 +20,13 @@ file.reference.examples-EmptyMainClass=../examples/EmptyMainClass
file.reference.main-java=../examples/simple/src/main/java file.reference.main-java=../examples/simple/src/main/java
file.reference.main-java-1=../examples/jmf-player/src/main/java file.reference.main-java-1=../examples/jmf-player/src/main/java
file.reference.main-java-2=../examples/jmfplayer/src/main/java file.reference.main-java-2=../examples/jmfplayer/src/main/java
file.reference.main-java-3=../samples/jmfplayer/src/main/java
file.reference.main-java-4=../src/main/java
file.reference.pluglet-1_1_a1.jar=../lib/pluglet-1_1_a1.jar
jar.compress=false jar.compress=false
javac.classpath=\ javac.classpath=\
${libs.JMF.classpath}:\ ${libs.JMF.classpath}:\
${file.reference.pluglet-1_1_a2.jar} ${file.reference.pluglet-1_1_a1.jar}
# Space-separated list of extra javac options # Space-separated list of extra javac options
javac.compilerargs= javac.compilerargs=
javac.deprecation=false javac.deprecation=false
@ -47,7 +50,7 @@ javadoc.windowtitle=
main.class=EmptyMainClass main.class=EmptyMainClass
manifest.file=manifest.mf manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF meta.inf.dir=${src.dir}/META-INF
platform.active=Java_HotSpot_TM__Client_VM_1.5.0_11-b03 platform.active=Java_HotSpot_TM__Client_VM_1.5.0_12-b04
run.classpath=\ run.classpath=\
${javac.classpath}:\ ${javac.classpath}:\
${build.classes.dir} ${build.classes.dir}
@ -58,6 +61,5 @@ run.jvmargs=
run.test.classpath=\ run.test.classpath=\
${javac.test.classpath}:\ ${javac.test.classpath}:\
${build.test.classes.dir} ${build.test.classes.dir}
src.EmptyMainClass.dir=${file.reference.examples-EmptyMainClass} src.java.dir=${file.reference.main-java-3}
src.java.dir=${file.reference.main-java} src.java2.dir=${file.reference.main-java-4}
src.java2.dir=${file.reference.main-java-2}

Просмотреть файл

@ -7,9 +7,8 @@
<minimum-ant-version>1.6.5</minimum-ant-version> <minimum-ant-version>1.6.5</minimum-ant-version>
<explicit-platform explicit-source-supported="true"/> <explicit-platform explicit-source-supported="true"/>
<source-roots> <source-roots>
<root id="src.EmptyMainClass.dir" name="EmptyMainClass"/> <root id="src.java.dir" name="jmfplayer sample"/>
<root id="src.java.dir" name="SimplePluglet"/> <root id="src.java2.dir" name="Core Sources"/>
<root id="src.java2.dir" name="jmfplayer"/>
</source-roots> </source-roots>
<test-roots/> <test-roots/>
</data> </data>

Просмотреть файл

@ -1,7 +1,7 @@
bin.artifacts.pattern=${so.prefix}plugletjni.${so.extension},components/${so.prefix}pluglet.${so.extension},components/pluglet.xpt,plugins/np${so.prefix}pluglet.${so.extension},plugins/SimplePluglet.jar,plugins/jmfplayer.jar bin.artifacts.pattern=${so.prefix}plugletjni.${so.extension},components/${so.prefix}pluglet.${so.extension},components/pluglet.xpt,plugins/np${so.prefix}pluglet.${so.extension},plugins/SimplePluglet.jar,plugins/jmfplayer.jar
#debug.jvm.args=-Xdebug -Xrunjdwp:transport=dt_shmem,address=jdbconn,server=y,suspend=y #debug.jvm.args=-Xdebug -Xrunjdwp:transport=dt_shmem,address=jdbconn,server=y,suspend=y
#Make this point to the bin directory of your XULRUNNER installation #Make this point to the bin directory of your firefox installation
browser.bin.dir=C:\\Projects\\chaff\\pluglet-1-1-alpha-1\\ff1509 browser.bin.dir=C:\Projects\mozilla\MOZILLA_NIH\FIREFOX_2_0_0_3_RELEASE\mozilla\firefox-win32_d.obj\dist\bin
#Make this point at your JDKHOME without spaces #Make this point at your JDKHOME without spaces
jdkhome.nospaces=C:\\PROGRA~1\\Java\\jdk1.6.0 jdkhome.nospaces=C:\\PROGRA~1\\Java\\jdk1.6.0_01