mkduino 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d2ade613b46584cd90dbd376faef4987aa974ef
-  data.tar.gz: e89abc2128f6b7f86a395e3f4b68450aab1488d8
+  metadata.gz: 11a2abcc1b68c38d34f5bf1763fd2cf5227a4e01
+  data.tar.gz: e89d95f2c2733d0aa92cd3d863808ad16eb5bfb2
 SHA512:
-  metadata.gz: 254bc74e8c603664cc0c66967d6dc6019bbd1358ccec8891892dab4a5c1ac47a2ce55d9e0bbd6db096f2eee7d9d4633fe43c2adb503cbc2cd4c3a5a16929046b
-  data.tar.gz: 79dbe0352efcd1c1857d4debc989ef80b5e0792a52a14b9ce388ee660a9880d3a2dac98b14d8f3c5dc77111cfe4c013312c7cab98f23547d6495ace741ae8580
+  metadata.gz: dc9e49b821fb7e42562fb9f56f005bfc172029b62b00c874199493b5c9dc286af0ac78ba80e53beb38acbea34b5df538b3160856d6e8f635651afbf991a23a02
+  data.tar.gz: 6f67a86c6b0936e9db46082e96246ce80f30b327bf8308964818f519f1c68e7fe76fe9a89efb4bb0b6b0943cbdb43352d0eb72cbfdcee0a1535bfc5e71cf9b6c

data/lib/makefile_am.rb

@@ -0,0 +1,281 @@
+#
+# Class that keeps up with the stuff needed for the Makefile.am file
+# this is most of the stuff needed to generate the automake stuff
+#
+
+module Mkduino
+  class MakefileAm
+    attr_accessor :source_files, :header_files, :arduino_sources
+    attr_accessor :project_name, :project_author, :project_dir
+    attr_accessor :project_includes
+    # future stuff
+    attr_accessor :git_project
+    attr_accessor :board, :common_includes
+
+    def initialize
+      @project_dir =  Dir.pwd
+      @project_name = File.basename @project_dir
+      @project_name.tr!('.-','__')
+      @source_files = []
+      @header_files = []
+      @project_includes = []
+      @arduino_sources = []
+      @arduino_includes = []
+      @arduino_libraries = []
+      @project_author = {}
+      @git_project = nil
+      @common_libraries = ['arduino', 'spi','wire']
+      @libraries_to_skip = {
+        'standard' => ['Esplora','GSM','Robot_Control','Robot_Motor','TFT','robot']
+      }
+      @board='standard'
+      @project_author[:username] = ENV['USERNAME']
+      git_exists = `which git`.chomp
+      if git_exists &&  git_exists.length > 0
+        @project_author[:name] = `git config --get user.name`.chomp
+        @project_author[:email] = `git config --get user.email`.chomp
+        @git_project = `git remote show -n origin 2> /dev/null | grep 'Fetch URL:' | cut -f 5 -d ' '`.chomp
+      else
+        @project_author[:name] = @project_author[:username]
+        @project_author[:email]= @project_author[:username]
+        @git_project = "no_git_project"
+      end
+    end
+
+    #
+    # Add a source file that we found in this directory
+    #
+    def add_source_file(file)
+      @source_files << "../" + Pathname.new(file).relative_path_from(Pathname.new(@project_dir)).to_s
+    end
+    def add_header_file(file)
+      @header_files << "../" + Pathname.new(file).relative_path_from(Pathname.new(@project_dir)).to_s
+    end
+
+    def add_include_path file
+      pn = Pathname.new(file)
+      puts "!! ******** File #{file} not found ******** " unless pn.exist?
+      include_dir = pn.file? ? pn.dirname : file
+      @project_includes << include_dir.to_s unless @project_includes.include? include_dir.to_s
+    end
+
+
+    #
+    # As libraries are found, add them to our collection
+    # if they're not already there
+    #
+    def add_arduino_library library
+      @arduino_libraries << library  if !arduino_library library
+    end
+
+    #
+    # fetch a library from our collection - nil if not there
+    #
+
+    def arduino_library library
+      @arduino_libraries.each do |l|
+        return l if l.name == library
+      end
+      nil
+    end
+
+    #
+    # output the Makefile.am macro needed for some include
+    # files from libraries that are apparently always needed
+    #
+    def common_includes
+      @arduino_libraries.collect do |l|
+        @common_libraries.include?(l.name) ? "$(lib#{l.name}_a_INCLUDES)" : nil
+      end.compact.join(' ')
+    end
+
+
+    def source_file_pattern
+      /\.([c])(pp|)$/
+    end
+
+    def header_file_pattern
+      /\.([h])(pp|)$/
+    end
+
+    #
+    # output a list of all the libraries that are needed here
+    # for Makefile.am.   The project will depend on these
+    #
+    def arduino_library_names
+      @arduino_libraries.collect do |l|
+        l.library_name
+      end
+    end
+
+    #
+    # return the linker entries for all of the libraries that we
+    # know about
+    #
+    def arduino_linker_entries
+      @arduino_libraries.collect do |l|
+        "-l#{l.linker_name}"
+      end
+    end
+
+    #
+    # after finding all of the Arduino libraries, go through each
+    # one of them asking them to output themselves.
+    #
+
+    def output_arduino_libraries
+      output = @arduino_libraries.collect do |l|
+        l.makefile_am_output
+      end.join("\n")
+      #
+      # After all of the library compile lines are output, output
+      # a comprehensive list of all of the include directories associated
+      # with the libraries.   Used for the source project
+      #
+      output += "\nLIBRARY_INCLUDES="
+      output += @arduino_libraries.collect do |l|
+        "$(lib#{l.name}_a_INCLUDES)"
+      end.join(' ')
+    end
+
+    def find_arduino_libraries libraries_dir
+      lib = nil
+      Find.find(libraries_dir) do |path|
+        if FileTest.directory?(path)
+          if File.basename(path)[0] == ?. || File.basename(path) == 'examples' ||
+              (@libraries_to_skip[@board] && @libraries_to_skip[@board].include?(File.basename(path)) )
+            Find.prune       # Don't look any further into this directory.
+          else
+            if File.dirname(path) == libraries_dir
+              lib_name = path.split('/')[-1]
+              lib = arduino_library(lib_name) || ArduinoLibrary.new(lib_name)
+              add_arduino_library lib
+            end
+            next
+          end
+        elsif path =~ source_file_pattern
+          lib.add_source_file path
+        elsif path =~ header_file_pattern
+          lib.add_include_path path
+        end
+      end
+    end
+
+    def find_source_files
+      #
+      # Root around for some source file
+      # and add them to the Makefile.am
+      #
+      Find.find(Dir.pwd) do |path|
+        if FileTest.directory?(path)
+          if File.basename(path)[0] == ?.
+            Find.prune       # Don't look any further into this directory.
+          else
+            next
+          end
+        elsif path =~ source_file_pattern
+          add_source_file path
+        elsif path =~ header_file_pattern
+          add_header_file path
+          add_include_path path
+
+        end
+      end
+
+      #
+      # If no source files were found, make
+      # the src/ directory and put in a
+      # sample main.cpp file
+      #
+      if source_files.length < 1
+        `mkdir src`  unless Dir.exist?('src')
+        File.open('src/main.cpp',"w") do |f|
+          f.puts <<-MAIN_CPP
+#include <Arduino.h>
+
+extern "C" void __cxa_pure_virtual(void) {
+    while(1);
+}
+
+void setup() {
+  Serial.begin(115200);
+  Serial.println("Startup...");
+}
+
+void loop() {
+}
+
+
+
+int main(void)
+{
+  init();
+  setup();
+  for (;;){
+    loop();
+  }
+  return 0;
+}
+MAIN_CPP
+        end
+        add_source_file project_dir + '/src/main.cpp'
+      end
+    end
+
+
+
+
+    def write_makefile_am
+      puts "Writing Makefile.am"
+      File.open('Makefile.am',"w") do |f|
+        f.puts <<-MAKEFILE_AM
+## Process this file with automake to produce Makefile.in
+bin_PROGRAMS=#{self.project_name}
+# MCU=atmega1280
+MCU=atmega328p
+F_CPU=-DF_CPU=16000000
+ARDUINO_VERSION=-DARDUINO=105
+ARDUINO_INSTALL=/usr/share/arduino/hardware/arduino
+ARDUINO_CORES=$(ARDUINO_INSTALL)/cores/arduino
+ARDUINO_VARIANTS=$(ARDUINO_INSTALL)/variants/#{self.board}
+ARDUINO_COMMON_INCLUDES=#{self.common_includes}
+ARDUINO_INCLUDE_PATH=-I$(ARDUINO_VARIANTS) $(LIBRARY_INCLUDES)
+nodist_#{self.project_name}_SOURCES=#{self.source_files.join(' ')}
+
+#{self.project_name}_CFLAGS=-Wall $(#{self.project_name}_INCLUDES) $(ARDUINO_INCLUDE_PATH) -Wl,--gc-sections -ffunction-sections -fdata-sections -gstabs -mmcu=$(MCU) $(F_CPU) $(ARDUINO_VERSION) -D__AVR_LIBC_DEPRECATED_ENABLE__
+#{self.project_name}_CXXFLAGS=-Wall $(#{self.project_name}_INCLUDES) $(ARDUINO_INCLUDE_PATH) -Wl,--gc-sections -ffunction-sections -fdata-sections -gstabs -mmcu=$(MCU) $(F_CPU) $(ARDUINO_VERSION) -D__AVR_LIBC_DEPRECATED_ENABLE__
+#{self.project_name}_LDFLAGS=-L.
+#{self.project_name}_LDADD=#{self.arduino_linker_entries.join(' ')} -lm
+#{self.project_name}_INCLUDES=-I#{self.project_includes.join("\\\n                    -I")}
+
+lib_LIBRARIES=#{self.arduino_library_names.join(' ')}
+#{self.output_arduino_libraries}
+
+
+AM_LDFLAGS=
+AM_CXXFLAGS=-g0 -Os
+AM_CFLAGS=-g0 -Os
+VPATH=/usr/share/arduino/hardware/arduino/cores/arduino
+
+# AVRDUDE_PORT=/dev/ttyACM0
+AVRDUDE_PORT=/dev/ttyUSB0
+AVRDUDE_PROGRAMMER = arduino
+# UPLOAD_RATE = 115200
+UPLOAD_RATE = 57600
+FORMAT=ihex
+
+AVRDUDE_WRITE_FLASH = -U flash:w:$(bin_PROGRAMS).hex
+AVRDUDE_FLAGS = -q -D -C/etc/avrdude/avrdude.conf -p$(MCU) -P$(AVRDUDE_PORT) -c$(AVRDUDE_PROGRAMMER) -b$(UPLOAD_RATE)
+
+
+.PHONY: upload
+upload: all-am
+	$(OBJCOPY) -S -O $(FORMAT) $(bin_PROGRAMS) $(bin_PROGRAMS).hex
+	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH)
+MAKEFILE_AM
+
+      end
+    end
+
+  end
+end

data/lib/mkduino/version.rb

@@ -1,3 +1,3 @@
 module Mkduino
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/mkduino.rb

@@ -6,6 +6,9 @@ require 'fileutils'
 
 include FileUtils
 
+require_relative "makefile_am"
+
+
 module Mkduino
   #
   # Represents the files needed for a particular arduino library
@@ -53,286 +56,6 @@ LIBRARY_OUTPUT
     end
   end
 
-  #
-  # Class that keeps up with the stuff needed for the Makefile.am file
-  # this is most of the stuff needed to generate the automake stuff
-  #
-
-  class MakefileAm
-    attr_accessor :source_files, :header_files, :arduino_sources
-    attr_accessor :project_name, :project_author, :project_dir
-    attr_accessor :project_includes
-    # future stuff
-    attr_accessor :git_project
-    attr_accessor :board, :common_includes
-
-    def initialize
-      @project_dir =  Dir.pwd
-      @project_name = File.basename @project_dir
-      @project_name.tr!('.','_')
-      @source_files = []
-      @header_files = []
-      @project_includes = []
-      @arduino_sources = []
-      @arduino_includes = []
-      @arduino_libraries = []
-      @project_author = {}
-      @git_project = nil
-      @common_libraries = ['arduino', 'spi','wire']
-      @libraries_to_skip = {
-        'standard' => ['Esplora','GSM','Robot_Control','Robot_Motor','TFT','robot']
-      }
-      @board='standard'
-      @project_author[:username] = ENV['USERNAME']
-      git_exists = `which git`.chomp
-      if git_exists &&  git_exists.length > 0
-        @project_author[:name] = `git config --get user.name`.chomp
-        @project_author[:email] = `git config --get user.email`.chomp
-        @git_project = `git remote show -n origin 2> /dev/null | grep 'Fetch URL:' | cut -f 5 -d ' '`.chomp
-      else
-        @project_author[:name] = @project_author[:username]
-        @project_author[:email]= @project_author[:username]
-        @git_project = "no_git_project"
-      end
-    end
-
-    #
-    # Add a source file that we found in this directory
-    #
-    def add_source_file(file)
-      @source_files << "../" + Pathname.new(file).relative_path_from(Pathname.new(@project_dir)).to_s
-    end
-    def add_header_file(file)
-      @header_files << "../" + Pathname.new(file).relative_path_from(Pathname.new(@project_dir)).to_s
-    end
-
-    def add_include_path file
-      pn = Pathname.new(file)
-      puts "!! ******** File #{file} not found ******** " unless pn.exist?
-      include_dir = pn.file? ? pn.dirname : file
-      @project_includes << include_dir.to_s unless @project_includes.include? include_dir.to_s
-    end
-
-
-    #
-    # As libraries are found, add them to our collection
-    # if they're not already there
-    #
-    def add_arduino_library library
-      @arduino_libraries << library  if !arduino_library library
-    end
-
-    #
-    # fetch a library from our collection - nil if not there
-    #
-
-    def arduino_library library
-      @arduino_libraries.each do |l|
-        return l if l.name == library
-      end
-      nil
-    end
-
-    #
-    # output the Makefile.am macro needed for some include
-    # files from libraries that are apparently always needed
-    #
-    def common_includes
-      @arduino_libraries.collect do |l|
-        @common_libraries.include?(l.name) ? "$(lib#{l.name}_a_INCLUDES)" : nil
-      end.compact.join(' ')
-    end
-
-
-    def source_file_pattern
-      /\.([c])(pp|)$/
-    end
-
-    def header_file_pattern
-      /\.([h])(pp|)$/
-    end
-
-    #
-    # output a list of all the libraries that are needed here
-    # for Makefile.am.   The project will depend on these
-    #
-    def arduino_library_names
-      @arduino_libraries.collect do |l|
-        l.library_name
-      end
-    end
-
-    #
-    # return the linker entries for all of the libraries that we
-    # know about
-    #
-    def arduino_linker_entries
-      @arduino_libraries.collect do |l|
-        "-l#{l.linker_name}"
-      end
-    end
-
-    #
-    # after finding all of the Arduino libraries, go through each
-    # one of them asking them to output themselves.
-    #
-
-    def output_arduino_libraries
-      output = @arduino_libraries.collect do |l|
-        l.makefile_am_output
-      end.join("\n")
-      #
-      # After all of the library compile lines are output, output
-      # a comprehensive list of all of the include directories associated
-      # with the libraries.   Used for the source project
-      #
-      output += "\nLIBRARY_INCLUDES="
-      output += @arduino_libraries.collect do |l|
-        "$(lib#{l.name}_a_INCLUDES)"
-      end.join(' ')
-    end
-
-    def find_arduino_libraries libraries_dir
-      lib = nil
-      Find.find(libraries_dir) do |path|
-        if FileTest.directory?(path)
-          if File.basename(path)[0] == ?. || File.basename(path) == 'examples' ||
-              (@libraries_to_skip[@board] && @libraries_to_skip[@board].include?(File.basename(path)) )
-            Find.prune       # Don't look any further into this directory.
-          else
-            if File.dirname(path) == libraries_dir
-              lib_name = path.split('/')[-1]
-              lib = arduino_library(lib_name) || ArduinoLibrary.new(lib_name)
-              add_arduino_library lib
-            end
-            next
-          end
-        elsif path =~ source_file_pattern
-          lib.add_source_file path
-        elsif path =~ header_file_pattern
-          lib.add_include_path path
-        end
-      end
-    end
-
-    def find_source_files
-      #
-      # Root around for some source file
-      # and add them to the Makefile.am
-      #
-      Find.find(Dir.pwd) do |path|
-        if FileTest.directory?(path)
-          if File.basename(path)[0] == ?.
-            Find.prune       # Don't look any further into this directory.
-          else
-            next
-          end
-        elsif path =~ source_file_pattern
-          add_source_file path
-        elsif path =~ header_file_pattern
-          add_header_file path
-          add_include_path path
-
-        end
-      end
-
-      #
-      # If no source files were found, make
-      # the src/ directory and put in a
-      # sample main.cpp file
-      #
-      if source_files.length < 1
-        `mkdir src`  unless Dir.exist?('src')
-        File.open('src/main.cpp',"w") do |f|
-          f.puts <<-MAIN_CPP
-#include <Arduino.h>
-
-extern "C" void __cxa_pure_virtual(void) {
-    while(1);
-}
-
-void setup() {
-  Serial.begin(115200);
-  Serial.println("Startup...");
-}
-
-void loop() {
-}
-
-
-
-int main(void)
-{
-  init();
-  setup();
-  for (;;){
-    loop();
-  }
-  return 0;
-}
-MAIN_CPP
-        end
-        add_source_file project_dir + '/src/main.cpp'
-      end
-    end
-
-
-
-
-    def write_makefile_am
-      puts "Writing Makefile.am"
-      File.open('Makefile.am',"w") do |f|
-        f.puts <<-MAKEFILE_AM
-## Process this file with automake to produce Makefile.in
-bin_PROGRAMS=#{self.project_name}
-# MCU=atmega1280
-MCU=atmega328p
-F_CPU=-DF_CPU=16000000
-ARDUINO_VERSION=-DARDUINO=105
-ARDUINO_INSTALL=/usr/share/arduino/hardware/arduino
-ARDUINO_CORES=$(ARDUINO_INSTALL)/cores/arduino
-ARDUINO_VARIANTS=$(ARDUINO_INSTALL)/variants/#{self.board}
-ARDUINO_COMMON_INCLUDES=#{self.common_includes}
-ARDUINO_INCLUDE_PATH=-I$(ARDUINO_VARIANTS) $(LIBRARY_INCLUDES)
-nodist_#{self.project_name}_SOURCES=#{self.source_files.join(' ')}
-
-#{self.project_name}_CFLAGS=-Wall $(#{self.project_name}_INCLUDES) $(ARDUINO_INCLUDE_PATH) -Wl,--gc-sections -ffunction-sections -fdata-sections -gstabs -mmcu=$(MCU) $(F_CPU) $(ARDUINO_VERSION) -D__AVR_LIBC_DEPRECATED_ENABLE__
-#{self.project_name}_CXXFLAGS=-Wall $(#{self.project_name}_INCLUDES) $(ARDUINO_INCLUDE_PATH) -Wl,--gc-sections -ffunction-sections -fdata-sections -gstabs -mmcu=$(MCU) $(F_CPU) $(ARDUINO_VERSION) -D__AVR_LIBC_DEPRECATED_ENABLE__
-#{self.project_name}_LDFLAGS=-L.
-#{self.project_name}_LDADD=#{self.arduino_linker_entries.join(' ')} -lm
-#{self.project_name}_INCLUDES=-I#{self.project_includes.join("\\\n                    -I")}
-
-lib_LIBRARIES=#{self.arduino_library_names.join(' ')}
-#{self.output_arduino_libraries}
-
-
-AM_LDFLAGS=
-AM_CXXFLAGS=-g0 -Os
-AM_CFLAGS=-g0 -Os
-VPATH=/usr/share/arduino/hardware/arduino/cores/arduino
-
-# AVRDUDE_PORT=/dev/ttyACM0
-AVRDUDE_PORT=/dev/ttyUSB0
-AVRDUDE_PROGRAMMER = arduino
-# UPLOAD_RATE = 115200
-UPLOAD_RATE = 57600
-FORMAT=ihex
-
-AVRDUDE_WRITE_FLASH = -U flash:w:$(bin_PROGRAMS).hex
-AVRDUDE_FLAGS = -q -D -C/etc/avrdude/avrdude.conf -p$(MCU) -P$(AVRDUDE_PORT) -c$(AVRDUDE_PROGRAMMER) -b$(UPLOAD_RATE)
-
-
-.PHONY: upload
-upload: all-am
-	$(OBJCOPY) -S -O $(FORMAT) $(bin_PROGRAMS) $(bin_PROGRAMS).hex
-	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH)
-MAKEFILE_AM
-
-      end
-    end
-
-  end
-
 
   class ConfigureAc
     attr_accessor :makefile_am

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mkduino
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - David H. Wilkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,7 @@ files:
 - README.md
 - Rakefile
 - bin/mkduino
+- lib/makefile_am.rb
 - lib/mkduino.rb
 - lib/mkduino/version.rb
 - mkduino.gemspec