rake_embedded 0.1.4 → 0.1.5

data/tests/tests/TEST_append_features.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/>.
+
 set -e
 
 REM_PATH=$1
@@ -13,5 +30,13 @@ git clone https://github.com/franzflasch/rem_recipe_testing.git
 rem ARCH=avr MACH=atmega168 PROJECT_FOLDER=rem_packages,rem_recipe_testing/avr_append_test,rem_recipe_testing/common -m -j4 package:test_project:image[hex] VERBOSE=1 && echo OK || exit 5
 rm -rf rem_workdir
 
+# Testing the task appending feature
+rem ARCH=arm MACH=stm32f3 PROJECT_FOLDER=rem_packages,rem_recipe_testing/avr_append_task_test/foobar -m -j4 package:foo_task:compile VERBOSE=1 | grep -i "hello from the base recipe" && echo OK || exit 6
+rm -rf rem_workdir
+
+# If adding the append recipe it should be possible to use it on avr and also the compile task should have changed
+rem ARCH=avr MACH=atmega168 PROJECT_FOLDER=rem_packages,rem_recipe_testing/avr_append_task_test -m -j4 package:foo_task:compile VERBOSE=1 | grep -i "hello from the append recipe" && echo OK || exit 6
+rm -rf rem_workdir
+
 rm -rf rem_packages
 rm -rf rem_recipe_testing

data/tests/tests/TEST_build_test_project.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/>.
+
 set -e
 
 REM_PATH=$1
@@ -11,6 +28,8 @@ git clone https://github.com/franzflasch/rem_packages.git
 git clone https://github.com/franzflasch/rem_test_project.git
 git clone https://github.com/franzflasch/rem_libopenpic32.git
 
+rem ARCH=native MACH=linux PROJECT_FOLDER=rem_packages,rem_test_project -m -j4 package:test_project:link VERBOSE=1 && echo OK || exit 1
+rm -rf rem_workdir
 rem ARCH=avr MACH=atmega168 PROJECT_FOLDER=rem_packages,rem_test_project -m -j4 package:test_project:image[hex] VERBOSE=1 && echo OK || exit 1
 rm -rf rem_workdir
 rem ARCH=arm MACH=stm32f1 PROJECT_FOLDER=rem_packages,rem_test_project -m -j4 package:test_project:image[bin] VERBOSE=1 && echo OK || exit 2
@@ -19,7 +38,9 @@ rem ARCH=arm MACH=stm32f3 PROJECT_FOLDER=rem_packages,rem_test_project -m -j4 pa
 rm -rf rem_workdir
 rem ARCH=arm MACH=stm32f4 PROJECT_FOLDER=rem_packages,rem_test_project -m -j4 package:test_project:image[bin] VERBOSE=1 && echo OK || exit 4
 rm -rf rem_workdir
-rem ARCH=8051 MACH=nrf24le1_32 PROJECT_FOLDER=rem_packages,rem_test_project -m -j4 package:test_project:image[bin] VERBOSE=1 && echo OK || exit 5
+rem ARCH=arm MACH=nrf51822 PROJECT_FOLDER=rem_packages,rem_test_project -m -j4 package:test_project:image[bin] VERBOSE=1 && echo OK || exit 4
+rm -rf rem_workdir
+rem ARCH=8051 MACH=nrf24le1_32 PROJECT_FOLDER=rem_packages,rem_test_project -m -j4 package:test_project:link VERBOSE=1 && echo OK || exit 5
 rm -rf rem_workdir
 rem ARCH=mips MACH=pic32mx2 PROJECT_FOLDER=rem_test_project,rem_libopenpic32,rem_packages package:test_project:image[srec] VERBOSE=1 && echo OK || exit 5
 rm -rf rem_workdir

data/tests/tests/TEST_check_deps_test_project.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/>.
+
 set -e
 
 REM_PATH=$1

data/tests/tests/TEST_global_deps.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/>.
+
 set -e
 
 REM_PATH=$1

data/tests/tests/TEST_remfile.sh

@@ -0,0 +1,39 @@
+#!/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/>.
+
+set -e
+
+REM_PATH=$1
+
+echo REMPATH $REM_PATH
+export PATH=$REM_PATH:$PATH
+
+git clone https://github.com/franzflasch/rem_packages.git
+git clone https://github.com/franzflasch/rem_recipe_testing.git
+
+# Test remfile generation
+rem ARCH=avr MACH=atmega168 PROJECT_FOLDER=rem_packages,rem_recipe_testing/avr_append_task_test package:foo_task:remfile_generate -m -j4  VERBOSE=1 && echo OK || exit 1
+
+cat rem_workdir/avr_atmega168/build/pkgs.rem_file | grep rem_recipe_testing/avr_append_task_test/foobar/foo_task.rem && echo OK || exit 2
+cat rem_workdir/avr_atmega168/build/pkgs.rem_file | grep rem_recipe_testing/avr_append_task_test/append/foo_task.remappend && echo OK || exit 3
+
+rm -rf rem_workdir
+
+rm -rf rem_packages
+rm -rf rem_recipe_testing

data/tests/tests/TEST_remove_unused_functions.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/>.
+
 set -e
 
 REM_PATH=$1
@@ -11,7 +28,7 @@ export PATH=$REM_PATH/shell_scripts:$PATH
 git clone https://github.com/franzflasch/rem_packages.git
 git clone https://github.com/franzflasch/rem_test_project.git
 
-rem ARCH=8051 MACH=nrf24le1_32 PROJECT_FOLDER=rem_packages,rem_test_project -m -j4 package:test_project:image[bin] VERBOSE=1 && echo OK || exit 1
+rem ARCH=8051 MACH=nrf24le1_32 PROJECT_FOLDER=rem_packages,rem_test_project -m -j4 package:test_project:link VERBOSE=1 && echo OK || exit 1
 comment_unused_functions_cppcheck.sh rem_workdir/8051_nrf24le1_32/build "rem_workdir/8051_nrf24le1_32/build/nrf24le1_sdk_nohash/" && echo OK || exit 2
 rm -rf rem_workdir
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_embedded
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Franz Flasch
 autorequire: 
 bindir: "."
 cert_chain: []
-date: 2017-12-29 00:00:00.000000000 Z
+date: 2018-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -74,10 +74,17 @@ files:
 - rem.png
 - rem_core.rb
 - rem_path.rb
+- scripts/build_functions/gcc/compile.rb
+- scripts/build_functions/gcc/default.rb
+- scripts/build_functions/gcc/image.rb
+- scripts/build_functions/gcc/link.rb
 - scripts/build_functions/package_build_functions.rb
+- scripts/build_functions/sdcc/default.rb
+- scripts/build_functions/sdcc/image.rb
+- scripts/build_functions/sdcc/link.rb
 - scripts/dependency_functions/dependency_graph.rb
 - scripts/dependency_functions/dependency_tasks.rb
-- scripts/download_tasks/DefaultTasks.rb
+- scripts/download_tasks/download.rb
 - scripts/global_config/config_helper/check_env.rb
 - scripts/global_config/config_helper/config.rb
 - scripts/global_config/global_config.rb
@@ -85,8 +92,8 @@ files:
 - scripts/misc/helper_string_parse.rb
 - scripts/misc/print_functions.rb
 - scripts/package.rb
-- scripts/patch_tasks/DefaultTasks.rb
-- scripts/prepare_tasks/DefaultTasks.rb
+- scripts/patch_tasks/patch.rb
+- scripts/prepare_tasks/prepare.rb
 - scripts/recipe_handling/recipes.rb
 - scripts/remfile_functions/remfile_gen.rb
 - shell_scripts/check_deps.sh
@@ -103,6 +110,7 @@ files:
 - tests/tests/TEST_build_test_project.sh
 - tests/tests/TEST_check_deps_test_project.sh
 - tests/tests/TEST_global_deps.sh
+- tests/tests/TEST_remfile.sh
 - tests/tests/TEST_remove_unused_functions.sh
 homepage: https://github.com/franzflasch/REM
 licenses:

data/scripts/download_tasks/DefaultTasks.rb

@@ -1,49 +0,0 @@
-=begin
-
-    Copyright (C) 2015 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 DefaultDownload
-    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
-end

data/scripts/prepare_tasks/DefaultTasks.rb

@@ -1,82 +0,0 @@
-=begin
-
-    Copyright (C) 2015 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 DefaultPrepare
-    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
-end