[Jnode-svn-commits] SF.net SVN: jnode:[5673] branches/jikesRVM

[<cr...@us...>]

Revision: 5673
          http://jnode.svn.sourceforge.net/jnode/?rev=5673&view=rev
Author:   crawley
Date:     2009-09-09 16:32:22 +0000 (Wed, 09 Sep 2009)

Log Message:
-----------
Merge changes from 'trunk' at r5663 (sound)

Added Paths:
-----------
    branches/jikesRVM/sound/
    branches/jikesRVM/sound/.checkstyle
    branches/jikesRVM/sound/.classpath
    branches/jikesRVM/sound/.cvsignore
    branches/jikesRVM/sound/.project
    branches/jikesRVM/sound/.settings/
    branches/jikesRVM/sound/build.xml
    branches/jikesRVM/sound/descriptors/
    branches/jikesRVM/sound/lib/
    branches/jikesRVM/sound/sound.iml
    branches/jikesRVM/sound/src/
    branches/jikesRVM/sound/src/driver/
    branches/jikesRVM/sound/src/sound/
    branches/jikesRVM/sound/src/test/

Removed Paths:
-------------
    branches/jikesRVM/sound/.checkstyle
    branches/jikesRVM/sound/.classpath
    branches/jikesRVM/sound/.cvsignore
    branches/jikesRVM/sound/.project
    branches/jikesRVM/sound/.settings/
    branches/jikesRVM/sound/build.xml
    branches/jikesRVM/sound/descriptors/
    branches/jikesRVM/sound/lib/
    branches/jikesRVM/sound/sound.iml
    branches/jikesRVM/sound/src/
    branches/jikesRVM/sound/src/driver/
    branches/jikesRVM/sound/src/sound/
    branches/jikesRVM/sound/src/test/


Property changes on: branches/jikesRVM/sound
___________________________________________________________________
Added: svn:ignore
   + build


Deleted: branches/jikesRVM/sound/.checkstyle
===================================================================
--- trunk/sound/.checkstyle	2009-08-26 11:52:35 UTC (rev 5663)
+++ branches/jikesRVM/sound/.checkstyle	2009-09-09 16:32:22 UTC (rev 5673)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true">
-    <fileset name="tous" enabled="true" check-config-name="Sun Checks" local="false">
-        <file-match-pattern match-pattern="." include-pattern="true"/>
-    </fileset>
-</fileset-config>

Copied: branches/jikesRVM/sound/.checkstyle (from rev 5663, trunk/sound/.checkstyle)
===================================================================
--- branches/jikesRVM/sound/.checkstyle	                        (rev 0)
+++ branches/jikesRVM/sound/.checkstyle	2009-09-09 16:32:22 UTC (rev 5673)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fileset-config file-format-version="1.2.0" simple-config="true">
+    <fileset name="tous" enabled="true" check-config-name="Sun Checks" local="false">
+        <file-match-pattern match-pattern="." include-pattern="true"/>
+    </fileset>
+</fileset-config>

Deleted: branches/jikesRVM/sound/.classpath
===================================================================
--- trunk/sound/.classpath	2009-08-26 11:52:35 UTC (rev 5663)
+++ branches/jikesRVM/sound/.classpath	2009-09-09 16:32:22 UTC (rev 5673)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="build/classes"/>
-</classpath>

Copied: branches/jikesRVM/sound/.classpath (from rev 5663, trunk/sound/.classpath)
===================================================================
--- branches/jikesRVM/sound/.classpath	                        (rev 0)
+++ branches/jikesRVM/sound/.classpath	2009-09-09 16:32:22 UTC (rev 5673)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="build/classes"/>
+</classpath>

Deleted: branches/jikesRVM/sound/.cvsignore
===================================================================
--- trunk/sound/.cvsignore	2009-08-26 11:52:35 UTC (rev 5663)
+++ branches/jikesRVM/sound/.cvsignore	2009-09-09 16:32:22 UTC (rev 5673)
@@ -1 +0,0 @@
-build 

Copied: branches/jikesRVM/sound/.cvsignore (from rev 5663, trunk/sound/.cvsignore)
===================================================================
--- branches/jikesRVM/sound/.cvsignore	                        (rev 0)
+++ branches/jikesRVM/sound/.cvsignore	2009-09-09 16:32:22 UTC (rev 5673)
@@ -0,0 +1 @@
+build 

Deleted: branches/jikesRVM/sound/.project
===================================================================
--- trunk/sound/.project	2009-08-26 11:52:35 UTC (rev 5663)
+++ branches/jikesRVM/sound/.project	2009-09-09 16:32:22 UTC (rev 5673)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>sound</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

Copied: branches/jikesRVM/sound/.project (from rev 5663, trunk/sound/.project)
===================================================================
--- branches/jikesRVM/sound/.project	                        (rev 0)
+++ branches/jikesRVM/sound/.project	2009-09-09 16:32:22 UTC (rev 5673)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>sound</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Deleted: branches/jikesRVM/sound/build.xml
===================================================================
--- trunk/sound/build.xml	2009-08-26 11:52:35 UTC (rev 5663)
+++ branches/jikesRVM/sound/build.xml	2009-09-09 16:32:22 UTC (rev 5673)
@@ -1,46 +0,0 @@
-<project name="JNode-Sound" default="all" basedir=".">
-
-  <typedef file="${basedir}/../all/lib/jnode.xml"/>
-				
-  <property name="my-build.dir"   value="${basedir}/build"/>
-  <property name="my-classes.dir" value="${my-build.dir}/classes"/>
-  <property name="my-src.dir"     value="${basedir}/src"/>
-  <property name="my.jar"         value="${jnode-sound.jar}"/>
-
-<!-- Subproject specific classpath -->
-  <path id="my-cp">
-    <pathelement location="${jnode-core.jar}"/>
-    <path refid="cp"/>
-  </path>
-
-<!-- Initialize all subproject directories -->
-  <target name="prepare">
-    <mkdir dir="${my-classes.dir}"/>
-  	<jnode.copy-descriptors/>
-    <copy todir="${my-classes.dir}">
-      <fileset dir="${my-src.dir}/sound" excludes="**/*.java,**/package.html"/>
-    </copy>
-  </target>
-
-<!-- Compile all subproject java files -->
-  <target name="compile" depends="prepare">
-    <jnode.compile>
-        <src path="${my-src.dir}/driver"/>
-        <src path="${my-src.dir}/sound"/>
-        <src path="${my-src.dir}/test"/>
-      <classpath refid="my-cp"/>
-    </jnode.compile>
-  </target>
-
-<!-- Assemble the jarfile -->
-  <target name="assemble" depends="compile"/>
-
-<!-- Do it all -->
-  <target name="all" depends="assemble"/>
-
-<!-- Clean everything -->
-  <target name="clean">
-  	<jnode.clean/>
-  </target>
-
-</project>

Copied: branches/jikesRVM/sound/build.xml (from rev 5663, trunk/sound/build.xml)
===================================================================
--- branches/jikesRVM/sound/build.xml	                        (rev 0)
+++ branches/jikesRVM/sound/build.xml	2009-09-09 16:32:22 UTC (rev 5673)
@@ -0,0 +1,46 @@
+<project name="JNode-Sound" default="all" basedir=".">
+
+  <typedef file="${basedir}/../all/lib/jnode.xml"/>
+				
+  <property name="my-build.dir"   value="${basedir}/build"/>
+  <property name="my-classes.dir" value="${my-build.dir}/classes"/>
+  <property name="my-src.dir"     value="${basedir}/src"/>
+  <property name="my.jar"         value="${jnode-sound.jar}"/>
+
+<!-- Subproject specific classpath -->
+  <path id="my-cp">
+    <pathelement location="${jnode-core.jar}"/>
+    <path refid="cp"/>
+  </path>
+
+<!-- Initialize all subproject directories -->
+  <target name="prepare">
+    <mkdir dir="${my-classes.dir}"/>
+  	<jnode.copy-descriptors/>
+    <copy todir="${my-classes.dir}">
+      <fileset dir="${my-src.dir}/sound" excludes="**/*.java,**/package.html"/>
+    </copy>
+  </target>
+
+<!-- Compile all subproject java files -->
+  <target name="compile" depends="prepare">
+    <jnode.compile>
+        <src path="${my-src.dir}/driver"/>
+        <src path="${my-src.dir}/sound"/>
+        <src path="${my-src.dir}/test"/>
+      <classpath refid="my-cp"/>
+    </jnode.compile>
+  </target>
+
+<!-- Assemble the jarfile -->
+  <target name="assemble" depends="compile"/>
+
+<!-- Do it all -->
+  <target name="all" depends="assemble"/>
+
+<!-- Clean everything -->
+  <target name="clean">
+  	<jnode.clean/>
+  </target>
+
+</project>

Deleted: branches/jikesRVM/sound/sound.iml
===================================================================
--- trunk/sound/sound.iml	2009-08-26 11:52:35 UTC (rev 5663)
+++ branches/jikesRVM/sound/sound.iml	2009-09-09 16:32:22 UTC (rev 5673)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/driver" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/sound" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-

Copied: branches/jikesRVM/sound/sound.iml (from rev 5663, trunk/sound/sound.iml)
===================================================================
--- branches/jikesRVM/sound/sound.iml	                        (rev 0)
+++ branches/jikesRVM/sound/sound.iml	2009-09-09 16:32:22 UTC (rev 5673)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/driver" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/sound" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.