diff --git a/mozilla/java/plugins/README b/mozilla/java/plugins/README index f363cb22a22..d143f1e9554 100644 --- a/mozilla/java/plugins/README +++ b/mozilla/java/plugins/README @@ -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/{}" ; diff --git a/mozilla/java/plugins/dist/build.xml b/mozilla/java/plugins/dist/build.xml index bd125529f4f..b1d633d73b4 100644 --- a/mozilla/java/plugins/dist/build.xml +++ b/mozilla/java/plugins/dist/build.xml @@ -267,11 +267,13 @@ - + - @@ -280,17 +282,29 @@ + + + + + + + + + + + + + pluglet sources --> diff --git a/mozilla/java/plugins/dist/dummy-main/src/main/java/pluglet/Pluglet.java b/mozilla/java/plugins/dist/dummy-main/src/main/java/pluglet/Pluglet.java new file mode 100644 index 00000000000..254440893e6 --- /dev/null +++ b/mozilla/java/plugins/dist/dummy-main/src/main/java/pluglet/Pluglet.java @@ -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 + } + +} diff --git a/mozilla/java/plugins/dist/netbeans/build.xml b/mozilla/java/plugins/dist/netbeans/build.xml index f6070085ad2..33507996bfc 100644 --- a/mozilla/java/plugins/dist/netbeans/build.xml +++ b/mozilla/java/plugins/dist/netbeans/build.xml @@ -70,7 +70,7 @@ - + @@ -88,6 +88,12 @@ + + + + + + @@ -101,15 +107,36 @@ + + + + + + - + - + + + + + + + + + + + + + + + + @@ -136,7 +163,7 @@ - + @@ -147,7 +174,7 @@ - + @@ -176,7 +203,7 @@ ${jdkhome.nospaces}. - + @@ -191,15 +218,15 @@ ${jdkhome.nospaces}. - + - + - + - + - + + @@ -274,4 +304,15 @@ ${jdkhome.nospaces}. + + + + + + + + + + diff --git a/mozilla/java/plugins/dist/netbeans/nbproject/build-impl.xml b/mozilla/java/plugins/dist/netbeans/nbproject/build-impl.xml index 72ac158fc53..aa4e1bc94cd 100644 --- a/mozilla/java/plugins/dist/netbeans/nbproject/build-impl.xml +++ b/mozilla/java/plugins/dist/netbeans/nbproject/build-impl.xml @@ -44,36 +44,6 @@ is divided into following sections: - - - - - - - - - - - - - - - - - - - - - - - - - - Must set platform.home - Must set platform.bootcp - Must set platform.java - Must set platform.javac - Platform is not correctly set up @@ -96,7 +66,7 @@ is divided into following sections: - + @@ -125,7 +95,7 @@ is divided into following sections: Must set src.java.dir - Must set src.java2.dir + Must set src.java1.dir Must set build.dir Must set dist.dir Must set build.classes.dir @@ -146,13 +116,13 @@ is divided into following sections: - + - + @@ -166,7 +136,7 @@ is divided into following sections: - + @@ -192,9 +162,6 @@ is divided into following sections: - - - @@ -213,7 +180,7 @@ is divided into following sections: - + @@ -236,7 +203,7 @@ is divided into following sections: - + @@ -275,7 +242,7 @@ is divided into following sections: - + @@ -332,7 +299,7 @@ is divided into following sections: - ${platform.java} -cp "${run.classpath.with.dist.jar}" ${main.class} + java -cp "${run.classpath.with.dist.jar}" ${main.class} @@ -357,7 +324,7 @@ is divided into following sections: To run this application from the command line without Ant, try: - ${platform.java} -jar "${dist.jar.resolved}" + java -jar "${dist.jar.resolved}" @@ -420,18 +387,16 @@ is divided into following sections: --> - + - + - - diff --git a/mozilla/java/plugins/dist/netbeans/nbproject/genfiles.properties b/mozilla/java/plugins/dist/netbeans/nbproject/genfiles.properties index 870a263555a..f759bd20df0 100644 --- a/mozilla/java/plugins/dist/netbeans/nbproject/genfiles.properties +++ b/mozilla/java/plugins/dist/netbeans/nbproject/genfiles.properties @@ -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 diff --git a/mozilla/java/plugins/dist/netbeans/nbproject/project.properties b/mozilla/java/plugins/dist/netbeans/nbproject/project.properties index 73129e0a7ba..cb15885c8ef 100644 --- a/mozilla/java/plugins/dist/netbeans/nbproject/project.properties +++ b/mozilla/java/plugins/dist/netbeans/nbproject/project.properties @@ -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} diff --git a/mozilla/java/plugins/dist/netbeans/nbproject/project.xml b/mozilla/java/plugins/dist/netbeans/nbproject/project.xml index 81d4efb9487..e944e784b0b 100644 --- a/mozilla/java/plugins/dist/netbeans/nbproject/project.xml +++ b/mozilla/java/plugins/dist/netbeans/nbproject/project.xml @@ -5,10 +5,10 @@ pluglet 1.6.5 - - - + + + diff --git a/mozilla/java/plugins/dist/netbeans/pluglet.properties b/mozilla/java/plugins/dist/netbeans/pluglet.properties index 1c84859695f..06c9274c67b 100644 --- a/mozilla/java/plugins/dist/netbeans/pluglet.properties +++ b/mozilla/java/plugins/dist/netbeans/pluglet.properties @@ -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