Skip to content

Commit

Permalink
Update PJC to 0.0.22 and JNA to 4.1.0
Browse files Browse the repository at this point in the history 
These have been reported to fix some problems on Windows 8.
Removed the duplicate copies of those libraries and instead made
IOIOBridge use the same copy as IOIOLibPc.
  • Loading branch information
@ytai
ytai committed Sep 15, 2014
1 parent 6189875 commit cc5f5f2
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 545 deletions.
4 changes: 2 additions & 2 deletions software/IOIOBridge/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/jna-4.0.0.jar"/>
<classpathentry kind="lib" path="lib/purejavacomm-0.0.21.jar"/>
<classpathentry kind="lib" path="lib/jna-4.1.0.jar"/>
<classpathentry kind="lib" path="lib/purejavacomm-0.0.22.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
10 changes: 5 additions & 5 deletions software/IOIOBridge/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<property name="libdir" value="../IOIOLib/target/pc/lib"/>
<path id="IOIOBridge.classpath">
<pathelement location="bin"/>
<pathelement location="${libdir}/jna-4.0.0.jar"/>
<pathelement location="${libdir}/purejavacomm-0.0.21.jar"/>
<pathelement location="${libdir}/jna-4.1.0.jar"/>
<pathelement location="${libdir}/purejavacomm-0.0.22.jar"/>
</path>
<target name="init">
<mkdir dir="bin" />
Expand All @@ -35,10 +35,10 @@
<jar destfile="bin/ioiobridge.jar" basedir="bin/classes">
<manifest>
<attribute name="Main-Class" value="ioio.bridge.Main" />
<attribute name="Class-Path" value="./ jna-4.0.0.jar purejavacomm-0.0.21.jar" />
<attribute name="Class-Path" value="./ jna-4.1.0.jar purejavacomm-0.0.22.jar" />
</manifest>
<zipgroupfileset dir="../IOIOLib/target/pc/lib" includes="jna-4.0.0.jar" />
<zipgroupfileset dir="../IOIOLib/target/pc/lib" includes="purejavacomm-0.0.21.jar" />
<zipgroupfileset dir="../IOIOLib/target/pc/lib" includes="jna-4.1.0.jar" />
<zipgroupfileset dir="../IOIOLib/target/pc/lib" includes="purejavacomm-0.0.22.jar" />
</jar>
</target>
<target depends="jar" name="zip">
Expand Down
4 changes: 2 additions & 2 deletions software/IOIODude/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/jna-4.0.0.jar"/>
<classpathentry kind="lib" path="lib/purejavacomm-0.0.21.jar"/>
<classpathentry kind="lib" path="lib/jna-4.1.0.jar"/>
<classpathentry kind="lib" path="lib/purejavacomm-0.0.22.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
7 changes: 7 additions & 0 deletions software/IOIODude/.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,11 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<linkedResources>
<link>
<name>lib</name>
<type>2</type>
<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/IOIOLIB/target/pc/lib</locationURI>
</link>
</linkedResources>
</projectDescription>
10 changes: 5 additions & 5 deletions software/IOIODude/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<property name="source" value="1.6" />
<path id="IOIODude.classpath">
<pathelement location="bin"/>
<pathelement location="lib/jna-4.0.0.jar"/>
<pathelement location="lib/purejavacomm-0.0.21.jar"/>
<pathelement location="lib/jna-4.1.0.jar"/>
<pathelement location="lib/purejavacomm-0.0.22.jar"/>
</path>
<target name="init">
<mkdir dir="bin" />
Expand All @@ -34,10 +34,10 @@
<jar destfile="bin/ioiodude.jar" basedir="bin/classes">
<manifest>
<attribute name="Main-Class" value="ioio.dude.IOIODudeMain" />
<attribute name="Class-Path" value="./ jna-4.0.0.jar purejavacomm-0.0.21.jar" />
<attribute name="Class-Path" value="./ jna-4.1.0.jar purejavacomm-0.0.22.jar" />
</manifest>
<zipgroupfileset dir="lib" includes="jna-4.0.0.jar" />
<zipgroupfileset dir="lib" includes="purejavacomm-0.0.21.jar" />
<zipgroupfileset dir="lib" includes="jna-4.1.0.jar" />
<zipgroupfileset dir="lib" includes="purejavacomm-0.0.22.jar" />
</jar>
</target>
<target depends="jar" name="zip">
Expand Down
502 changes: 0 additions & 502 deletions software/IOIODude/lib/jna.license
View file

This file was deleted.

Binary file removed software/IOIODude/lib/purejavacomm-0.0.21.jar
View file
Binary file not shown.
27 changes: 0 additions & 27 deletions software/IOIODude/lib/purejavacomm.license
View file

This file was deleted.

4 changes: 2 additions & 2 deletions software/IOIOLib/target/pc/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<classpathentry kind="src" path="src_common"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/jna-4.0.0.jar"/>
<classpathentry kind="lib" path="lib/purejavacomm-0.0.21.jar"/>
<classpathentry kind="lib" path="lib/jna-4.1.0.jar"/>
<classpathentry kind="lib" path="lib/purejavacomm-0.0.22.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Binary file removed software/IOIOLib/target/pc/lib/jna-4.0.0.jar
View file
Binary file not shown.
Binary file renamed software/IOIODude/lib/jna-4.0.0.jar → software/IOIOLib/target/pc/lib/jna-4.1.0.jar
View file
Binary file not shown.
Binary file removed software/IOIOLib/target/pc/lib/purejavacomm-0.0.21.jar
View file
Binary file not shown.
Binary file added software/IOIOLib/target/pc/lib/purejavacomm-0.0.22.jar
View file
Binary file not shown.

0 comments on commit cc5f5f2

Please sign in to comment.