rake_embedded 0.1.4 → 0.1.5

data/scripts/patch_tasks/{DefaultTasks.rb → patch.rb}

@@ -1,6 +1,6 @@
 =begin
 
-    Copyright (C) 2015 Franz Flasch <franz.flasch@gmx.at>
+    Copyright (C) 2018 Franz Flasch <franz.flasch@gmx.at>
 
     This file is part of REM - Rake for EMbedded Systems and Microcontrollers.
 
@@ -18,16 +18,14 @@
     along with REM.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
-module DefaultPatch
-    module Patch
+module Patch
 
-        private
+    private
 
-            def do_patch
-                main_working_dir = Rake.original_dir
-                patches.each do |e|
-                    execute "patch -d #{get_pkg_work_dir} -i #{pkg_build_dir}/#{e} -p1 -t"
-                end
+        def do_patch
+            main_working_dir = Rake.original_dir
+            patches.each do |e|
+                execute "patch -d #{get_pkg_work_dir} -i #{pkg_build_dir}/#{e} -p1 -t"
             end
-    end
-end
+        end
+end

data/scripts/prepare_tasks/prepare.rb

@@ -0,0 +1,80 @@
+=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 PreparePackageBuildDir
+
+    private
+
+        def prepare_copy
+            base_dir.each do |dir|
+                FileUtils.cp_r("#{dir}/.", pkg_build_dir, {:remove_destination => true, :verbose => false})
+            end
+        end
+
+        def prepare_clone_git
+            execute "git clone #{uri[0].uri} #{pkg_build_dir}"
+            if(uri[0].uri_src_rev != "undefined")
+                execute "git --git-dir=#{pkg_build_dir}/.git --work-tree=#{pkg_build_dir} checkout #{uri[0].uri_src_rev}"
+            end
+        end
+
+        def prepare_checkout_svn
+            execute "svn co --non-interactive --trust-server-cert #{uri[0].uri} #{pkg_build_dir}"
+            if(uri[0].uri_src_rev != "undefined")
+                # TODO: add possibilty to checkout specific revision
+            end
+        end
+
+        def prepare_zip
+            execute "unzip -qq #{pkg_dl_dir}/#{get_filename_from_uri(uri[0].uri)} -d #{pkg_build_dir}"
+        end
+
+        def prepare_gz
+            FileUtils.mkdir_p("#{pkg_build_dir}")
+            execute "tar -xvf #{pkg_dl_dir}/#{get_filename_from_uri(uri[0].uri)} -C #{pkg_build_dir}"
+        end
+
+        def do_prepare_clean
+            FileUtils.rm_rf(pkg_build_dir)
+        end
+
+        def do_prepare_builddir
+            case uri[0].uri_type
+                when "local"
+                    print_debug "LOCAL package"
+                when "zip"
+                    print_debug "ZIP package"
+                    prepare_zip()
+                when "gz"
+                    print_debug "GZ package"
+                    prepare_gz();
+                when "git"
+                    print_debug "GIT repo"
+                    prepare_clone_git()
+                when "svn"
+                    print_debug "SVN repo"
+                    prepare_checkout_svn()
+                else
+                    print_abort('No valid URI type!')
+            end
+            # files need to be copied in every case:
+            prepare_copy()
+        end
+end

data/scripts/recipe_handling/recipes.rb

@@ -34,7 +34,7 @@ def get_recipes(project_folders, recipe_file_ending)
     return files
 end
 
-def prepare_recipes(recipes, append=false)
+def prepare_recipes(recipes)
     recipe_filenames = []
     pkgs = []
 
@@ -50,12 +50,7 @@ def prepare_recipes(recipes, append=false)
         print_debug "parsing recipe #{r}:"
 
         # Parse and include submakefiles
-        if(append == true)
-            cur_pkg = SoftwarePackageAppend.new(r)
-        else
-            cur_pkg = SoftwarePackage.new(r)
-        end
-
+        cur_pkg = SoftwarePackage.new(r)
         pkgs.push(cur_pkg)
     end
     return pkgs
@@ -86,17 +81,18 @@ def merge_recipes_append(recipe_list, append_recipe_list)
                 append_pkg.instance_variable_get(:@instance_var_to_reset).clear
             end
 
-            # Now merge the append recipe instance variables with the base recipe
-            append_pkg.instance_variables.each do |var|
-                print_any_yellow("#{var} before appending: #{tmp_pkg.instance_variable_get("#{var}")}")
 
-                # At the moment only array types will get appended
-                if tmp_pkg.instance_variable_get(var).kind_of?(Array)
-                    val_to_append = append_pkg.instance_variable_get(var)
-                    tmp_pkg.instance_variable_get(var).concat(val_to_append)
-                    print_any_yellow("Appending #{var} #{val_to_append} to recipe #{tmp_pkg.name}")
-                    print_any_cyan("#{var} is now #{tmp_pkg.instance_variable_get("#{var}")}")
-                end
+            # OK now simply load the new append package into the base package
+            tmp_pkg.load_package(append_pkg.get_package_recipe_files[0])
+
+            # Add the remappend path
+            tmp_pkg.add_recipe_path(append_pkg.get_package_recipe_files[0])
+
+            # Also add the new base_dir
+            tmp_pkg.add_base_dir(append_pkg.get_package_recipe_files[0])
+
+            tmp_pkg.instance_variables.each do |var|
+                print_any_cyan("#{var} is now #{tmp_pkg.instance_variable_get("#{var}")}")
             end
         end
     end

data/scripts/remfile_functions/remfile_gen.rb

@@ -25,15 +25,29 @@ def yaml_store(file, fieldname, data)
     store = YAML::Store.new(file)
     store.transaction do
         store[fieldname] = data
-        #store["compile_sources"] = { "hello" => "world" }
     end
 end
 
-def yaml_parse(file)
-    pkgs = []
+def yaml_parse(file, append)
     data = YAML::load_file(file)
-    data['pkg'].each do |d|
-        pkgs.push(d)
+
+    recipes = []
+
+    data['pkg'].each do |pkg|
+        if append == true
+            if pkg.include? ".remappend"
+                (recipes||= []).push(pkg)
+            end
+        else
+            if !pkg.include? ".remappend"
+                (recipes||= []).push(pkg)
+            end
+        end
+    end
+
+    if recipes.empty? 
+        return nil
+    else
+        return recipes
     end
-    return pkgs
 end

data/shell_scripts/check_deps.sh

@@ -1,18 +1,22 @@
 #!/bin/bash
-#
-#     Copyright (C) 2016 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/>.
-#
+
+# Copyright (C) 2016 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/>.
+
 
 # This script will perform the following tests:
 # At first a recursive "compile test" build with the complete package dependency chain will be done. 

data/shell_scripts/comment_unused_functions_cppcheck.sh

@@ -1,18 +1,21 @@
 #!/bin/bash
-#
-#     Copyright (C) 2016 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/>.
-#
+
+# Copyright (C) 2016 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/>.
 
 folder_to_check=$1
 folders_to_exclude=($2)

data/shell_scripts/find_func_and_comment.sh

@@ -1,18 +1,21 @@
 #!/bin/bash
-#
-#     Copyright (C) 2016 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/>.
-#
+
+# Copyright (C) 2016 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/>.
 
 file_name=$1
 begin_of_function=$2

data/tests/docker/dockerfile_debian_8.dockertest

@@ -6,11 +6,12 @@ FROM debian:jessie
 WORKDIR /home/rem_build
 
 RUN apt-get update -y
-RUN apt-get install -y rake gcc-arm-none-eabi gcc-avr avr-libc git subversion unzip wget curl make python sdcc sdcc-libraries cppcheck
+RUN apt-get install -y build-essential rake gcc-arm-none-eabi gcc-avr avr-libc git subversion unzip wget curl make python sdcc sdcc-libraries cppcheck
 
 # Install mips toolchain manually, as there is no apt-get package available:
-RUN wget https://community.imgtec.com/?do-download=linux-x64-mti-bare-metal-2016-05-03 -O mips_toolchain.tar.gz
+RUN wget https://www.mips.com/?do-download=linux-x64-mti-bare-metal-2016-05-03 -O mips_toolchain.tar.gz
 RUN tar xvf mips_toolchain.tar.gz
+RUN chmod 755 /home/rem_build/mips-mti-elf/2016.05-03/bin /home/rem_build/mips-mti-elf/2016.05-03 /home/rem_build/mips-mti-elf
 ENV PATH /home/rem_build/mips-mti-elf/2016.05-03/bin/:$PATH
 
 RUN git clone https://github.com/franzflasch/REM.git

data/tests/docker/dockerfile_debian_9.dockertest

@@ -6,11 +6,12 @@ FROM debian:stretch
 WORKDIR /home/rem_build
 
 RUN apt-get update -y
-RUN apt-get install -y rake gcc-arm-none-eabi gcc-avr avr-libc git subversion unzip wget curl make python sdcc sdcc-libraries cppcheck
+RUN apt-get install -y build-essential rake gcc-arm-none-eabi gcc-avr avr-libc git subversion unzip wget curl make python sdcc sdcc-libraries cppcheck
 
 # Install mips toolchain manually, as there is no apt-get package available:
-RUN wget https://community.imgtec.com/?do-download=linux-x64-mti-bare-metal-2016-05-03 -O mips_toolchain.tar.gz
+RUN wget https://www.mips.com/?do-download=linux-x64-mti-bare-metal-2016-05-03 -O mips_toolchain.tar.gz
 RUN tar xvf mips_toolchain.tar.gz
+RUN chmod 755 /home/rem_build/mips-mti-elf/2016.05-03/bin /home/rem_build/mips-mti-elf/2016.05-03 /home/rem_build/mips-mti-elf
 ENV PATH /home/rem_build/mips-mti-elf/2016.05-03/bin/:$PATH
 
 RUN git clone https://github.com/franzflasch/REM.git

data/tests/docker/dockerfile_ubuntu_14_04.dockertest

@@ -8,11 +8,12 @@ WORKDIR /home/rem_build
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update -y
-RUN apt-get install -y rake gcc-arm-none-eabi gcc-avr avr-libc git subversion unzip wget curl make python sdcc sdcc-libraries cppcheck
+RUN apt-get install -y build-essential rake gcc-arm-none-eabi gcc-avr avr-libc git subversion unzip wget curl make python sdcc sdcc-libraries cppcheck
 
 # Install mips toolchain manually, as there is no apt-get package available:
-RUN wget https://community.imgtec.com/?do-download=linux-x64-mti-bare-metal-2016-05-03 -O mips_toolchain.tar.gz
+RUN wget https://www.mips.com/?do-download=linux-x64-mti-bare-metal-2016-05-03 -O mips_toolchain.tar.gz
 RUN tar xvf mips_toolchain.tar.gz
+RUN chmod 755 /home/rem_build/mips-mti-elf/2016.05-03/bin /home/rem_build/mips-mti-elf/2016.05-03 /home/rem_build/mips-mti-elf
 ENV PATH /home/rem_build/mips-mti-elf/2016.05-03/bin/:$PATH
 
 RUN git clone https://github.com/franzflasch/REM.git

data/tests/docker/dockerfile_ubuntu_16_04.dockertest

@@ -8,11 +8,12 @@ WORKDIR /home/rem_build
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update -y
-RUN apt-get install -y rake gcc-arm-none-eabi gcc-avr avr-libc git subversion unzip wget curl make python sdcc sdcc-libraries cppcheck
+RUN apt-get install -y build-essential rake gcc-arm-none-eabi gcc-avr avr-libc git subversion unzip wget curl make python sdcc sdcc-libraries cppcheck
 
 # Install mips toolchain manually, as there is no apt-get package available:
-RUN wget https://community.imgtec.com/?do-download=linux-x64-mti-bare-metal-2016-05-03 -O mips_toolchain.tar.gz
+RUN wget https://www.mips.com/?do-download=linux-x64-mti-bare-metal-2016-05-03 -O mips_toolchain.tar.gz
 RUN tar xvf mips_toolchain.tar.gz
+RUN chmod 755 /home/rem_build/mips-mti-elf/2016.05-03/bin /home/rem_build/mips-mti-elf/2016.05-03 /home/rem_build/mips-mti-elf
 ENV PATH /home/rem_build/mips-mti-elf/2016.05-03/bin/:$PATH
 
 RUN git clone https://github.com/franzflasch/REM.git

data/tests/run_all_rem_tests.sh

@@ -1,5 +1,22 @@
 #!/bin/bash
 
+# 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/>.
+
 BASEDIR=$(dirname "$0")
 REM_PATH=$1
 

data/tests/run_docker_test.sh

@@ -1,5 +1,22 @@
 #!/bin/bash
 
+# 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/>.
+
 BASEDIR=$(dirname "$0")
 
 docker build -f $BASEDIR/docker/dockerfile_"$1"_"$2".dockertest .

data/tests/run_docker_tests.sh

@@ -1,5 +1,22 @@
 #!/bin/bash
 
+# 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/>.
+
 BASEDIR=$(dirname "$0")
 
 BUILD_ITEM_NAME=()