rake_embedded 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74c975fa72cf4b3e251eef21b1c58e410a450c50
-  data.tar.gz: 3d0b351e1329012cfbeb101c07026c029cee10ab
+  metadata.gz: 8f3dd484badd571285488c81d68d73f5336c8f05
+  data.tar.gz: 707d64c3576cb9ecc3d48adbb69974e793de4062
 SHA512:
-  metadata.gz: b933a4a9794f7ece35351b0f231fe9eae15bad951390a3f940f0e1a4c07bdaa9406b647add4515751c720b90b97bfa7e55fff66f73fb16a96e33a67934b4253f
-  data.tar.gz: 8e7157db9eb61c973b860b5e600e40e1962e36d8d36ed3091bbb2c5797fed2889427b0e1c26c15160c48aecc163351ee4e0f9f462d5f14599a95b9983b165148
+  metadata.gz: f778c915957b8a1f9dd8b221d85819e4d9af085c4d131a5806f53f373e83d33a4e4b1a052282e1dc7ea59424f143870c354491711568653ad9a9f52d1cb2d252
+  data.tar.gz: 40abec82a74b7a571efa6e3114083994c442d60734f561ccc2cbe22b4f7336e4cf257956c719271e0cb5b023e14de197c2f6ba91bf8a7d97ba5a9c07da83db51

data/README.md

@@ -21,7 +21,7 @@ REM is a Yocto like buildsystem primarily intended for microcontrollers. It is b
 
 ## 1. Install dependencies
 ```Shell
-sudo apt-get install rubygems gcc-arm-none-eabi gcc-avr avr-libc git subversion unzip wget make python sdcc sdcc-libraries cppcheck
+sudo apt-get install rubygems gcc-arm-none-eabi gcc-avr avr-libc git subversion unzip wget curl make python sdcc sdcc-libraries cppcheck
 ```
 
 ## 2. Install REM buildsystem
@@ -141,6 +141,9 @@ After the successful execution you should reinvoke the rem build command to rebu
     - nrf24le1_24
     - nrf24le1_32
     - nrf24le1_48
+    - nrf51822
 * Microchip
     - PIC32MX2
     - PIC32MZ2048
+* RISC-V
+    - HiFive1

data/rake_embedded/version.rb

@@ -1,3 +1,3 @@
 module RakeEmbedded
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/rem_core.rb

@@ -25,6 +25,9 @@ require_relative "scripts/misc/print_functions"
 # Global Config
 require_relative "scripts/global_config/global_config"
 
+# At first set the main rakefile base directory
+global_config.set_rakefile_dir(File.dirname(__FILE__))
+
 if(SIMPLECOV == "1")
     require 'simplecov'
     SimpleCov.command_name "rem codecoverage"
@@ -48,9 +51,9 @@ else
 end
 
 # Prepare and Patch tasks:
-require_relative "scripts/download_tasks/DefaultTasks"
-require_relative "scripts/prepare_tasks/DefaultTasks"
-require_relative "scripts/patch_tasks/DefaultTasks"
+require_relative "scripts/download_tasks/download"
+require_relative "scripts/prepare_tasks/prepare"
+require_relative "scripts/patch_tasks/patch"
 
 # Generic
 require_relative "scripts/package"
@@ -76,38 +79,33 @@ namespace :package do
     global_package_list = []
     global_dep_chain = []
 
-    # At first set the main rakefile base directory
-    global_config.set_rakefile_dir(File.dirname(__FILE__))
-
     # Check if a rem_file was already generated
     if File.exist?(global_config.get_remfile())
-        temp_pkgs = yaml_parse(global_config.get_remfile())
-        # We need to extend all build functions here, as they're not
-        # restored when loading the yaml file
-        temp_pkgs.each { |pkg| pkg.post_initialize() }
+        rem_recipes = yaml_parse(global_config.get_remfile(), false)
+        remappend_recipes = yaml_parse(global_config.get_remfile(), true)
     else
         print_debug("Parsing recipes...")
         rem_recipes = get_recipes("#{global_config.get_project_folder()}", "rem")
-        if rem_recipes == nil
-            print_abort ("No recipes found!")
-        end
+        remappend_recipes = get_recipes("#{global_config.get_project_folder()}", "remappend")
+    end
 
-        temp_pkgs = prepare_recipes(rem_recipes)
+    if rem_recipes == nil
+        print_abort ("No recipes found!")
+    end
 
-        remappend_recipes = get_recipes("#{global_config.get_project_folder()}", "remappend")
-        if remappend_recipes != nil
-            temp_pkgs_append = prepare_recipes(remappend_recipes, true)
-            merge_recipes_append(temp_pkgs, temp_pkgs_append)
-        end
+    temp_pkgs = prepare_recipes(rem_recipes)
 
-        temp_pkgs = filter_packages(temp_pkgs, "#{global_config.arch}", "#{global_config.mach}")
-        temp_pkgs.each { |pkg| pkg.post_initialize() }
+    if remappend_recipes != nil
+        temp_pkgs_append = prepare_recipes(remappend_recipes)
+        merge_recipes_append(temp_pkgs, temp_pkgs_append)
     end
 
+    temp_pkgs = filter_packages(temp_pkgs, "#{global_config.arch}", "#{global_config.mach}")
+
     global_package_list = temp_pkgs
 
     # We get a list of all dependencies of the global dependencies
-    # so that we eclude these from adding the global one
+    # so that we exclude these from adding the global one
     # otherwise we would get a lot of circular dependencies
     glob_dep_list_to_exclude = []
     global_config.get_global_deps.each do |glob_dep|
@@ -196,7 +194,7 @@ namespace :package do
                     dep_ref_array = []
                     dep_chain.each do |dep|
                         dep_ref = pkg_get_ref_by_name(package_list, dep, pkg_ref.name)
-                        dep_ref_array.push(dep_ref)
+                        dep_ref_array.concat(dep_ref.get_package_recipe_files)
                         print_any_green("Writing #{dep_ref.name}")
                     end
                     yaml_store(remfile, "pkg", dep_ref_array)
@@ -475,7 +473,6 @@ namespace :package do
         global_package_list.each do |pkg|
             print_debug "#{pkg.name}"
             print_debug "\t\t\t#{pkg.version[0]}"
-            print_debug ""
         end
     end
 end

data/scripts/build_functions/gcc/compile.rb

@@ -0,0 +1,43 @@
+=begin
+
+    Copyright (C) 2018 Franz Flasch <franz.flasch@gmx.at>
+
+    This file is part of REM - Rake for EMbedded Systems and Microcontrollers.
+
+    REM 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 3 of the License, or
+    (at your option) any later version.
+
+    REM 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 REM.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
+module Compile
+    private
+        def do_compile_clean
+        end
+
+        def do_compile
+            print_debug "hey I am the Default compile function"
+
+            print_debug "IncDirsDependsPrepared: #{inc_dirs_depends_prepared}"
+            print_debug "IncDirsPrepared: #{inc_dirs_prepared}"
+            print_debug "SrcFilesPrepared: #{src_files_prepared}"
+
+            inc_dirs_string = inc_dirs_depends_prepared.map { |element| "-I #{element} " }.join("")
+            inc_dirs_string << inc_dirs_prepared.map { |element| "-I #{element} " }.join("")
+
+            defines_string = defs.map { |element| "-D#{element} " }.join("")
+            defines_string << "#{global_config.get_defines()}"
+
+            src_files_prepared.each_with_index  do |src, obj|
+                execute "#{global_config.get_compiler} #{defines_string} #{global_config.get_compile_flags} #{inc_dirs_string} -c #{src} -o #{obj_files_prepared[obj]}"
+            end
+        end
+end

data/scripts/build_functions/gcc/default.rb

@@ -0,0 +1,23 @@
+=begin
+
+    Copyright (C) 2018 Franz Flasch <franz.flasch@gmx.at>
+
+    This file is part of REM - Rake for EMbedded Systems and Microcontrollers.
+
+    REM 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 3 of the License, or
+    (at your option) any later version.
+
+    REM 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 REM.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
+require_relative "./compile"
+require_relative "./link"
+require_relative "./image"

data/scripts/build_functions/gcc/image.rb

@@ -0,0 +1,34 @@
+=begin
+
+    Copyright (C) 2018 Franz Flasch <franz.flasch@gmx.at>
+
+    This file is part of REM - Rake for EMbedded Systems and Microcontrollers.
+
+    REM 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 3 of the License, or
+    (at your option) any later version.
+
+    REM 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 REM.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
+module Image
+    private
+        def do_make_bin
+            execute "#{global_config.get_obj_cp} #{global_config.get_obj_copy_flags} -S -O binary #{pkg_deploy_dir}/#{name}.elf #{pkg_deploy_dir}/#{name}.bin"
+        end
+
+        def do_make_hex
+            execute "#{global_config.get_obj_cp} #{global_config.get_obj_copy_flags} -S -O ihex #{pkg_deploy_dir}/#{name}.elf #{pkg_deploy_dir}/#{name}.hex"
+        end
+
+        def do_make_srec
+            execute "#{global_config.get_obj_cp} #{global_config.get_obj_copy_flags} -S -O srec #{pkg_deploy_dir}/#{name}.elf #{pkg_deploy_dir}/#{name}.srec"
+        end
+end

data/scripts/build_functions/gcc/link.rb

@@ -0,0 +1,46 @@
+=begin
+
+    Copyright (C) 2018 Franz Flasch <franz.flasch@gmx.at>
+
+    This file is part of REM - Rake for EMbedded Systems and Microcontrollers.
+
+    REM 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 3 of the License, or
+    (at your option) any later version.
+
+    REM 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 REM.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
+module Link
+    private
+        def do_link_clean
+        end
+
+        def do_prepare_link_string
+            tmp_str = ""
+            global_linker_flags.each do |e|
+                tmp_str.concat("#{e} ")
+            end
+
+            # Set linker script
+            unless linker_script[0].to_s.strip.empty?
+                tmp_str.concat("-T #{pkg_build_dir}/#{linker_script[0]} ")
+            end
+
+            return tmp_str
+        end
+
+        def do_link(objs)
+            print_debug "hey I am the Default link function"
+            print_debug "Objects to link: #{objs}"
+            objs_string = objs.join(" ")
+            execute "#{global_config.get_compiler} #{objs_string} #{global_config.get_link_flags} -Wl,-Map=#{pkg_deploy_dir}/#{name}.map -o #{pkg_deploy_dir}/#{name}.elf"
+        end
+end

data/scripts/build_functions/sdcc/default.rb

@@ -0,0 +1,23 @@
+=begin
+
+    Copyright (C) 2018 Franz Flasch <franz.flasch@gmx.at>
+
+    This file is part of REM - Rake for EMbedded Systems and Microcontrollers.
+
+    REM 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 3 of the License, or
+    (at your option) any later version.
+
+    REM 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 REM.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
+require_relative "../gcc/compile"
+require_relative "./link"
+require_relative "./image"

data/scripts/build_functions/sdcc/image.rb

@@ -0,0 +1,34 @@
+=begin
+
+    Copyright (C) 2018 Franz Flasch <franz.flasch@gmx.at>
+
+    This file is part of REM - Rake for EMbedded Systems and Microcontrollers.
+
+    REM 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 3 of the License, or
+    (at your option) any later version.
+
+    REM 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 REM.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
+module Image
+    private
+        def do_make_bin
+            print_abort("Not implemented")
+        end
+
+        def do_make_hex
+            print_abort("Not implemented")
+        end
+
+        def do_make_srec
+            print_abort("Not implemented")
+        end
+end

data/scripts/build_functions/sdcc/link.rb

@@ -0,0 +1,41 @@
+=begin
+
+    Copyright (C) 2018 Franz Flasch <franz.flasch@gmx.at>
+
+    This file is part of REM - Rake for EMbedded Systems and Microcontrollers.
+
+    REM 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 3 of the License, or
+    (at your option) any later version.
+
+    REM 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 REM.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
+module Link
+    private
+        def do_link_clean
+        end
+
+        def do_prepare_link_string
+            tmp_str = ""
+            global_linker_flags.each do |e|
+                tmp_str.concat("#{e} ")
+            end
+
+            return tmp_str
+        end
+
+        def do_link(objs)
+            print_debug "hey I am the Default link function"
+            print_debug "Objects to link: #{objs}"
+            objs_string = objs.join(" ")
+            execute "#{global_config.get_compiler} #{global_config.get_link_flags()} #{objs_string} -o #{pkg_deploy_dir}/#{name}.ihx"
+        end
+end

data/scripts/download_tasks/download.rb

@@ -0,0 +1,47 @@
+=begin
+
+    Copyright (C) 2018 Franz Flasch <franz.flasch@gmx.at>
+
+    This file is part of REM - Rake for EMbedded Systems and Microcontrollers.
+
+    REM 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 3 of the License, or
+    (at your option) any later version.
+
+    REM 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 REM.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
+module DownloadPackage
+
+    private
+
+        def download_compressed_file
+            #execute "wget -c #{uri[0].uri} -P #{pkg_dl_dir}"
+            FileUtils.mkdir_p("#{pkg_dl_dir}")
+            execute "curl -o #{pkg_dl_dir}/#{get_filename_from_uri(uri[0].uri)} -LOk #{uri[0].uri}"
+        end
+
+        def do_download_clean
+            FileUtils.rm_rf("#{pkg_dl_dir}")
+        end
+
+        def do_download
+            case uri[0].uri_type
+                when "zip"
+                    print_debug "Zip package"
+                    download_compressed_file()
+                when "gz"
+                    print_debug "GZ package"
+                    download_compressed_file()
+                else
+                    print_debug('No zip package, falling through...')
+            end
+        end
+end

data/scripts/package.rb

@@ -56,6 +56,8 @@ module PackageDescriptor
         # unique hash of the package
         attr_reader :unique_hash
 
+        # abs path to rem file:
+        attr_reader :recipe_paths
         # base_dir: recipe file location
         attr_reader :base_dir
         # pkg_dl_dir: download location
@@ -90,14 +92,6 @@ module PackageDescriptor
         # pkg_work_dir: work directory
         attr_reader :pkg_work_dir
 
-        # specific package data - not really used at the moment, but it is intended to
-        # be used for build tasks other than the DefaultTasks - please see below:
-        # At the moment the this class is only extended by default tasks
-        attr_reader :download_specific_data
-        attr_reader :prepare_specific_data
-        attr_reader :patch_specific_data
-        attr_reader :build_specific_data
-
         ### SETTERS ###
 
         # No ARRAY values
@@ -109,7 +103,15 @@ module PackageDescriptor
             @unique_hash = hash
         end
 
-        # ARRAY values - (only the first one is used)
+        # ARRAY values
+        def add_recipe_path(recipe_file)
+            (@recipe_paths||= []).push(recipe_file)
+        end
+
+        def add_base_dir(recipe_file)
+            (@base_dir||= []).push(get_dirname_from_uri(recipe_file))
+        end
+
         def set_uri(uri)
             tmp_str = string_strip(uri).strip
             (@uri = []).concat([PackageUri.new(tmp_str)])
@@ -136,10 +138,6 @@ module PackageDescriptor
            (@linker_script = []).concat(string_strip_to_array(script))
         end
 
-        def set_build_specific_data(data)
-            (@build_specific_data = []).concat([data])
-        end
-
         # full ARRAY values
         def set_src(src)
             (@srcs ||= []).concat(string_strip_to_array(src))
@@ -176,6 +174,10 @@ module PackageDescriptor
 
 
         ### GETTERS ###
+        def get_package_recipe_files
+            return recipe_paths
+        end
+
         def get_package_state_file(which)
             return "#{pkg_state_dir}/#{which}"
         end
@@ -198,10 +200,6 @@ module PackageDescriptor
             return mach[0].strip()
         end
 
-        def get_build_specific_data
-            return build_specific_data[0]
-        end
-
     private
         ### Private set methods
 
@@ -210,7 +208,8 @@ module PackageDescriptor
             set_name(get_filename_without_extension_from_uri(recipe_file))
             set_unique_hash("nohash")
 
-            (@base_dir||= []).push(get_dirname_from_uri(recipe_file))
+            add_base_dir(recipe_file)
+            add_recipe_path(recipe_file)
         end
 
         def default_setup_settables()
@@ -237,8 +236,6 @@ module PackageDescriptor
             @linker_script = set_linker_script("")
 
             @instance_var_to_reset = []
-
-            @build_specific_data = set_build_specific_data(nil)
         end
 
         def set_download_done()
@@ -265,10 +262,7 @@ class SoftwarePackage
         # Extend with various modules here
         include PackageBuildFunctions
 
-        def initialize(recipe_file)
-            default_setup_identifiers(recipe_file)
-            default_setup_settables()
-
+        def load_package(recipe_file)
             # OK, we are done with the default setup, now load the recipe file and setup internals
             sw_package_set(self)
             load "./#{recipe_file}"
@@ -276,6 +270,13 @@ class SoftwarePackage
             # override the above defined function here, this way it is possible
             # to use "sw_package." in the method context also (for e.g if custom build methods are used)
             def sw_package; return self; end
+        end
+
+        def initialize(recipe_file)
+            default_setup_identifiers(recipe_file)
+            default_setup_settables()
+
+            load_package(recipe_file)
 
             @src_files_prepared = []
             @obj_files_prepared = []
@@ -288,56 +289,44 @@ class SoftwarePackage
             # Make sanity checks here:
             check_duplicates_exit_with_error(deps, "deps in package #{name}")
             check_duplicates_exit_with_error(srcs, "srcs in package #{name}")
-        end
 
-        def post_initialize
+            extend DownloadPackage
+            extend PreparePackageBuildDir
+            extend Patch
+            extend Compile
+            extend Link
+            extend Image
+        end
 
-            case "#{download_specific_data.class.name}"
-                when "NilClass"
-                    extend DefaultDownload::DownloadPackage
-                else
-                    print_abort("Package download_type #{download_specific_data.class.name} not known")
+        def override_func(name, &block)
+            (class << self; self; end).class_eval do
+            define_method name, &block
             end
+        end
 
-            case "#{prepare_specific_data.class.name}"
-                when "NilClass"
-                    extend DefaultPrepare::PreparePackageBuildDir
-                else
-                    print_abort("Package download_type #{prepare_specific_data.class.name} not known")
+        def invalidate_build_funcs
+            self.override_func :do_compile_clean do
+                print_abort("not implemented")
             end
 
-            case "#{patch_specific_data.class.name}"
-                when "NilClass"
-                    extend DefaultPatch::Patch
-                else
-                    print_abort("Package download_type #{patch_specific_data.class.name} not known")
+            self.override_func :do_compile do
+                print_abort("not implemented")
             end
 
-            case "#{build_specific_data[0].class.name}"
-                when "NilClass"
-                    extend Default::Compile
-                    extend Default::Link
-                    extend Default::Image
-                when "MakeTasksDesc"
-                    extend MakePkg::Compile
-                    extend MakePkg::Link
-                    extend MakePkg::Image
-                    print_any_yellow("Using class #{build_specific_data[0].class.name} for package #{name}")
-                else
-                    print_abort("Package build_type #{build_specific_data[0].class.name} not known")
+            self.override_func :do_link_clean do
+                print_abort("not implemented")
             end
-        end
-end
 
-class SoftwarePackageAppend
-    include PackageDescriptor
+            self.override_func :do_link do |objs|
+                print_abort("not implemented")
+            end
 
-    def initialize(recipe_file)
-            # Only setup the identifiers
-            default_setup_identifiers(recipe_file)
+            self.override_func :do_make_bin do
+                print_abort("not implemented")
+            end
 
-            # OK, we are done with the default setup, now load the recipe file and setup internals
-            sw_package_set(self)
-            load "./#{recipe_file}"
-    end
+            self.override_func :do_make_hex do
+                print_abort("not implemented")
+            end
+        end
 end