Build fixes

- renaming com.google.synthesizer to com.levien.synthesizer in j2se
- checking in the junit jar
- adding .gitignores
master
Gregory Schlomoff 12 years ago
parent a073377398
commit e10d176f3c
  1. 3
      android/.gitignore
  2. 4
      core/.gitignore
  3. 4
      j2se/.externalToolBuilders/Proto Builder.launch
  4. 2
      j2se/.gitignore
  5. 2
      j2se/build.xml
  6. 10
      j2se/src/com/levien/synthesizer/j2se/Midi.java
  7. 14
      j2se/src/com/levien/synthesizer/j2se/MidiDeviceBinder.java
  8. 20
      j2se/src/com/levien/synthesizer/j2se/Perform.java
  9. 12
      j2se/src/com/levien/synthesizer/j2se/SynthesizerThread.java
  10. 2
      test/.gitignore
  11. BIN
      test/lib/junit-4.8.2.jar

@ -0,0 +1,3 @@
# Android NDK output files
obj/**
libs/**

4
core/.gitignore vendored

@ -0,0 +1,4 @@
build/**
core.jar
bin/protoc
lib/libprotobuf.jar

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/MusicSynthesizerJ2SE/core/com/google/synthesizer/core/model/composite/Presets.proto&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/MusicSynthesizerJ2SE/core/com/google/synthesizer/core/model/sample/Proto.proto&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/MusicSynthesizerJ2SE/core/com/google/synthesizer/core/music/Music.proto&quot; type=&quot;1&quot;/&gt;&#10;&lt;/resources&gt;}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/MusicSynthesizerJ2SE/core/com/levien/synthesizer/core/model/composite/Presets.proto&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/MusicSynthesizerJ2SE/core/com/levien/synthesizer/core/model/sample/Proto.proto&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/MusicSynthesizerJ2SE/core/com/levien/synthesizer/core/music/Music.proto&quot; type=&quot;1&quot;/&gt;&#10;&lt;/resources&gt;}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${project_loc}/../core/bin/protoc"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="--java_out=../core/gen src/com/google/synthesizer/core/model/composite/Presets.proto src/com/google/synthesizer/core/music/Music.proto"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="--java_out=../core/gen src/com/levien/synthesizer/core/model/composite/Presets.proto src/com/levien/synthesizer/core/music/Music.proto"/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${project_loc}/../core"/>
</launchConfiguration>

2
j2se/.gitignore vendored

@ -0,0 +1,2 @@
build/**
j2se.jar

@ -37,7 +37,7 @@ limitations under the License.
</javac>
<jar jarfile="j2se.jar" basedir="build">
<manifest>
<attribute name="Main-Class" value="com.google.synthesizer.j2se.Perform"/>
<attribute name="Main-Class" value="com.levien.synthesizer.j2se.Perform"/>
</manifest>
</jar>
</target>

@ -1,12 +1,12 @@
/*
* Copyright 2011 Google Inc.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -14,9 +14,9 @@
* limitations under the License.
*/
package com.google.synthesizer.j2se;
package com.levien.synthesizer.j2se;
import com.google.synthesizer.core.model.composite.MultiChannelSynthesizer;
import com.levien.synthesizer.core.model.composite.MultiChannelSynthesizer;
import java.util.ArrayList;
import java.util.List;

@ -1,12 +1,12 @@
/*
* Copyright 2011 Google Inc.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -14,10 +14,10 @@
* limitations under the License.
*/
package com.google.synthesizer.j2se;
package com.levien.synthesizer.j2se;
import com.google.synthesizer.core.midi.MessageInputProcessor;
import com.google.synthesizer.core.model.composite.MultiChannelSynthesizer;
import com.levien.synthesizer.core.midi.MessageInputProcessor;
import com.levien.synthesizer.core.model.composite.MultiChannelSynthesizer;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@ -94,7 +94,7 @@ public class MidiDeviceBinder {
midiOut_ = null;
}
}
/**
* Sends the given message to the Midi device.
*/

@ -1,12 +1,12 @@
/*
* Copyright 2011 Google Inc.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.google.synthesizer.j2se;
package com.levien.synthesizer.j2se;
import java.io.BufferedInputStream;
import java.io.BufferedReader;
@ -32,12 +32,12 @@ import java.util.logging.Logger;
import javax.sound.midi.MidiMessage;
import com.google.synthesizer.core.midi.MessageOutputProcessor;
import com.google.synthesizer.core.midi.MidiFilePlayer;
import com.google.synthesizer.core.midi.MidiListener;
import com.google.synthesizer.core.model.composite.MultiChannelSynthesizer;
import com.google.synthesizer.core.soundfont.SoundFontReader;
import com.google.synthesizer.core.wave.WaveAdapter;
import com.levien.synthesizer.core.midi.MessageOutputProcessor;
import com.levien.synthesizer.core.midi.MidiFilePlayer;
import com.levien.synthesizer.core.midi.MidiListener;
import com.levien.synthesizer.core.model.composite.MultiChannelSynthesizer;
import com.levien.synthesizer.core.soundfont.SoundFontReader;
import com.levien.synthesizer.core.wave.WaveAdapter;
/**
* Perform is a simple little command-line app for debugging the synthesizer.

@ -1,12 +1,12 @@
/*
* Copyright 2011 Google Inc.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -14,10 +14,10 @@
* limitations under the License.
*/
package com.google.synthesizer.j2se;
package com.levien.synthesizer.j2se;
import com.google.synthesizer.core.model.SignalProvider;
import com.google.synthesizer.core.model.SynthesisTime;
import com.levien.synthesizer.core.model.SignalProvider;
import com.levien.synthesizer.core.model.SynthesisTime;
import java.util.logging.Level;
import java.util.logging.Logger;

2
test/.gitignore vendored

@ -0,0 +1,2 @@
build/**
test.jar

Binary file not shown.
Loading…
Cancel
Save