From 435ec1c9954263e37853bc4574a281d93c800d38 Mon Sep 17 00:00:00 2001
From: daid <daid303@gmail.com>
Date: Wed, 14 Dec 2011 15:10:35 +0100
Subject: [PATCH] Added start/end.gcode Added more possible pypy locations
 (+support for linux/mac)

---
 build_patches.sh |   2 +-
 patches/41       | 157 +++++++++++++++++++++++++++++++++--------------
 2 files changed, 112 insertions(+), 47 deletions(-)

diff --git a/build_patches.sh b/build_patches.sh
index 80e1fc4..129f2eb 100755
--- a/build_patches.sh
+++ b/build_patches.sh
@@ -2,7 +2,7 @@
 
 for NR in `ls patches`; do
 	if [ -d target/SF${NR} ]; then
-		diff -r -x*.pyc -u ori/${NR}/ target/SF${NR} > patches/${NR}
+		diff -r -x*.pyc -N -u ori/${NR}/ target/SF${NR} > patches/${NR}
 	fi
 done
 
diff --git a/patches/41 b/patches/41
index e27e50b..5d07650 100644
--- a/patches/41
+++ b/patches/41
@@ -1,6 +1,6 @@
-diff -r -x'*.pyc' -u ori/41/fabmetheus_utilities/archive.py target/SF41/fabmetheus_utilities/archive.py
+diff -r -x'*.pyc' -N -u ori/41/fabmetheus_utilities/archive.py target/SF41/fabmetheus_utilities/archive.py
 --- ori/41/fabmetheus_utilities/archive.py	2011-04-12 00:32:25.000000000 +0200
-+++ target/SF41/fabmetheus_utilities/archive.py	2011-12-13 15:52:55.000000000 +0100
++++ target/SF41/fabmetheus_utilities/archive.py	2011-12-13 16:40:24.000000000 +0100
 @@ -18,7 +18,7 @@
  __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html'
  
@@ -10,9 +10,9 @@ diff -r -x'*.pyc' -u ori/41/fabmetheus_utilities/archive.py target/SF41/fabmethe
  
  
  def addToNamePathDictionary(directoryPath, namePathDictionary):
-diff -r -x'*.pyc' -u ori/41/fabmetheus_utilities/euclidean.py target/SF41/fabmetheus_utilities/euclidean.py
+diff -r -x'*.pyc' -N -u ori/41/fabmetheus_utilities/euclidean.py target/SF41/fabmetheus_utilities/euclidean.py
 --- ori/41/fabmetheus_utilities/euclidean.py	2011-04-15 02:32:27.000000000 +0200
-+++ target/SF41/fabmetheus_utilities/euclidean.py	2011-12-13 15:35:53.000000000 +0100
++++ target/SF41/fabmetheus_utilities/euclidean.py	2011-12-13 16:40:24.000000000 +0100
 @@ -64,7 +64,7 @@
  
  def addElementToPixelList( element, pixelDictionary, x, y ):
@@ -122,9 +122,9 @@ diff -r -x'*.pyc' -u ori/41/fabmetheus_utilities/euclidean.py target/SF41/fabmet
  			if stepKey in pixelDictionary:
  				squareValues += pixelDictionary[ stepKey ]
  	return squareValues
-diff -r -x'*.pyc' -u ori/41/fabmetheus_utilities/settings.py target/SF41/fabmetheus_utilities/settings.py
+diff -r -x'*.pyc' -N -u ori/41/fabmetheus_utilities/settings.py target/SF41/fabmetheus_utilities/settings.py
 --- ori/41/fabmetheus_utilities/settings.py	2011-04-26 10:32:32.000000000 +0200
-+++ target/SF41/fabmetheus_utilities/settings.py	2011-12-13 15:54:21.000000000 +0100
++++ target/SF41/fabmetheus_utilities/settings.py	2011-12-13 16:40:24.000000000 +0100
 @@ -271,7 +271,7 @@
  		if repository.baseNameSynonym != None:
  			text = archive.getFileText(archive.getProfilesPath(getProfileBaseNameSynonym(repository)), False)
@@ -134,9 +134,57 @@ diff -r -x'*.pyc' -u ori/41/fabmetheus_utilities/settings.py target/SF41/fabmeth
  		text = archive.getFileText(getProfilesDirectoryInAboveDirectory(getProfileBaseName(repository)), False)
  		if text != '':
  			readSettingsFromText(repository, text)
-diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeiniso.py target/SF41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeiniso.py
+diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/alterations/end.gcode target/SF41/skeinforge_application/alterations/end.gcode
+--- ori/41/skeinforge_application/alterations/end.gcode	1970-01-01 01:00:00.000000000 +0100
++++ target/SF41/skeinforge_application/alterations/end.gcode	2011-12-14 15:01:34.000000000 +0100
+@@ -0,0 +1,10 @@
++(start of end.gcode)
++M104 S0                (extruder heat off)
++M106                   (fan on)
++G91                    (relative positioning)
++G1 Z+10 E-5 F400       (move Z up a bit and retract filament by 5mm)
++G1 X-20 Y-20 F1500     (move X and Y over a bit)
++M84                    (steppers off)
++G90                    (absolute positioning)
++(end of end.gcode)
++
+diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/alterations/start.gcode target/SF41/skeinforge_application/alterations/start.gcode
+--- ori/41/skeinforge_application/alterations/start.gcode	1970-01-01 01:00:00.000000000 +0100
++++ target/SF41/skeinforge_application/alterations/start.gcode	2011-12-14 15:02:41.000000000 +0100
+@@ -0,0 +1,30 @@
++(start of start.txt)
++M92 E926.5 (the number of extruder steps to take in 1mm of filament)
++G21        (metric values)
++G21
++G21        (all the extra G21 commands are comments - skeinforge eats lines without a gcode)
++G21
++G90        (absolute positioning)
++G21
++G28        (move X/Y/Z to min endstops)
++G21
++G21        ( if your prints start too high, try changing the Z0.0 below )
++G21        ( to Z1.0 - the number after the Z is the actual, physical )
++G21        ( height of the nozzle in mm. This can take some messing around )
++G21        ( with to get just right... )
++G21
++G92 X-105 Y-105 Z0.0 E0 (reset software position to front/left/z=0.0)
++G21
++G1 Z15.0 F400  (move the platform down 15mm)
++G1 X0 Y0 F3500 (go to the middle of the platform)
++G92 E0         (zero the extruded length)
++G21
++G1 F75 E15     (extrude 15mm of feed stock)
++G1 F75 E13.5   (reverse feed stock by 1.5mm)
++G92 E0         (zero the extruded length again)
++G21
++M1             (Clean the nozzle then press YES to continue...)
++G21
++G1 Z0.0 F400   (back to Z=0 and start the print!)
++(end of start.txt)
++
+diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeiniso.py target/SF41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeiniso.py
 --- ori/41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeiniso.py	2011-04-14 06:57:37.000000000 +0200
-+++ target/SF41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeiniso.py	2011-12-13 16:24:22.000000000 +0100
++++ target/SF41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeiniso.py	2011-12-13 16:40:24.000000000 +0100
 @@ -297,7 +297,7 @@
  		self.baseNameSynonym = 'behold.csv'
  		self.fileNameInput = settings.FileNameInput().getFromFileName( [ ('Gcode text files', '*.gcode') ], 'Open File for Skeiniso', self, '')
@@ -146,9 +194,9 @@ diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/analyze_pl
  		self.addAnimation()
  		self.axisRulings = settings.BooleanSetting().getFromValue('Axis Rulings', self, True )
  		settings.LabelSeparator().getFromRepository(self)
-diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py target/SF41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py
+diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py target/SF41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py
 --- ori/41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py	2011-04-14 06:57:37.000000000 +0200
-+++ target/SF41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py	2011-12-13 16:24:11.000000000 +0100
++++ target/SF41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py	2011-12-13 16:40:24.000000000 +0100
 @@ -195,7 +195,7 @@
  		self.baseNameSynonym = 'skeinview.csv'
  		self.fileNameInput = settings.FileNameInput().getFromFileName( [ ('Gcode text files', '*.gcode') ], 'Open File for Skeinlayer', self, '')
@@ -158,9 +206,9 @@ diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/analyze_pl
  		self.addAnimation()
  		self.drawArrows = settings.BooleanSetting().getFromValue('Draw Arrows', self, True )
  		self.goAroundExtruderOffTravel = settings.BooleanSetting().getFromValue('Go Around Extruder Off Travel', self, False )
-diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py
+diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py
 --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py	2011-04-08 10:20:48.000000000 +0200
-+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py	2011-12-13 15:49:52.000000000 +0100
++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py	2011-12-13 16:40:24.000000000 +0100
 @@ -157,7 +157,7 @@
  		self.extraDecimalPlaces = settings.FloatSpin().getFromValue(0.0, 'Extra Decimal Places (float):', self, 3.0, 2.0)
  		self.importCoarseness = settings.FloatSpin().getFromValue( 0.5, 'Import Coarseness (ratio):', self, 2.0, 1.0 )
@@ -197,9 +245,9 @@ diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plug
  		svgWriter = svg_writer.SVGWriter(
  			repository.addLayerTemplateToSVG.value,
  			carving.getCarveCornerMaximum(),
-diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py
+diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py
 --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py	2011-02-09 08:31:34.000000000 +0100
-+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py	2011-12-13 16:03:23.000000000 +0100
++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py	2011-12-13 16:40:24.000000000 +0100
 @@ -166,7 +166,7 @@
  		skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.chamber.html', self )
  		self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Chamber', self, '')
@@ -209,9 +257,9 @@ diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plug
  		self.bedTemperature = settings.FloatSpin().getFromValue( 20.0, 'Bed Temperature (Celcius):', self, 90.0, 60.0 )
  		self.chamberTemperature = settings.FloatSpin().getFromValue( 20.0, 'Chamber Temperature (Celcius):', self, 90.0, 30.0 )
  		self.holdingForce = settings.FloatSpin().getFromValue( 0.0, 'Holding Force (bar):', self, 100.0, 0.0 )
-diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py
+diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py
 --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py	2011-02-22 08:41:38.000000000 +0100
-+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py	2011-12-13 16:03:34.000000000 +0100
++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py	2011-12-13 16:40:24.000000000 +0100
 @@ -86,7 +86,7 @@
  		skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.clip.html', self )
  		self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Clip', self, '')
@@ -221,9 +269,9 @@ diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plug
  		self.clipOverPerimeterWidth = settings.FloatSpin().getFromValue( 0.1, 'Clip Over Perimeter Width (ratio):', self, 0.8, 0.5 )
  		self.maximumConnectionDistanceOverPerimeterWidth = settings.FloatSpin().getFromValue( 1.0, 'Maximum Connection Distance Over Perimeter Width (ratio):', self, 20.0, 10.0 )
  		self.executeTitle = 'Clip'
-diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py
+diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py
 --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py	2011-02-22 08:41:38.000000000 +0100
-+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py	2011-12-13 16:21:08.000000000 +0100
++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py	2011-12-13 16:40:24.000000000 +0100
 @@ -126,7 +126,7 @@
  		skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.comb.html', self )
  		self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Comb', self, '')
@@ -233,9 +281,9 @@ diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plug
  		self.executeTitle = 'Comb'
  
  	def execute(self):
-diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py
+diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py
 --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py	2011-03-08 08:30:18.000000000 +0100
-+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py	2011-12-13 16:21:33.000000000 +0100
++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py	2011-12-13 16:40:24.000000000 +0100
 @@ -142,7 +142,7 @@
  		self.orbit = settings.MenuRadio().getFromMenuButtonDisplay(self.coolType, 'Orbit', self, False)
  		self.slowDown = settings.MenuRadio().getFromMenuButtonDisplay(self.coolType, 'Slow Down', self, True)
@@ -245,9 +293,9 @@ diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plug
  		self.minimumOrbitalRadius = settings.FloatSpin().getFromValue(
  			0.0, 'Minimum Orbital Radius (millimeters):', self, 20.0, 10.0)
  		settings.LabelSeparator().getFromRepository(self)
-diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py
+diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py
 --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py	2011-03-22 21:08:23.000000000 +0100
-+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py	2011-12-13 15:57:55.000000000 +0100
++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py	2011-12-13 16:40:24.000000000 +0100
 @@ -124,7 +124,7 @@
  		skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.dimension.html', self )
  		self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Dimension', self, '')
@@ -297,9 +345,9 @@ diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plug
  			self.isExtruderActive = True
  		elif firstWord == 'M103':
  			self.addLinearMoveExtrusionDistanceLine( - self.repository.retractionDistance.value )
-diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/export.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/export.py
+diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/export.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/export.py
 --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/export.py	2011-02-09 08:28:22.000000000 +0100
-+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/export.py	2011-12-13 16:10:59.000000000 +0100
++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/export.py	2011-12-13 16:40:24.000000000 +0100
 @@ -214,7 +214,7 @@
  		self.exportLabel = settings.LabelDisplay().getFromName('Export Operations: ', self)
  		self.exportPlugins = []
@@ -318,9 +366,9 @@ diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plug
  				exportPlugin.directoryPath = exportStaticDirectoryPath
  			self.exportPlugins.append(exportPlugin)
  		self.fileExtension = settings.StringSetting().getFromValue('File Extension:', self, 'gcode')
-diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py
+diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py
 --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py	2011-03-29 22:07:15.000000000 +0200
-+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py	2011-12-13 16:02:11.000000000 +0100
++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py	2011-12-13 16:40:24.000000000 +0100
 @@ -808,7 +808,7 @@
  		self.infillPatternLine = settings.Radio().getFromRadio( infillLatentStringVar, 'Line', self, True )
  		self.infillPerimeterOverlap = settings.FloatSpin().getFromValue( 0.0, 'Infill Perimeter Overlap (ratio):', self, 0.4, 0.15 )
@@ -339,9 +387,9 @@ diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plug
  				self.distanceFeedRate.addTagRoundedLine('infillWidth', self.infillWidth)
  			self.distanceFeedRate.addLine(line)
   
-diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/home.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/home.py
+diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/home.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/home.py
 --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/home.py	2011-02-22 08:41:38.000000000 +0100
-+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/home.py	2011-12-13 16:04:12.000000000 +0100
++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/home.py	2011-12-13 16:40:24.000000000 +0100
 @@ -82,7 +82,7 @@
  		skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.home.html', self)
  		self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Home', self, '')
@@ -351,9 +399,9 @@ diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plug
  		self.nameOfHomingFile = settings.StringSetting().getFromValue('Name of Homing File:', self, 'homing.gcode')
  		self.executeTitle = 'Home'
  
-diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py
+diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py
 --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py	2011-04-19 09:36:28.000000000 +0200
-+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py	2011-12-13 16:05:16.000000000 +0100
++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py	2011-12-13 16:40:24.000000000 +0100
 @@ -113,7 +113,7 @@
  		skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.jitter.html', self)
  		self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Jitter', self, '')
@@ -363,9 +411,9 @@ diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plug
  		self.jitterOverPerimeterWidth = settings.FloatSpin().getFromValue(1.0, 'Jitter Over Perimeter Width (ratio):', self, 3.0, 2.0)
  		self.executeTitle = 'Jitter'
  
-diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py
+diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py
 --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py	2011-02-09 08:31:44.000000000 +0100
-+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py	2011-12-13 16:06:52.000000000 +0100
++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py	2011-12-13 16:40:24.000000000 +0100
 @@ -88,7 +88,7 @@
  		'Set the default settings, execute title & settings fileName.'
  		skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.limit.html', self )
@@ -375,9 +423,9 @@ diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plug
  		self.maximumInitialFeedRate = settings.FloatSpin().getFromValue(0.5, 'Maximum Initial Feed Rate (mm/s):', self, 10.0, 1.0)
  		self.maximumZFeedRatePerSecond = settings.FloatSpin().getFromValue(0.5, 'Maximum Z Feed Rate (mm/s):', self, 10.0, 1.0)
  		self.executeTitle = 'Limit'
-diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py
+diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py
 --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py	2011-02-09 08:33:32.000000000 +0100
-+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py	2011-12-13 16:09:08.000000000 +0100
++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py	2011-12-13 16:40:24.000000000 +0100
 @@ -105,7 +105,7 @@
  		self.fileNameInput = settings.FileNameInput().getFromFileName(
  			fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Multiply', self, '')
@@ -387,9 +435,9 @@ diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plug
  		settings.LabelSeparator().getFromRepository(self)
  		settings.LabelDisplay().getFromName('- Center -', self )
  		self.centerX = settings.FloatSpin().getFromValue(-100.0, 'Center X (mm):', self, 100.0, 0.0)
-diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py
+diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py
 --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py	2011-04-23 09:44:37.000000000 +0200
-+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py	2011-12-13 16:12:12.000000000 +0100
++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py	2011-12-13 16:40:24.000000000 +0100
 @@ -358,7 +358,7 @@
  		self.baseInfillDensity = settings.FloatSpin().getFromValue(0.3, 'Base Infill Density (ratio):', self, 0.9, 0.5)
  		self.baseLayerThicknessOverLayerThickness = settings.FloatSpin().getFromValue(
@@ -408,9 +456,9 @@ diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plug
  		self.interfaceNozzleLiftOverInterfaceLayerThickness = settings.FloatSpin().getFromValue(
  			0.25, 'Interface Nozzle Lift over Interface Layer Thickness (ratio):', self, 0.85, 0.45)
  		settings.LabelSeparator().getFromRepository(self)
-diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py
+diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py
 --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py	2011-02-22 08:41:38.000000000 +0100
-+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py	2011-12-13 16:08:40.000000000 +0100
++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py	2011-12-13 16:40:24.000000000 +0100
 @@ -148,15 +148,15 @@
  		self.dutyCycleAtBeginning = settings.FloatSpin().getFromValue( 0.0, 'Duty Cyle at Beginning (portion):', self, 1.0, 1.0 )
  		self.dutyCycleAtEnding = settings.FloatSpin().getFromValue( 0.0, 'Duty Cyle at Ending (portion):', self, 1.0, 0.0 )
@@ -432,9 +480,9 @@ diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plug
  		self.executeTitle = 'Speed'
  
  	def execute(self):
-diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py
+diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py
 --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py	2011-02-09 08:31:01.000000000 +0100
-+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py	2011-12-13 16:08:09.000000000 +0100
++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py	2011-12-13 16:40:24.000000000 +0100
 @@ -122,7 +122,7 @@
  		"Set the default settings, execute title & settings fileName."
  		skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.temperature.html', self )
@@ -444,9 +492,9 @@ diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge_plugins/craft_plug
  		settings.LabelSeparator().getFromRepository(self)
  		settings.LabelDisplay().getFromName('- Rate -', self )
  		self.coolingRate = settings.FloatSpin().getFromValue( 1.0, 'Cooling Rate (Celcius/second):', self, 20.0, 3.0 )
-diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge.py target/SF41/skeinforge_application/skeinforge.py
+diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge.py target/SF41/skeinforge_application/skeinforge.py
 --- ori/41/skeinforge_application/skeinforge.py	2011-04-27 02:14:25.000000000 +0200
-+++ target/SF41/skeinforge_application/skeinforge.py	2011-12-13 16:31:35.000000000 +0100
++++ target/SF41/skeinforge_application/skeinforge.py	2011-12-14 15:07:47.000000000 +0100
 @@ -228,6 +228,7 @@
  from skeinforge_application.skeinforge_utilities import skeinforge_profile
  import os
@@ -463,24 +511,41 @@ diff -r -x'*.pyc' -u ori/41/skeinforge_application/skeinforge.py target/SF41/ske
  
  
  class SkeinforgeRepository:
-@@ -568,13 +568,17 @@
+@@ -568,13 +568,35 @@
  		settings.LabelDisplay().getFromName('', self)
  		importantFileNames = ['craft', 'profile']
  		getRadioPluginsAddPluginGroupFrame(archive.getSkeinforgePluginsPath(), importantFileNames, getPluginFileNames(), self)
 -		self.executeTitle = 'Skeinforge'
 +		self.executeTitle = 'Skeinforge a file...'
++	
++	def getPyPyExe(self):
++		pypyExe = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../pypy-1.7/pypy.exe"));
++		if os.path.exists(pypyExe):
++			return pypyExe
++		pypyExe = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../pypy-1.7/bin/pypy"));
++		if os.path.exists(pypyExe):
++			return pypyExe
++		pypyExe = "/bin/pypy";
++		if os.path.exists(pypyExe):
++			return pypyExe
++		pypyExe = "/usr/bin/pypy";
++		if os.path.exists(pypyExe):
++			return pypyExe
++		pypyExe = "/usr/local/bin/pypy";
++		if os.path.exists(pypyExe):
++			return pypyExe
++		return False
  
  	def execute(self):
  		'Skeinforge button has been clicked.'
  		fileNames = skeinforge_polyfile.getFileOrDirectoryTypesUnmodifiedGcode(self.fileNameInput.value, fabmetheus_interpret.getImportPluginFileNames(), self.fileNameInput.wasCancelled)
++		pypyExe = self.getPyPyExe()
  		for fileName in fileNames:
 -			skeinforge_craft.writeOutput(fileName)
-+			if platform.python_implementation() == "PyPy":
++			if pypyExe == False or platform.python_implementation() == "PyPy":
 +				skeinforge_craft.writeOutput(fileName)
 +			else:
-+				pypyExe = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../pypy-1.7/pypy"));
 +				os.system(pypyExe + " '" + fileName + "'");
  
  	def save(self):
  		'Profile has been saved and profile menu should be updated.'
-Only in target/SF41: test_export.gcode