all_files_in_order

git-svn-id: svn://10.0.0.236/trunk@235473 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2007-09-10 21:52:36 +00:00
parent ead513cc43
commit cc5d26d683
9 changed files with 136 additions and 84 deletions

View File

@@ -139,3 +139,7 @@ the prefs.js, and try again?
Ed
also remove pluginreg.dat
in C:\Projects\chaff\pluglet-1-1-a1\
find netbeans -name private -prune -o -type f -exec cp {} "/cygdrive/c/Projects/mozilla/MOZILLA_NIH/FIREFOX_2_0_0_3_RELEASE/mozilla/java/plugins/dist/{}" ;

View File

@@ -267,11 +267,13 @@
</target>
<target name="copy.binaries" depends="prepare">
<copy todir="${dist.home}/bin/${platform}/bin"
<copy todir="${dist.home}/bin/${platform}/bin/components"
file="${objdir}/java/plugins/src/${so.prefix}pluglet.${so.extension}" />
<copy todir="${dist.home}/bin/${platform}/bin/components"
file="${objdir}/java/plugins/src/_xpidlgen/pluglet.xpt" />
<copy todir="${dist.home}/bin/${platform}/bin"
file="${objdir}/java/plugins/jni/${so.prefix}plugletjni.${so.extension}" />
<copy todir="${dist.home}/bin/${platform}/bin"
<copy todir="${dist.home}/bin/${platform}/bin/plugins"
file="${objdir}/java/plugins/mozilla/${so.prefix}nppluglet.${so.extension}" />
</target>
@@ -280,17 +282,29 @@
<!-- Populate the netbeans Source Packages -->
<copy todir="${dist.home}/test/manual/src/main/java">
<fileset dir="${basedir}/dummy-main/src/main/java">
<include name="**/*.java" />
</fileset>
</copy>
<copy todir="${dist.home}/samples/jmfplayer">
<fileset dir="${source.home}/examples/jmfplayer">
</fileset>
</copy>
<copy todir="${dist.home}/samples/">
<fileset dir="${source.home}/examples">
<include name="index.html" />
</fileset>
</copy>
</target>
<target name="copy.core.src" depends="prepare">
<!-- Populate the netbeans Source Package with the core
webclient sources -->
pluglet sources -->
<copy todir="${dist.home}/src/main/java" includeEmptyDirs="false">
<fileset dir="${source.home}/classes">

View File

@@ -0,0 +1,29 @@
/*
* Pluglet.java
*
* Created on March 3, 2007, 2:58 PM
*
* To change this template, choose Tools | Template Manager
* and open the template in the editor.
*/
package pluglet;
/**
*
* @author edburns
*/
public class Pluglet {
/** Creates a new instance of Pluglet */
public Pluglet() {
}
/**
* @param args the command line arguments
*/
public static void main(String[] args) {
// TODO code application logic here
}
}

View File

@@ -70,7 +70,7 @@
<property environment="myenv" />
<target name="-pre-init">
<condition property="so.prefix" value="">
<and>
<os family="windows" />
@@ -88,6 +88,12 @@
<os family="windows" />
</and>
</condition>
<condition property="so.extension" value="dylib">
<and>
<os name="Mac OS X" />
</and>
</condition>
<condition property="so.extension" value="so">
<and>
@@ -101,15 +107,36 @@
</and>
</condition>
<condition property="platform" value="macosx">
<and>
<os name="Mac OS X" />
</and>
</condition>
<condition property="platform" value="unix">
<and>
<os family="unix" />
</and>
</condition>
<condition property="platform" value="mac">
<condition property="build.unix.classes">
<and>
<os family="mac" />
<isset property="platform" />
<equals arg1="${platform}" arg2="unix" />
</and>
</condition>
<condition property="build.win32.classes">
<and>
<isset property="platform" />
<equals arg1="${platform}" arg2="win32" />
</and>
</condition>
<condition property="build.mac.classes">
<and>
<isset property="platform" />
<equals arg1="${platform}" arg2="macosx" />
</and>
</condition>
@@ -136,7 +163,7 @@
<os family="unix" />
</and>
</condition>
<property file="pluglet.properties" />
<condition property="preconditions.met">
@@ -147,7 +174,7 @@
</condition>
<uptodate property="do.copy.binaries">
<srcfiles dir="${basedir}/../bin" includes="**/*.*" />
<srcfiles dir="${basedir}/../bin/${platform}/bin" includes="**/*.*" />
<mapper type="identity" to="${browser.bin.dir}/**/*.*" />
</uptodate>
@@ -176,7 +203,7 @@ ${jdkhome.nospaces}.
<target name="copy.binaries" if="do.copy.binaries">
<copy todir="${browser.bin.dir}">
<fileset dir="${basedir}/../bin" />
<fileset dir="${basedir}/../bin/${platform}/bin" />
</copy>
</target>
@@ -191,15 +218,15 @@ ${jdkhome.nospaces}.
<exec os="SunOS" dir="${browser.bin.dir}" executable="firefox"
failonerror="yes">
<arg value="file://${basedir}/../examples/index.html" />
<arg value="file://${basedir}/../samples/index.html" />
</exec>
<exec os="Linux" dir="${browser.bin.dir}" executable="firefox"
failonerror="yes">
<arg value="file://${basedir}/../examples/index.html" />
<arg value="file://${basedir}/../samples/index.html" />
</exec>
<exec os="Mac OS X" dir="${browser.bin.dir}" executable="firefox"
failonerror="yes">
<arg value="file://${basedir}/../examples/index.html" />
<arg value="file://${basedir}/../samples/index.html" />
</exec>
<exec os="Windows 2000" dir="${browser.bin.dir}"
executable="${browser.bin.dir}/firefox.exe"
@@ -222,18 +249,19 @@ ${jdkhome.nospaces}.
<env key="NSPR_LOG_FILE"
value="${basedir}/${build.dir}/logfile.txt"
/>
<arg value="file://${basedir}/../examples/index.html" />
<arg value="file://${basedir}/../samples/index.html" />
</exec>
<exec os="Windows XP" dir="${browser.bin.dir}" executable="firefox"
failonerror="yes">
<arg value="file://${basedir}/../examples/index.html" />
<arg value="file://${basedir}/../samples/index.html" />
</exec>
</target>
<target name="-post-compile">
<!-- SimplePluglet -->
<!--
<jar jarfile="${build.dir}/SimplePluglet.jar">
<manifest>
<attribute name="MIMEDescription" value="application/x-simple-pluglet"/>
@@ -250,6 +278,8 @@ ${jdkhome.nospaces}.
</delete>
<copy todir="${browser.bin.dir}/plugins"
file="${build.dir}/SimplePluglet.jar" />
-->
<!-- JMFPlayer -->
<jar jarfile="${build.dir}/jmfplayer.jar">
@@ -274,4 +304,15 @@ ${jdkhome.nospaces}.
<target name="-do-jar-with-manifest" />
<target name="-do-jar-without-manifest" />
<target name="compile.core.src" depends="-init-check">
<antcall target="compile">
<param name="src.dir" value="${basedir}/../src/main/java" />
</antcall>
<move failonerror="false" file="${file.reference.pluglet-1_1_a1.jar}"
tofile="${basedir}/../lib/outofdate-pluglet_jar" />
</target>
</project>

View File

@@ -44,36 +44,6 @@ is divided into following sections:
<property file="nbproject/project.properties"/>
</target>
<target name="-do-init" depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property">
<j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/>
<j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/>
<j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/>
<j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/>
<condition property="platform.javac" value="${platform.home}/bin/javac">
<equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/>
</condition>
<property name="platform.javac" value="${platform.javac.tmp}"/>
<j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/>
<condition property="platform.java" value="${platform.home}/bin/java">
<equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/>
</condition>
<property name="platform.java" value="${platform.java.tmp}"/>
<j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/>
<condition property="platform.javadoc" value="${platform.home}/bin/javadoc">
<equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/>
</condition>
<property name="platform.javadoc" value="${platform.javadoc.tmp}"/>
<condition property="platform.invalid" value="true">
<or>
<contains string="${platform.javac}" substring="$${platforms."/>
<contains string="${platform.java}" substring="$${platforms."/>
<contains string="${platform.javadoc}" substring="$${platforms."/>
</or>
</condition>
<fail unless="platform.home">Must set platform.home</fail>
<fail unless="platform.bootcp">Must set platform.bootcp</fail>
<fail unless="platform.java">Must set platform.java</fail>
<fail unless="platform.javac">Must set platform.javac</fail>
<fail if="platform.invalid">Platform is not correctly set up</fail>
<available file="${manifest.file}" property="manifest.available"/>
<condition property="manifest.available+main.class">
<and>
@@ -96,7 +66,7 @@ is divided into following sections:
<condition property="have.sources">
<or>
<available file="${src.java.dir}"/>
<available file="${src.java2.dir}"/>
<available file="${src.java1.dir}"/>
</or>
</condition>
<condition property="netbeans.home+have.tests">
@@ -125,7 +95,7 @@ is divided into following sections:
</target>
<target name="-init-check" depends="-pre-init,-init-private,-init-user,-init-project,-do-init">
<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.java1.dir">Must set src.java1.dir</fail>
<fail unless="build.dir">Must set build.dir</fail>
<fail unless="dist.dir">Must set dist.dir</fail>
<fail unless="build.classes.dir">Must set build.classes.dir</fail>
@@ -146,13 +116,13 @@ is divided into following sections:
</target>
<target name="-init-macrodef-javac">
<macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
<attribute name="srcdir" default="${src.java.dir}:${src.java2.dir}"/>
<attribute name="srcdir" default="${src.java.dir}:${src.java1.dir}"/>
<attribute name="destdir" default="${build.classes.dir}"/>
<attribute name="classpath" default="${javac.classpath}"/>
<attribute name="debug" default="${javac.debug}"/>
<element name="customize" optional="true"/>
<sequential>
<javac srcdir="@{srcdir}" destdir="@{destdir}" debug="@{debug}" deprecation="${javac.deprecation}" source="${javac.source}" target="${javac.target}" fork="yes" executable="${platform.javac}" tempdir="${java.io.tmpdir}" includeantruntime="false">
<javac srcdir="@{srcdir}" destdir="@{destdir}" debug="@{debug}" deprecation="${javac.deprecation}" source="${javac.source}" target="${javac.target}" includeantruntime="false">
<classpath>
<path path="@{classpath}"/>
</classpath>
@@ -166,7 +136,7 @@ is divided into following sections:
<macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
<attribute name="includes" default="**/*Test.java"/>
<sequential>
<junit showoutput="true" fork="true" dir="${basedir}" failureproperty="tests.failed" errorproperty="tests.failed" jvm="${platform.java}">
<junit showoutput="true" fork="true" dir="${basedir}" failureproperty="tests.failed" errorproperty="tests.failed">
<batchtest todir="${build.test.results.dir}"/>
<classpath>
<path path="${run.test.classpath}"/>
@@ -192,9 +162,6 @@ is divided into following sections:
<classpath>
<path path="@{classpath}"/>
</classpath>
<bootclasspath>
<path path="${platform.bootcp}"/>
</bootclasspath>
</nbjpdastart>
</sequential>
</macrodef>
@@ -213,7 +180,7 @@ is divided into following sections:
<attribute name="classpath" default="${debug.classpath}"/>
<element name="customize" optional="true"/>
<sequential>
<java fork="true" classname="@{classname}" dir="${work.dir}" jvm="${platform.java}">
<java fork="true" classname="@{classname}" dir="${work.dir}">
<jvmarg value="-Xdebug"/>
<jvmarg value="-Xnoagent"/>
<jvmarg value="-Djava.compiler=none"/>
@@ -236,7 +203,7 @@ is divided into following sections:
<attribute name="classname" default="${main.class}"/>
<element name="customize" optional="true"/>
<sequential>
<java fork="true" classname="@{classname}" dir="${work.dir}" jvm="${platform.java}">
<java fork="true" classname="@{classname}" dir="${work.dir}">
<jvmarg line="${run.jvmargs}"/>
<classpath>
<path path="${run.classpath}"/>
@@ -275,7 +242,7 @@ is divided into following sections:
<j2seproject3:javac/>
<copy todir="${build.classes.dir}">
<fileset dir="${src.java.dir}" excludes="${build.classes.excludes}"/>
<fileset dir="${src.java2.dir}" excludes="${build.classes.excludes}"/>
<fileset dir="${src.java1.dir}" excludes="${build.classes.excludes}"/>
</copy>
</target>
<target name="-post-compile">
@@ -332,7 +299,7 @@ is divided into following sections:
<path path="${run.classpath}"/>
<map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
</pathconvert>
<echo>${platform.java} -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
<echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
</target>
<target name="-do-jar-with-libraries" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available">
<property name="build.classes.dir.resolved" location="${build.classes.dir}"/>
@@ -357,7 +324,7 @@ is divided into following sections:
</copylibs>
<echo>To run this application from the command line without Ant, try:</echo>
<property name="dist.jar.resolved" location="${dist.jar}"/>
<echo>${platform.java} -jar "${dist.jar.resolved}"</echo>
<echo>java -jar "${dist.jar.resolved}"</echo>
</target>
<target name="-post-jar">
<!-- Empty placeholder for easier customization. -->
@@ -420,18 +387,16 @@ is divided into following sections:
-->
<target name="-javadoc-build" depends="init">
<mkdir dir="${dist.javadoc.dir}"/>
<javadoc destdir="${dist.javadoc.dir}" source="${javac.source}" notree="${javadoc.notree}" use="${javadoc.use}" nonavbar="${javadoc.nonavbar}" noindex="${javadoc.noindex}" splitindex="${javadoc.splitindex}" author="${javadoc.author}" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}" private="${javadoc.private}" additionalparam="${javadoc.additionalparam}" failonerror="true" useexternalfile="true" executable="${platform.javadoc}">
<javadoc destdir="${dist.javadoc.dir}" source="${javac.source}" notree="${javadoc.notree}" use="${javadoc.use}" nonavbar="${javadoc.nonavbar}" noindex="${javadoc.noindex}" splitindex="${javadoc.splitindex}" author="${javadoc.author}" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}" private="${javadoc.private}" additionalparam="${javadoc.additionalparam}" failonerror="true" useexternalfile="true">
<classpath>
<path path="${javac.classpath}"/>
</classpath>
<sourcepath>
<pathelement location="${src.java.dir}"/>
<pathelement location="${src.java2.dir}"/>
<pathelement location="${src.java1.dir}"/>
</sourcepath>
<packageset dir="${src.java.dir}" includes="*/**"/>
<packageset dir="${src.java2.dir}" includes="*/**"/>
<fileset dir="${src.java.dir}" includes="*.java"/>
<fileset dir="${src.java2.dir}" includes="*.java"/>
</javadoc>
</target>
<target name="-javadoc-browse" if="netbeans.home" unless="no.javadoc.preview" depends="init,-javadoc-build">

View File

@@ -1,8 +1,8 @@
build.xml.data.CRC32=8df37aff
build.xml.script.CRC32=4cc13411
build.xml.data.CRC32=ad467c72
build.xml.script.CRC32=2166795e
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.
# 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=f51cc540
nbproject/build-impl.xml.script.CRC32=d0159abd
nbproject/build-impl.xml.data.CRC32=67c232e0
nbproject/build-impl.xml.script.CRC32=91a68d9b
nbproject/build-impl.xml.stylesheet.CRC32=65d7ca21

View File

@@ -14,19 +14,16 @@ debug.test.classpath=\
${run.test.classpath}
# This directory is removed when the project is cleaned:
dist.dir=dist
dist.jar=${dist.dir}/pluglet.jar
dist.jar=${dist.dir}/netbeans.jar
dist.javadoc.dir=${dist.dir}/javadoc
file.reference.examples-EmptyMainClass=../examples/EmptyMainClass
file.reference.main-java=../examples/simple/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-3=../samples/jmfplayer/src/main/java
file.reference.main-java-4=../src/main/java
file.reference.main-java=../test/manual/src/main/java
file.reference.main-java-1=../samples/jmfplayer/src/main/java
file.reference.main-java-2=../src/main/java
file.reference.pluglet-1_1_a1.jar=../lib/pluglet-1_1_a1.jar
jar.compress=false
javac.classpath=\
${libs.JMF.classpath}:\
${file.reference.pluglet-1_1_a1.jar}
${file.reference.pluglet-1_1_a1.jar}:\
${libs.JMF.classpath}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
@@ -47,10 +44,11 @@ javadoc.splitindex=true
javadoc.use=true
javadoc.version=false
javadoc.windowtitle=
main.class=EmptyMainClass
manifest.file=manifest.mf
# Property libs.JMF.classpath is set here just to make sharing of project simpler.
# The library definition has always preference over this property.
libs.JMF.classpath=../../../../JMF2.1.1e/lib/jmf.jar
meta.inf.dir=${src.dir}/META-INF
platform.active=Java_HotSpot_TM__Client_VM_1.5.0_12-b04
platform.active=default_platform
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
@@ -61,5 +59,6 @@ run.jvmargs=
run.test.classpath=\
${javac.test.classpath}:\
${build.test.classes.dir}
src.java.dir=${file.reference.main-java-3}
src.java2.dir=${file.reference.main-java-4}
src.dir=${file.reference.main-java}
src.java.dir=${file.reference.main-java}
src.java1.dir=${file.reference.main-java-1}

View File

@@ -5,10 +5,10 @@
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>pluglet</name>
<minimum-ant-version>1.6.5</minimum-ant-version>
<explicit-platform explicit-source-supported="true"/>
<source-roots>
<root id="src.java.dir" name="jmfplayer sample"/>
<root id="src.java2.dir" name="Core Sources"/>
<root id="src.java3.dir" name="dummy-main"/>
<root id="src.java2.dir" name="jmfplayer sample"/>
<root id="src.java.dir" name="Core Sources"/>
</source-roots>
<test-roots/>
</data>

View File

@@ -2,6 +2,6 @@ bin.artifacts.pattern=${so.prefix}plugletjni.${so.extension},components/${so.pre
#debug.jvm.args=-Xdebug -Xrunjdwp:transport=dt_shmem,address=jdbconn,server=y,suspend=y
#Make this point to the bin directory of your firefox installation
browser.bin.dir=C:\Projects\mozilla\MOZILLA_NIH\FIREFOX_2_0_0_3_RELEASE\mozilla\firefox-win32_d.obj\dist\bin
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
jdkhome.nospaces=C:\\PROGRA~1\\Java\\jdk1.6.0_01
jdkhome.nospaces=C:\\PROGRA~1\\Java\\jdk1.5.0_12