Build hacking.

jdf · Jul 21, 2013 · 0936e48 · 0936e48
1 parent 8d226be
commit 0936e48
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 67 deletions.
diff --git a/build.xml b/build.xml
@@ -121,7 +121,6 @@
 			<fileset dir="src" />
 		</copy>
         <copy todir="web" file="${realDist}/library/${jarFile}"/>
-		<copy todir="../Patchy/web" file="${realDist}/library/${jarFile}"/>
 
 		<!-- create the java reference of the library -->
 		<mkdir dir="${reference}" />

diff --git a/test-export.jardesc b/test-export.jardesc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="MacRoman" standalone="no"?>
 <jardesc>
-    <jar path="/Users/feinberg/Documents/Processing/libraries/peasycam/library/peasycam.jar"/>
+    <jar path="PeasyCam/web/HelloPeasy.jar"/>
     <options buildIfNeeded="true" compress="true" descriptionLocation="/PeasyCam/test-export.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>
@@ -11,6 +11,10 @@
         </sealing>
     </manifest>
     <selectedElements exportClassFiles="true" exportJavaFiles="false" exportOutputFolder="false">
+        <file path="/processing-core/library/jogl-all.jar"/>
         <javaElement handleIdentifier="=PeasyCam/src"/>
+        <javaElement handleIdentifier="=processing-core/src"/>
+        <javaElement handleIdentifier="=PeasyCam/test"/>
+        <file path="/processing-core/library/gluegen-rt.jar"/>
     </selectedElements>
 </jardesc>
diff --git a/test/peasy/test/TestPeasy.java b/test/peasy/test/TestPeasy.java
@@ -5,7 +5,6 @@
 
 @SuppressWarnings("serial")
 public class TestPeasy extends PApplet {
-
 	PeasyCam cam;
 
 	public void setup() {
@@ -32,5 +31,5 @@ public void draw() {
 	@Override
 	public void keyPressed() {
 		cam.setActive(key == 'a');
-	}
+	}	
 }
diff --git a/web/HelloPeasy.jar b/web/HelloPeasy.jar
diff --git a/web/core.jar b/web/core.jar
diff --git a/web/index.html b/web/index.html
@@ -40,69 +40,6 @@ <h1>##yourLibrary## v##versionNumber##</h1>
 
             <div id="demos" class="clear">
                 <table><tr>
-                <td>
-                <!--[if !IE]> -->
-                    <object classid="java:HelloPeasy.class" 
-                    type="application/x-java-applet"
-                    archive="HelloPeasy.jar,peasycam.jar,core.jar"
-                    width="200" height="200"
-                    standby="Loading Processing software..." >
-
-                        <param name="archive" value="HelloPeasy.jar,peasycam.jar,core.jar" />
-
-                        <param name="mayscript" value="true" />
-                        <param name="scriptable" value="true" />
-
-                        <param name="image" value="loading.gif" />
-                        <param name="boxmessage" value="Loading Processing software..." />
-                        <param name="boxbgcolor" value="#FFFFFF" />
-
-                        <param name="test_string" value="outer" />
-                <!--<![endif]-->
-
-                    <object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93" 
-                            codebase="http://java.sun.com/update/1.5.0/jinstall-1_5_0_15-windows-i586.cab"
-                            width="200" height="200"
-                            standby="Loading Processing software..."  >
-
-                        <param name="code" value="HelloPeasy" />
-                        <param name="archive" value="HelloPeasy.jar,peasycam.jar,core.jar" />
-
-                        <param name="mayscript" value="true" />
-                        <param name="scriptable" value="true" />
-
-                        <param name="image" value="loading.gif" />
-                        <param name="boxmessage" value="Loading Processing software..." />
-                        <param name="boxbgcolor" value="#FFFFFF" />
-
-                        <param name="test_string" value="inner" />
-
-                        <p>
-                            <strong>
-                                This browser does not have a Java Plug-in.
-                                <br />
-                                <a href="http://java.sun.com/products/plugin/downloads/index.html" title="Download Java Plug-in">
-                                    Get the latest Java Plug-in here.
-                                </a>
-                            </strong>
-                        </p>
-
-                    </object>
-
-                <!--[if !IE]> -->
-                    </object>
-                <!--<![endif]-->
-                <p>
-                    left-drag to rotate
-                    <br/>
-                    mouse wheel, or right-drag up and down to zoom
-                    <br/>
-                    middle-drag (cmd-left-drag on mac) to pan
-                    <br/>
-                    double-click to reset
-                </p>
-
-            </td>
             <td>
 <pre>import peasy.*;