Permalink
Browse files

Fixes for Windows 8.1

Wiring build fixes to run on Windows 8.1
  • Loading branch information...
1 parent 9d465f1 commit fc66df4fee3f29e246323b1f1fa80678f06800cb @dbarragan dbarragan committed Oct 25, 2014
@@ -1501,7 +1501,7 @@ public RunnerException placeException(String message,
// System.out.println("placing " + dotJavaFilename + " " + dotJavaLine);
// System.out.println("code count is " + getCodeCount());
- // first check to see if it's a .java file
+ // first check to see if it's a .cpp or .c file
for (int i = 0; i < getCodeCount(); i++) {
SketchCode code = getCode(i);
if (code.isExtension("cpp")||code.isExtension("h")||code.isExtension("c")) {
@@ -1518,7 +1518,7 @@ public RunnerException placeException(String message,
return null;
}
- // if it's not a .java file, codeIndex will still be 0
+ // if it's not a .cpp or .c file, codeIndex will still be 0
// this section searches through the list of .pde files
codeIndex = 0;
for (int i = 0; i < getCodeCount(); i++) {
@@ -98,7 +98,7 @@ private void paintLineNumbers(Graphics gfx)
// XXX this is a hack to resize the gutter so the numbers fill in
int lineCount = textArea.getLineCount();
int digitsCount = (Integer.toString(lineCount)).length();
- setGutterWidth(fm.charWidth('w') * ((digitsCount < 2) ? 2 : digitsCount));
+ setGutterWidth(3 + fm.charWidth('w') * ((digitsCount < 2) ? 2 : digitsCount));
Rectangle clip = gfx.getClipBounds();
View
@@ -20,7 +20,7 @@
==================== -->
<!-- Current wiring version (FIXME: this is just a stub) -->
- <property name="release.version" value="v1.0.0-dev"/>
+ <property name="release.version" value="v1.0.1-dev"/>
<!-- out.dir: the parent directory for all build-generated files. -->
<property name="out.dir" location="${basedir}/out"/>
@@ -128,7 +128,8 @@ linestatus.height = 20
# GUTTER - Editor gutter
-gutter.width = 16
+
+gutter.width = 16
gutter.collapsed = false
gutter.lineNumbers = true
gutter.highlightInterval = 5
@@ -137,11 +138,10 @@ gutter.bgColor = #f8f8f8
gutter.fgColor = #cacaca
gutter.highlightColor = #aaaaaa
#gutter.markerColor = #eaeaea
-#gutter.registerColor = #ff0000
+#gutter.registerColor = #ff0000
gutter.currentLineColor = #ff0055
gutter.numberAlignment = right
gutter.borderWidth = 1
gutter.focusBorderColor = #ff5500
gutter.noFocusBorderColor = #e2e2e2
-gutter.font = SansSerif,plain,10
-
+gutter.font = SansSerif,plain,10
@@ -2,6 +2,7 @@
<dontWrapJar>true</dontWrapJar>
<headerType>gui</headerType>
<outfile>wiring.exe</outfile>
+ <jar>lib/processing.jar</jar>
<errTitle></errTitle>
<chdir>.</chdir>
<downloadUrl>http://www.oracle.com/technetwork/java/javase/downloads/index.html</downloadUrl>
@@ -18,11 +19,12 @@
<cp>lib/jna.jar</cp>
<cp>lib/ecj.jar</cp>
<cp>lib/antlr.jar</cp>
- <cp>lib/serial/RXTXcomm.jar</cp>
+ <cp>lib/serial/serial.jar</cp>
+ <cp>lib/serial/jssc.jar</cp>
</classPath>
<jre>
<path>java</path>
- <minVersion>1.5.0</minVersion>
+ <minVersion>1.6.0</minVersion>
<maxVersion></maxVersion>
<jdkPreference>preferJre</jdkPreference>
<opt>-Xms128m -Xmx128m</opt>
@@ -81,8 +81,12 @@
</exec>
<move file="${dist.rsrc.launch4j}/wiring.exe" todir="${dist.wiring.dir}"/>
- <!-- Make sure rxtxSerial.dll gets picked up by JNI -->
- <copy file="${build.rsrc.ide-deps}/serial/rxtxSerial.dll"
+ <!-- Make sure jSSC-2.8.dll gets picked up by JNI -->
+
+ <copy file="${build.rsrc.ide-deps}/serial/windows32/jSSC-2.8.dll"
+ todir="${dist.wiring.dir}"/>
+
+ <copy file="${deps.extract}/tools/avr/bin/libiconv-2.dll"
todir="${dist.wiring.dir}"/>
<!-- Copy everything into dist.wiring.dir. -->
@@ -92,6 +96,7 @@
<copy todir="${dist.wiring.lib}"><path refid="lib.class.path"/></copy>
<copy todir="${dist.wiring.lib}" file="${build.jar}"/>
+
<!-- Create version.txt. -->
<echo message="${release.version}${line.separator}"
file="${dist.wiring.lib}/version.txt"/>
@@ -113,7 +118,7 @@
<!-- Dependency resolution -->
<target name="-resolve.deps"
- depends="platform.-resolve.dep.jre,platform.-resolve.dep.cygwindlls">
+ depends="platform.-resolve.dep.jre">
</target>
<target name="-resolve.dep.jre"
@@ -127,6 +132,7 @@
<available property="exists.dep.jre" file="${dep.jre.local}"/>
</target>
+ <!--
<target name="-resolve.dep.cygwindlls"
depends="-check.dep.cygwindlls"
unless="exists.dep.cygwindlls">
@@ -138,6 +144,7 @@
<available property="exists.dep.cygwindlls"
file="${dep.cygwindlls.local}"/>
</target>
+ -->
<!-- Initializiation -->

0 comments on commit fc66df4

Please sign in to comment.