Now using ant as the preferred build method

CapacitorSet · Mar 26, 2015 · 937c90a · 937c90a
1 parent 154d899
commit 937c90a
Show file tree

Hide file tree

Showing 97 changed files with 35 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -1,18 +1,18 @@
 name = buzzr
 
 all:
-	javac *.java
+	@echo "Makefile is outdated, please use ant if possible!"
+	javac src/*.java
 
 jar: $(name).jar
+	@echo "Makefile is outdated, please use ant if possible!"
 	chmod +x $(name).jar
 
-src:
-	cd .. && zip -r circuit-src.zip src/Makefile src/*.java src/*.txt src/circuits/
-
 run: all
 	java Circuit
 
 $(name).jar: all
+	@echo "Makefile is outdated, please use ant if possible!"
 	jar cfm $(name).jar Manifest.txt *.class *.txt circuits/
 
 clean:

diff --git a/README.md b/README.md
@@ -6,14 +6,11 @@ This is an electronics tutorial based on Paul Falstad's circuit simulator (origi
 Building
 --------
 
-If you have `make` installed, just `cd src`, `make`, and then `make jar`.
+The preferred build process is using Apache Ant: use `ant compile` to build, then `ant run` to run the application.
 
-If not, compile with `javac *.java` and build the jar file with `jar cfm buzzr.jar Manifest.txt *.class *.txt circuits/`
+If you don't have `ant`, but have `make`, run `make jar` to compile, and then `make run` to run the application.
 
-Running
--------
-
-As an application: `java -jar buzzr.jar`
+If you have neither, compile with `javac src/*.java`, build the jar file with `jar cfm buzzr.jar Manifest.txt *.class *.txt circuits/`, and run the application with `java -jar buzzr.jar`.
 
 Terms and Conditions
 --------------------

diff --git a/build.xml b/build.xml
@@ -0,0 +1,28 @@
+<project>
+
+	<target name="clean">
+		<delete dir="build"/>
+	</target>
+
+	<target name="compile">
+		<mkdir dir="build/classes"/>
+		<javac srcdir="src" destdir="build/classes" includeantruntime="false">
+		</javac>
+
+		<mkdir dir="build/jar"/>
+		<jar destfile="buzzr.jar" basedir="build/classes">
+		<fileset dir=".">
+			<include name="circuits/**"/>
+		</fileset>
+		<fileset file="setuplist.txt" />
+			<manifest>
+				<attribute name="Main-Class" value="Buzzr"/>
+			</manifest>
+		</jar>
+	</target>
+
+	<target name="run">
+		<java jar="buzzr.jar" fork="true" />
+	</target>
+
+</project>
diff --git a/ACRailElm.java → src/ACRailElm.java b/ACRailElm.java → src/ACRailElm.java
diff --git a/ACVoltageElm.java → src/ACVoltageElm.java b/ACVoltageElm.java → src/ACVoltageElm.java
diff --git a/ADCElm.java → src/ADCElm.java b/ADCElm.java → src/ADCElm.java
diff --git a/AnalogSwitch2Elm.java → src/AnalogSwitch2Elm.java b/AnalogSwitch2Elm.java → src/AnalogSwitch2Elm.java
diff --git a/AnalogSwitchElm.java → src/AnalogSwitchElm.java b/AnalogSwitchElm.java → src/AnalogSwitchElm.java
diff --git a/AndGateElm.java → src/AndGateElm.java b/AndGateElm.java → src/AndGateElm.java
diff --git a/AntennaElm.java → src/AntennaElm.java b/AntennaElm.java → src/AntennaElm.java
diff --git a/ArrowElm.java → src/ArrowElm.java b/ArrowElm.java → src/ArrowElm.java
diff --git a/BorderElm.java → src/BorderElm.java b/BorderElm.java → src/BorderElm.java
diff --git a/BoxElm.java → src/BoxElm.java b/BoxElm.java → src/BoxElm.java
diff --git a/Buzzr.java → src/Buzzr.java b/Buzzr.java → src/Buzzr.java
diff --git a/CC2Elm.java → src/CC2Elm.java b/CC2Elm.java → src/CC2Elm.java
diff --git a/CapacitorElm.java → src/CapacitorElm.java b/CapacitorElm.java → src/CapacitorElm.java
diff --git a/ChipElm.java → src/ChipElm.java b/ChipElm.java → src/ChipElm.java
diff --git a/CircuitCanvas.java → src/CircuitCanvas.java b/CircuitCanvas.java → src/CircuitCanvas.java
diff --git a/CircuitElm.java → src/CircuitElm.java b/CircuitElm.java → src/CircuitElm.java
diff --git a/CircuitLayout.java → src/CircuitLayout.java b/CircuitLayout.java → src/CircuitLayout.java
diff --git a/CircuitNode.java → src/CircuitNode.java b/CircuitNode.java → src/CircuitNode.java
diff --git a/CircuitNodeLink.java → src/CircuitNodeLink.java b/CircuitNodeLink.java → src/CircuitNodeLink.java
diff --git a/ClockElm.java → src/ClockElm.java b/ClockElm.java → src/ClockElm.java
diff --git a/CounterElm.java → src/CounterElm.java b/CounterElm.java → src/CounterElm.java
diff --git a/CurrentElm.java → src/CurrentElm.java b/CurrentElm.java → src/CurrentElm.java
diff --git a/DACElm.java → src/DACElm.java b/DACElm.java → src/DACElm.java
diff --git a/DCVoltageElm.java → src/DCVoltageElm.java b/DCVoltageElm.java → src/DCVoltageElm.java
diff --git a/DFlipFlopElm.java → src/DFlipFlopElm.java b/DFlipFlopElm.java → src/DFlipFlopElm.java
diff --git a/DecadeElm.java → src/DecadeElm.java b/DecadeElm.java → src/DecadeElm.java
diff --git a/DiacElm.java → src/DiacElm.java b/DiacElm.java → src/DiacElm.java
diff --git a/Diode.java → src/Diode.java b/Diode.java → src/Diode.java
diff --git a/DiodeElm.java → src/DiodeElm.java b/DiodeElm.java → src/DiodeElm.java
diff --git a/EditDialog.java → src/EditDialog.java b/EditDialog.java → src/EditDialog.java
diff --git a/EditDialogLayout.java → src/EditDialogLayout.java b/EditDialogLayout.java → src/EditDialogLayout.java
diff --git a/EditInfo.java → src/EditInfo.java b/EditInfo.java → src/EditInfo.java
diff --git a/EditOptions.java → src/EditOptions.java b/EditOptions.java → src/EditOptions.java
diff --git a/GateElm.java → src/GateElm.java b/GateElm.java → src/GateElm.java
diff --git a/GraphicElm.java → src/GraphicElm.java b/GraphicElm.java → src/GraphicElm.java
diff --git a/GroundElm.java → src/GroundElm.java b/GroundElm.java → src/GroundElm.java
diff --git a/ImportExportDialog.java → src/ImportExportDialog.java b/ImportExportDialog.java → src/ImportExportDialog.java
diff --git a/ImportExportFileDialog.java → src/ImportExportFileDialog.java b/ImportExportFileDialog.java → src/ImportExportFileDialog.java
diff --git a/Inductor.java → src/Inductor.java b/Inductor.java → src/Inductor.java
diff --git a/InductorElm.java → src/InductorElm.java b/InductorElm.java → src/InductorElm.java
diff --git a/InverterElm.java → src/InverterElm.java b/InverterElm.java → src/InverterElm.java
diff --git a/JKFlipFlopElm.java → src/JKFlipFlopElm.java b/JKFlipFlopElm.java → src/JKFlipFlopElm.java
diff --git a/JfetElm.java → src/JfetElm.java b/JfetElm.java → src/JfetElm.java
diff --git a/LEDElm.java → src/LEDElm.java b/LEDElm.java → src/LEDElm.java
diff --git a/LampElm.java → src/LampElm.java b/LampElm.java → src/LampElm.java
diff --git a/LatchElm.java → src/LatchElm.java b/LatchElm.java → src/LatchElm.java
diff --git a/LogicInputElm.java → src/LogicInputElm.java b/LogicInputElm.java → src/LogicInputElm.java
diff --git a/LogicOutputElm.java → src/LogicOutputElm.java b/LogicOutputElm.java → src/LogicOutputElm.java
diff --git a/MemristorElm.java → src/MemristorElm.java b/MemristorElm.java → src/MemristorElm.java
diff --git a/MosfetElm.java → src/MosfetElm.java b/MosfetElm.java → src/MosfetElm.java
diff --git a/NJfetElm.java → src/NJfetElm.java b/NJfetElm.java → src/NJfetElm.java
diff --git a/NMosfetElm.java → src/NMosfetElm.java b/NMosfetElm.java → src/NMosfetElm.java
diff --git a/NTransistorElm.java → src/NTransistorElm.java b/NTransistorElm.java → src/NTransistorElm.java
diff --git a/NandGateElm.java → src/NandGateElm.java b/NandGateElm.java → src/NandGateElm.java
diff --git a/NorGateElm.java → src/NorGateElm.java b/NorGateElm.java → src/NorGateElm.java
diff --git a/OpAmpElm.java → src/OpAmpElm.java b/OpAmpElm.java → src/OpAmpElm.java
diff --git a/OpAmpSwapElm.java → src/OpAmpSwapElm.java b/OpAmpSwapElm.java → src/OpAmpSwapElm.java
diff --git a/OrGateElm.java → src/OrGateElm.java b/OrGateElm.java → src/OrGateElm.java
diff --git a/OutputElm.java → src/OutputElm.java b/OutputElm.java → src/OutputElm.java
diff --git a/PMosfetElm.java → src/PMosfetElm.java b/PMosfetElm.java → src/PMosfetElm.java
diff --git a/PTransistorElm.java → src/PTransistorElm.java b/PTransistorElm.java → src/PTransistorElm.java
diff --git a/PhaseCompElm.java → src/PhaseCompElm.java b/PhaseCompElm.java → src/PhaseCompElm.java
diff --git a/PhotoResistorElm.java → src/PhotoResistorElm.java b/PhotoResistorElm.java → src/PhotoResistorElm.java
diff --git a/PotElm.java → src/PotElm.java b/PotElm.java → src/PotElm.java
diff --git a/ProbeElm.java → src/ProbeElm.java b/ProbeElm.java → src/ProbeElm.java
diff --git a/PushSwitchElm.java → src/PushSwitchElm.java b/PushSwitchElm.java → src/PushSwitchElm.java
diff --git a/RailElm.java → src/RailElm.java b/RailElm.java → src/RailElm.java
diff --git a/RelayElm.java → src/RelayElm.java b/RelayElm.java → src/RelayElm.java
diff --git a/ResistorElm.java → src/ResistorElm.java b/ResistorElm.java → src/ResistorElm.java
diff --git a/RowInfo.java → src/RowInfo.java b/RowInfo.java → src/RowInfo.java
diff --git a/SCRElm.java → src/SCRElm.java b/SCRElm.java → src/SCRElm.java
diff --git a/Scope.java → src/Scope.java b/Scope.java → src/Scope.java
diff --git a/SevenSegElm.java → src/SevenSegElm.java b/SevenSegElm.java → src/SevenSegElm.java
diff --git a/SparkGapElm.java → src/SparkGapElm.java b/SparkGapElm.java → src/SparkGapElm.java
diff --git a/SquareRailElm.java → src/SquareRailElm.java b/SquareRailElm.java → src/SquareRailElm.java
diff --git a/SweepElm.java → src/SweepElm.java b/SweepElm.java → src/SweepElm.java
diff --git a/Switch2Elm.java → src/Switch2Elm.java b/Switch2Elm.java → src/Switch2Elm.java
diff --git a/SwitchElm.java → src/SwitchElm.java b/SwitchElm.java → src/SwitchElm.java
diff --git a/TappedTransformerElm.java → src/TappedTransformerElm.java b/TappedTransformerElm.java → src/TappedTransformerElm.java
diff --git a/TextElm.java → src/TextElm.java b/TextElm.java → src/TextElm.java
diff --git a/ThermistorElm.java → src/ThermistorElm.java b/ThermistorElm.java → src/ThermistorElm.java
diff --git a/TimerElm.java → src/TimerElm.java b/TimerElm.java → src/TimerElm.java
diff --git a/TransLineElm.java → src/TransLineElm.java b/TransLineElm.java → src/TransLineElm.java
diff --git a/TransformerElm.java → src/TransformerElm.java b/TransformerElm.java → src/TransformerElm.java
diff --git a/TransistorElm.java → src/TransistorElm.java b/TransistorElm.java → src/TransistorElm.java
diff --git a/TriacElm.java → src/TriacElm.java b/TriacElm.java → src/TriacElm.java
diff --git a/TriodeElm.java → src/TriodeElm.java b/TriodeElm.java → src/TriodeElm.java
diff --git a/TunnelDiodeElm.java → src/TunnelDiodeElm.java b/TunnelDiodeElm.java → src/TunnelDiodeElm.java
diff --git a/VCOElm.java → src/VCOElm.java b/VCOElm.java → src/VCOElm.java
diff --git a/VarRailElm.java → src/VarRailElm.java b/VarRailElm.java → src/VarRailElm.java
diff --git a/VoltageElm.java → src/VoltageElm.java b/VoltageElm.java → src/VoltageElm.java
diff --git a/WireElm.java → src/WireElm.java b/WireElm.java → src/WireElm.java
diff --git a/XorGateElm.java → src/XorGateElm.java b/XorGateElm.java → src/XorGateElm.java
diff --git a/ZenerElm.java → src/ZenerElm.java b/ZenerElm.java → src/ZenerElm.java