mkduino 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11a2abcc1b68c38d34f5bf1763fd2cf5227a4e01
-  data.tar.gz: e89d95f2c2733d0aa92cd3d863808ad16eb5bfb2
+  metadata.gz: de0f4ee565df942d0e8e9f2dccd172fdf20b3641
+  data.tar.gz: 2cc271faf1f3776cbcb7efab8667f68cbe39190f
 SHA512:
-  metadata.gz: dc9e49b821fb7e42562fb9f56f005bfc172029b62b00c874199493b5c9dc286af0ac78ba80e53beb38acbea34b5df538b3160856d6e8f635651afbf991a23a02
-  data.tar.gz: 6f67a86c6b0936e9db46082e96246ce80f30b327bf8308964818f519f1c68e7fe76fe9a89efb4bb0b6b0943cbdb43352d0eb72cbfdcee0a1535bfc5e71cf9b6c
+  metadata.gz: 38d1996ef00ea152d12c75eba66caa81c1424776f86b24b1732f005bfd01a9788eff1ff2fdca114d45fe3d9c9694f376788ece36c60069c232192ea82f8a3363
+  data.tar.gz: 7aad23e98edaf57cee23f1c0c585dbe2f53d9dfdad09dca114bc04c4eb8d0faa69d202e0e6a558b97e3bab1b9cf53c9280aa614b3c4b1a23440a5152a19cce78

data/bin/mkduino

@@ -23,6 +23,13 @@
 # MA 02111-1307 USA
 #
 
+#
+# get_updates -> backup files -> output -> save -> apply_updates
+#
+
+
+
+
 require "mkduino"
 require 'optparse'
 
@@ -33,7 +40,8 @@ OptionParser.new do |opts|
   options[:update] = false
   options[:overwrite] = false
   options[:num_args] = ARGV.length
-
+  options[:autoconfigure] = false
+  options[:device] = "standard"
   opts.banner = "Usage: #{opts.program_name} [options]"
   opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
     options[:verbose] = v
@@ -44,6 +52,9 @@ OptionParser.new do |opts|
 #  opts.on("-u","--[no-]update","Update current project files") do |v|
 #    options[:update] = v
 #  end
+  opts.on('-a',"--[no-]autoconfigure","automatically run autogen.sh and configure") do |v|
+    options[:autoconfigure] = v
+  end
   opts.on("-o","--[no-]overwrite","Overwrite current project files") do |v|
     options[:overwrite] = v
   end
@@ -59,14 +70,9 @@ OptionParser.new do |opts|
 
 end.parse!
 
-if((Pathname.new("Makefile.am").exist? ||
-    Pathname.new("configure.ac").exist? ||
-    Pathname.new("autogen.sh").exist? ||
-    Pathname.new("config/config.h").exist? ||
-    Pathname.new("NEWS").exist? ||
-    Pathname.new("README").exist? ||
-    Pathname.new("AUTHORS").exist? ||
-    Pathname.new("ChangeLog").exist?) && !options[:overwrite])
+if !options[:overwrite] && Mkduino::GENERATED_FILES.collect do |gf|
+    Pathname.new("Makefile.am").exist? ? true : nil
+  end.compact.any?
   puts "Please supply --overwrite to ovewrite existing files"
   exit
 end
@@ -78,7 +84,7 @@ ma.find_arduino_libraries '/usr/share/arduino/libraries'
 ma.find_arduino_libraries '/usr/share/arduino/hardware/arduino/cores'
 ma.find_source_files
 ca = Mkduino::ConfigureAc.new ma
-as = Mkduino::AutogenSh.new
+as = Mkduino::AutogenSh.new "autogen.sh"
 if options[:verbose]
   puts ma.to_yaml
 end
@@ -99,7 +105,6 @@ as.write_autogen_sh
 #
 # A few shell commands required to make it all tidy
 #
-`chmod +x autogen.sh`
 `mkdir m4` unless Dir.exist?('m4')
 `mkdir config` unless Dir.exist?('config')
 `touch config/config.h`
@@ -108,6 +113,19 @@ as.write_autogen_sh
 `touch AUTHORS`
 `touch ChangeLog`
 
-puts "*******************************"
-puts "** now run ./autogen.sh      **"
-puts "*******************************"
+if options[:autoconfigure]
+  `./autogen.sh`
+  unless Dir.exist?('build')
+    Dir.mkdir('build')
+  end
+  Dir.chdir("build")
+  `../configure --host=avr`
+  `make hex`
+  puts "*******************************"
+  puts "** now run cd build ; make   **"
+  puts "*******************************"
+else
+  puts "*******************************"
+  puts "** now run ./autogen.sh      **"
+  puts "*******************************"
+end

data/lib/autogen_sh.rb

@@ -0,0 +1,51 @@
+# autogen_sh.rb
+#
+# (C) Copyright 2013,2014
+# David H. Wilkins  <dwilkins@conecuh.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+module Mkduino
+  class AutogenSh < GeneratedFile
+    def initialize output_filename = 'autogen.sh', options = {}
+      super output_filename, options
+    end
+    def write_autogen_sh
+      puts("Writing #{@output_filename}")
+      write_file do |f|
+        f.puts <<-AUTOGEN_SH
+#!/bin/sh
+if [ -e 'Makefile.am' ] ; then
+    echo "Makefile.am Exists - reconfiguring..."
+    autoreconf --force --install -I config -I m4
+    echo
+    echo
+    echo "************************************"
+    echo "** Now run mkdir build ; cd build ; ../configure --host=avr **"
+    echo "************************************"
+    exit
+fi
+echo "Lets get your project started!"
+
+echo '## Process this file with automake to produce Makefile.in' >> Makefile.am
+echo No Makefile.am
+AUTOGEN_SH
+      end
+      `chmod +x #{@output_directory}#{@output_filename}`
+    end
+  end
+end

data/lib/configure_ac.rb

@@ -0,0 +1,67 @@
+# configure_ac.rb
+#
+# (C) Copyright 2013,2014
+# David H. Wilkins  <dwilkins@conecuh.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+module Mkduino
+  class ConfigureAc < Mkduino::GeneratedFile
+    attr_accessor :makefile_am, :output_filename
+    def initialize makefile_am, output_filename = 'configure.ac', options = {}
+      super output_filename, options
+      @makefile_am = makefile_am
+    end
+
+    def write_configure_ac
+      write_file do |f|
+        f.puts <<-CONFIGURE_AC
+dnl Process this file with autoconf to produce a configure script.")
+AC_INIT([#{makefile_am.project_name}], [1.0])
+dnl AC_CONFIG_SRCDIR( [ Makefile.am ] )
+AM_INIT_AUTOMAKE
+AM_CONFIG_HEADER(config.h)
+dnl AM_CONFIG_HEADER(config.h)
+dnl Checks for programs.
+AC_PROG_CC( avr-gcc )
+AC_PROG_CXX( avr-g++ )
+AC_PROG_RANLIB( avr-ranlib )
+AC_PATH_PROG(OBJCOPY, avr-objcopy)
+AC_PATH_PROG(AVRDUDE, avrdude)
+
+AC_ISC_POSIX
+
+dnl Checks for libraries.
+
+dnl Checks for header files.
+AC_HAVE_HEADERS( Arduino.h )
+
+dnl Checks for library functions.
+
+dnl Check for st_blksize in struct stat
+
+
+dnl internationalization macros
+AC_OUTPUT([Makefile])
+
+CONFIGURE_AC
+      end
+      return
+
+    end
+  end
+end

data/lib/file_generator.rb

@@ -0,0 +1,46 @@
+
+
+module Mkduino
+  class GeneratedFile
+    attr_accessor :output_filename, :output_directory
+    attr_accessor :backup_directory, :user_updates_file
+
+    def initialize output_filename, options = {}
+      @output_filename = output_filename
+      @output_directory = options[:output_directory] || '.' + File::SEPARATOR
+      @backup_directory = options[:backup_directory] || 'generated'
+      @user_updates_file = options[:user_updates_file] || @output_filename + ".patch"
+
+      @output_directory = @output_directory + File::SEPARATOR unless @output_directory[-1] == File::SEPARATOR
+      @backup_directory = @backup_directory + File::SEPARATOR unless @backup_directory[-1] == File::SEPARATOR
+      puts "GeneratedFile.output_filename " + @output_filename
+    end
+
+    def write_file
+      File.open("#{@output_directory}#{@output_filename}","w") do |f|
+        yield f
+      end
+    end
+
+    def save_file
+      unless Dir.exist?(@backup_directory)
+        Dir.mkdir(@backup_directory)
+      end
+      File::cp("#{output_directory}#{@output_filename}",@backup_directory)
+    end
+
+    def save_user_updates
+      if(Pathname.new("#{output_directory}#{@output_file}").exist? &&
+         Pathname.new("#{@backup_directory}#{@output_file}"))
+        `diff -u #{@backup_directory}#{output_file} #{@output_directory}#{output_file} > #{user_updates_file}`
+      end
+
+    end
+
+    def apply_user_updates
+      `patch < #{user_updates_file}`
+    end
+
+
+  end
+end

data/lib/makefile_am.rb

@@ -1,3 +1,23 @@
+# makefile_am.rb
+#
+# (C) Copyright 2013,2014
+# David H. Wilkins  <dwilkins@conecuh.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
 #
 # 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
@@ -18,7 +38,7 @@ module Mkduino
       @project_name.tr!('.-','__')
       @source_files = []
       @header_files = []
-      @project_includes = []
+      @project_includes = ["."]
       @arduino_sources = []
       @arduino_includes = []
       @arduino_libraries = []
@@ -268,9 +288,11 @@ 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
+.PHONY: upload hex
+hex: all-am
 	$(OBJCOPY) -S -O $(FORMAT) $(bin_PROGRAMS) $(bin_PROGRAMS).hex
+
+upload: hex
 	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH)
 MAKEFILE_AM
 

data/lib/mkduino/version.rb

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

data/lib/mkduino.rb

@@ -1,3 +1,25 @@
+# mkduino.rb
+#
+# (C) Copyright 2013,2014
+# David H. Wilkins  <dwilkins@conecuh.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+
 require "mkduino/version"
 require 'yaml'
 require 'find'
@@ -6,10 +28,22 @@ require 'fileutils'
 
 include FileUtils
 
+require_relative "file_generator"
 require_relative "makefile_am"
-
+require_relative "configure_ac"
+require_relative "autogen_sh"
 
 module Mkduino
+  GENERATED_FILES = ["Makefile.am",
+                     "configure.ac",
+                     "autogen.sh",
+                     "config/config.h",
+                     "NEWS",
+                     "README",
+                     "AUTHORS",
+                     "ChangeLog"]
+
+
   #
   # Represents the files needed for a particular arduino library
   #
@@ -57,74 +91,4 @@ LIBRARY_OUTPUT
   end
 
 
-  class ConfigureAc
-    attr_accessor :makefile_am
-    def initialize makefile_am
-      @makefile_am = makefile_am
-    end
-    def write_configure_ac
-      ##
-      # Output the configure.ac file
-      ##
-      puts "Writing configure.ac"
-      File.open('configure.ac',"w") do |f|
-        f.puts <<-CONFIGURE_AC
-dnl Process this file with autoconf to produce a configure script.")
-AC_INIT([#{makefile_am.project_name}], [1.0])
-dnl AC_CONFIG_SRCDIR( [ Makefile.am ] )
-AM_INIT_AUTOMAKE
-AM_CONFIG_HEADER(config.h)
-dnl AM_CONFIG_HEADER(config.h)
-dnl Checks for programs.
-AC_PROG_CC( avr-gcc )
-AC_PROG_CXX( avr-g++ )
-AC_PROG_RANLIB( avr-ranlib )
-AC_PATH_PROG(OBJCOPY, avr-objcopy)
-AC_PATH_PROG(AVRDUDE, avrdude)
-
-AC_ISC_POSIX
-
-dnl Checks for libraries.
-
-dnl Checks for header files.
-AC_HAVE_HEADERS( Arduino.h )
-
-dnl Checks for library functions.
-
-dnl Check for st_blksize in struct stat
-
-
-dnl internationalization macros
-AC_OUTPUT([Makefile])
-
-CONFIGURE_AC
-
-      end
-    end
-  end
-
-  class AutogenSh
-    def write_autogen_sh
-      puts("Writing autogen.sh")
-      File.open('autogen.sh',"w") do |f|
-      f.puts <<-AUTOGEN_SH
-#!/bin/sh
-if [ -e 'Makefile.am' ] ; then
-    echo "Makefile.am Exists - reconfiguring..."
-    autoreconf --force --install -I config -I m4
-    echo
-    echo
-    echo "************************************"
-    echo "** Now run mkdir build ; cd build ; ../configure --host=avr **"
-    echo "************************************"
-    exit
-fi
-echo "Lets get your project started!"
-
-echo '## Process this file with automake to produce Makefile.in' >> Makefile.am
-echo No Makefile.am
-AUTOGEN_SH
-      end
-    end
-  end
 end

metadata

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