Skip to content

Commit

Permalink
udate ant build task
Browse files Browse the repository at this point in the history
  • Loading branch information
crocsg committed Dec 4, 2018
1 parent 2ef9ac3 commit aa13c87
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 40 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ NatBrailleTools/BrailleLogger/bin/Braille2GcodeEncoder.class
NatBrailleTools/BrailleLogger/bin/Braille6GcodeEncoding.class
NatBrailleTools/BrailleLogger/bin/BrailleLogger.class
NatBrailleTools/BrailleLogger/bin/GCodeGenerator.class
NatBrailleTools.zip
6 changes: 3 additions & 3 deletions NatBrailleTools/BrailleLogger/ant/braillelogger_ant_build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
<!--define folder properties-->
<property name="dir.buildfile" value="."/>
<property name="dir.workspace" value="D:/Users/Stephane/eclipse-workspace"/>
<property name="dir.jarfile" value="I:/home/3d/braillerapsp.github/BrailleRapSP/NatBrailleTools/bin"/>
<property name="dir.jarfile" value="../../bin"/>
<target name="create_run_jar">
<jar destfile="${dir.jarfile}/braillelogger.jar">
<jar destfile="${dir.jarfile}/BrailleLogger.jar">
<manifest>
<attribute name="Main-Class" value="org.eclipse.jdt.internal.jarinjarloader.JarRsrcLoader"/>
<attribute name="Rsrc-Main-Class" value="BrailleLogger"/>
<attribute name="Class-Path" value="."/>
<attribute name="Rsrc-Class-Path" value="./"/>
</manifest>
<zipfileset src="jar-in-jar-loader.zip"/>
<fileset dir="I:/home/3d/braillerapsp.github/BrailleRapSP/NatBrailleTools/BrailleLogger/bin"/>
<fileset dir="../bin"/>
</jar>
</target>
</project>
4 changes: 4 additions & 0 deletions NatBrailleTools/BrailleLogger/bin/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/Braille2GcodeEncoder.java.bak
/BrailleLogger.java.bak
/BrailleGcodeDot.class
/BrailleGcodeEncoding.class
21 changes: 0 additions & 21 deletions NatBrailleTools/BrailleLogger/bin/braillelogger_ant_build.xml

This file was deleted.

10 changes: 4 additions & 6 deletions NatBrailleTools/BrailleLogger/src/Braille2GcodeEncoder.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/

/**
* Braille encoder class
* Braille encoder class
*
* @author crocsg
*
Expand Down Expand Up @@ -70,9 +70,7 @@ public Braille2GcodeEncoder(BrailleGcodeEncoding encoder) {
this.encoder = encoder;
}

/**
* Start a new page
*/

public void startPage ()
{
pagedot = new ArrayList <Point2D.Float> ();
Expand Down Expand Up @@ -166,7 +164,7 @@ private void nextLinePosition ()
{
this.position_y += Braille_line_padding;
}


/**
* End Braille characters line
Expand Down Expand Up @@ -207,7 +205,7 @@ private void endLine ()
* Add a character in page buffer to encode in Braille
* @param a character to add
*/
private void addCharToBuffer (char a)
private void addCharToBuffer (char a)
{
bufline += a;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/**
*
*/

/**
* @author lenovo
*
Expand Down
2 changes: 1 addition & 1 deletion NatBrailleTools/BrailleLogger/src/BrailleGcodeDot.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@


/**
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/**
*
*/

/**
* @author lenovo
*
Expand Down
8 changes: 3 additions & 5 deletions NatBrailleTools/BrailleLogger/src/BrailleLogger.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
*/
public class BrailleLogger {


ArrayList <Point2D.Float> braillepoints = new ArrayList <Point2D.Float>();
/**
* @param args
*/
public static void main(String[] args) {
public static void main(String[] args) {
// TODO Auto-generated method stub
System.out.println ("; BrailleRapSP GCODE generator");
int arg = 0;
Expand Down Expand Up @@ -57,9 +57,7 @@ public static void main(String[] args) {

} catch (FileNotFoundException e) {
// TODO Auto-generated catch block
System.out.println("File not found:" + args[0]);
System.out.println(e.getMessage());
//e.printStackTrace();
e.printStackTrace();

} catch (IOException e) {
// TODO Auto-generated catch block
Expand Down
4 changes: 2 additions & 2 deletions NatBrailleTools/BrailleLogger/src/GCodeGenerator.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
import java.text.DecimalFormatSymbols;

/**
*
*
*/

/**
* @author lenovo
*
*/
public class GCodeGenerator {
public class GCodeGenerator {


public String Home ()
Expand Down
Binary file modified NatBrailleTools/bin/braillelogger.jar
Binary file not shown.
Binary file removed NatBrailleTools/bin/gcodestreamer.jar
Binary file not shown.

0 comments on commit aa13c87

Please sign in to comment.