X-Git-Url: https://git.hcoop.net/clinton/Smoothieware.git/blobdiff_plain/e6b3d64c67c9a0aa2ffbfd845ef53751887c64e9..27fdf0205958dcbc13241679f16587d79842c879:/Rakefile

diff --git a/Rakefile b/Rakefile
index 105e13cb..1e7536c3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -97,8 +97,6 @@ unless defined? NONETWORK
 end
 
 # list of modules to exclude, include directory it is in
-EXCLUDE_MODULES= %w(tools/touchprobe) unless defined? EXCLUDE_MODULES
-
 # e.g for a CNC machine
 #EXCLUDE_MODULES = %w(tools/touchprobe tools/laser tools/temperaturecontrol tools/extruder)
 
@@ -114,13 +112,26 @@ else
   nonetwork= false
 end
 
+# see if CNC build
+if ENV['CNC'] || CNC
+  cnc= true
+  excludes << 'panel\/screens\/3dprinter'
+  puts "CNC build"
+else
+  excludes << 'panel\/screens\/cnc'
+  cnc= false
+end
+
 if TESTING
   # add modules to be tested here
-  TESTMODULES= %w(tools/temperatureswitch)
+  TESTMODULES= %w(tools/temperatureswitch) unless defined? EXCLUDE_MODULES
   puts "Modules under test: #{TESTMODULES}"
   excludes << %w(Kernel.cpp main.cpp) # we replace these with mock versions in testframework
-  testmodules= FileList['src/testframework/*.{c,cpp}', 'src/testframework/easyunit/*.{c,cpp}', 'src/modules/communication/SerialConsole.cpp', 'src/modules/communication/utils/Gcode.cpp'].include(TESTMODULES.collect { |e| "src/modules/#{e}/**/*.{c,cpp}"}).include(TESTMODULES.collect { |e| "src/testframework/unittests/#{e}/*.{c,cpp}"})
-  SRC = FileList['src/libs/**/*.{c,cpp}'].exclude(/#{excludes.join('|')}/) + testmodules
+
+  frameworkfiles= FileList['src/testframework/*.{c,cpp}', 'src/testframework/easyunit/*.{c,cpp}']
+  extrafiles= FileList['src/modules/communication/SerialConsole.cpp', 'src/modules/communication/utils/Gcode.cpp', 'src/modules/robot/Conveyor.cpp', 'src/modules/robot/Block.cpp']
+  testmodules= FileList['src/libs/**/*.{c,cpp}'].include(TESTMODULES.collect { |e| "src/modules/#{e}/**/*.{c,cpp}"}).include(TESTMODULES.collect { |e| "src/testframework/unittests/#{e}/*.{c,cpp}"}).exclude(/#{excludes.join('|')}/)
+  SRC =  frameworkfiles + extrafiles + testmodules
 else
   excludes << %w(testframework)
   SRC = FileList['src/**/*.{c,cpp}'].exclude(/#{excludes.join('|')}/)
@@ -190,6 +201,7 @@ defines += MRI_DEFINES
 defines << "-DDEFAULT_SERIAL_BAUD_RATE=#{DEFAULT_SERIAL_BAUD_RATE}"
 defines << '-DDEBUG' if OPTIMIZATION == 0
 defines << '-DNONETWORK' if nonetwork
+defines << '-DCNC' if cnc
 
 DEFINES= defines.join(' ')
 
@@ -283,7 +295,7 @@ file "#{PROG}.bin" => ["#{PROG}.elf"] do
 end
 
 file "#{PROG}.elf" => OBJ do |t|
-  puts "Linking #{t.source}"
+  puts "Linking"
   sh "#{LD} #{LDFLAGS} #{OBJ} #{LIBS}  -o #{OBJDIR}/#{t.name}"
 end