ceedling 0.31.1 → 1.0.1

data/plugins/dependencies/README.md

@@ -24,19 +24,26 @@ containing header files that might want to be included by your release project.
 
 So how does all this magic work?
 
-First, you need to add the `:dependencies` plugin to your list. Then, we'll add a new
-section called :dependencies. There, you can list as many dependencies as you desire. Each
-has a series of fields which help Ceedling to understand your needs. Many of them are
-optional. If you don't need that feature, just don't include it! In the end, it'll look
-something like this:
+First, you need to add the Dependencies plugin to your list of enabled plugins. Then, we'll 
+add a new comfiguration section called `:dependencies`. There, you can list as many 
+dependencies as you desire. Each has a series of fields that help Ceedling to understand 
+your needs. Many of them are optional. If you don't need that feature, just don't include 
+it! In the end, it'll look something like this:
+
+```yaml
+:plugins:
+  :enabled:
+    - dependencies
 
-```
 :dependencies:
-  :libraries:
+  :deps:
     - :name: WolfSSL
-      :source_path:   third_party/wolfssl/source
-      :build_path:    third_party/wolfssl/build
-      :artifact_path: third_party/wolfssl/install
+      :paths:
+        :fetch:        third_party/wolfssl/source
+        :source:       third_party/wolfssl/source
+        :build:        third_party/wolfssl/build
+        :artifact_lib: third_party/wolfssl/install
+        :artifact_inc: third_party/wolfssl/install
       :fetch:
         :method: :zip
         :source: \\shared_drive\third_party_libs\wolfssl\wolfssl-4.2.0.zip
@@ -72,25 +79,32 @@ it easier for us to see the name of each dependency with starting dash.
 The name field is only used to print progress while we're running Ceedling. You may
 call the name of the field whatever you wish.
 
-Working Folders
----------------
-
-The `:source_path` field allows us to specify where the source code for each of our
-dependencies is stored. If fetching the dependency from elsewhere, it will be fetched
-to this location. All commands to build this dependency will be executed from
-this location (override this by specifying a `:build_path`). Finally, the output
-artifacts will be referenced to this location (override this by specifying a `:artifact_path`)
-
-If unspecified, the `:source_path` will be `dependencies\dep_name` where `dep_name`
-is the name specified in `:name` above (with special characters removed). It's best,
-though, if you specify exactly where you want your dependencies to live.
+Working Paths
+-------------
+
+All paths are collected under `:dependencies` ↳ `:paths`. The `:source` field allows us 
+to specify where the source code for each of our dependencies is stored. By default, it's
+the same as the `:fetch` path, which is where source will be fetched TO when fetching the 
+dependency from elsewhere. All commands to build this dependency will be executed from
+the `:source` location. Temporary data will be placed in the `:build` location. Unless you're
+using one of Ceedling's built-in builders, you'll need to learn where the tool you're using to
+build places it's built artifacts , and list that here. Finally, the output
+artifacts will be referenced to this location. You override this by specifying a `:artifact`
+path. In summary:
+
+ - `:paths`
+   - `:fetch` -- where things are fetched to (defaults to `build/deps/depname/`)
+   - `:source` -- where we trigger builds (defaults to `:fetch`)
+   - `:build` -- where we have the produced build files (defaults to `<:fetch>/build`)
+   - `:deploy` -- where any produced library files should be copied (defaults to same as release executable)
+   - `:artifact` -- where output libraries can be found (defaults to `:build`)
 
 If the dependency is directly included in your project (you've specified `:none` as the
-`:method` for fetching), then `:source_path` should be where your Ceedling can find the
+`:method` for fetching), then `:source` should be where your Ceedling can find the
 source for your dependency in you repo.
 
-All artifacts are relative to the `:artifact_path` (which defaults to be the same as
-`:source_path`)
+All artifacts are relative to the appropriate `:artifact` path. So if there are multiple 
+include dirs, choose the highest level and make the rest relative from there. 
 
 Fetching Dependencies
 ---------------------
@@ -102,30 +116,43 @@ couple of fields:
 - `:method` -- This is the method that this dependency is fetched.
   - `:none` -- This tells Ceedling that the code is already included in the project.
   - `:zip` -- This tells Ceedling that we want to unpack a zip file to our source path.
+  - `:gzip` -- This tells Ceedling that we want to unpack a gzip file to our source path.
   - `:git` -- This tells Ceedling that we want to clone a git repo to our source path.
   - `:svn` -- This tells Ceedling that we want to checkout a subversion repo to our source path.
   - `:custom` -- This tells Ceedling that we want to use a custom command or commands to fetch the code.
-- `:source` -- This is the path or url to fetch code when using the zip or git method.
-- `:tag`/`:branch` -- This is the specific tag or branch that you wish to retrieve (git only. optional).
-- `:hash` -- This is the specific SHA1 hash you want to fetch (git only. optional, requires a deep clone).
-- `:revision` -- This is the specific revision you want to fetch (svn only. optional).
-- `:executable` -- This is a list of commands to execute when using the `:custom` method
+- `:source` -- This is the path or url to fetch code when using the `:zip`, `:gzip` or `:git` method.
+- `:tag`/`:branch` -- This is the specific tag or branch that you wish to retrieve (`:git` only, optional).
+- `:hash` -- This is the specific SHA1 hash you want to fetch (`:git` only, optional and triggers a deep clone).
+- `:revision` -- This is the specific revision you want to fetch (`:svn` only, optional).
+- `:executable` -- This is a YAML list of commands to execute when using the `:custom` method
 
+Some notes:
+
+The `:source` location for fetching a `:zip` or `:gzip` file is relative to the `:paths` ↳ `:source`
+folder. 
 
 Environment Variables
 ---------------------
 
 Many build systems support customization through environment variables. By specifying
-an array of environment variables, Ceedling will customize the shell environment before
-calling the build process.
+an array of environment variables, the Dependencies plugin will customize the shell environment 
+before calling the build process.
+
+Note that Ceedling’s project configuration includes a top-level `:environment` sections itself.
+The top-level `:environment` section is for all of Ceedling. The `:environment` section nested 
+within a specific dependency’s configuration is only for the shell environment used to process
+that dependency. The format and abilities of the two `:environment` configuration sections are
+also different.
 
 Environment variables may be specified in three ways. Let's look at one of each:
 
-```
-  :environment:
-    - ARCHITECTURE=ARM9
-    - CFLAGS+=-DADD_AWESOMENESS
-    - CFLAGS-=-DWASTE
+```yaml
+:dependencies:
+  <a dependency configuration>:
+    :environment:
+      - ARCHITECTURE=ARM9
+      - CFLAGS+=-DADD_AWESOMENESS
+      - CFLAGS-=-DWASTE
 ```
 
 In the first example, you see the most straightforward method. The environment variable
@@ -199,7 +226,7 @@ In this case, Ceedling is able to automatically add these to its internal source
 these files to be used while building your release code.
 
 Tasks
------
+=====
 
 Once configured correctly, the `:dependencies` plugin should integrate seamlessly into your
 workflow and you shouldn't have to think about it. In the real world, that doesn't always happen.
@@ -240,15 +267,55 @@ dependencies.
 Maybe you want to take that query further and actually get a list of ALL the header files
 Ceedling has found, including those belonging to your dependencies.
 
-Testing
-=======
+Custom Tools
+============
+
+You can optionally specify a compiler, assembler, and linker, just as you would a release build:
+
+```yaml
+:tools:
+  :deps_compiler:
+    :executable: gcc
+    :arguments:
+      - -g
+      - -I"$": COLLECTION_PATHS_SUBPROJECTS
+      - -D$: COLLECTION_DEFINES_SUBPROJECTS
+      - -c "${1}"
+      - -o "${2}"
+  :deps_linker:
+    :executable: ar
+    :arguments:
+      - rcs
+      - ${2}
+      - ${1}
+```
 
-Hopefully all your dependencies are fully tested... but we can't always depend on that.
-In the event that they are tested with Ceedling, you'll probably want to consider using
-the `:subprojects` plugin instead of this one. The purpose of this plugin is to pull in
-third party code for release... and to provide a mockable interface for Ceedling to use
-during its tests of other modules.
+Then, once created, you can reference these tools in your build steps by using the `:build_lib` symbol instead
+of a series of strings to explain all the steps. Ceedling will understand that it should build all the specified
+source and/or assembly files into the specified library:
 
-If that's what you're after... you've found the right plugin!
+```yaml
+:dependencies:
+  :deps:
+    - :name: CaptainCrunch
+      :paths:
+        :fetch:    ../cc/
+        :source:   ../cc/
+        :build:    ../cc/build
+        :artifact: ../cc/build
+      :fetch:
+        :method: :none
+      :environment: []
+      :build:
+        - :build_lib
+      :artifacts:
+        :static_libraries:
+          - release/cc.a
+        :dynamic_libraries: []
+        :includes: 
+          - ./cc.h
+      :defines:
+        - THESE_GET_USED_DURING_COMPILATION
+```
 
 Happy Testing!

data/plugins/dependencies/Rakefile

@@ -0,0 +1,188 @@
+# =========================================================================
+#   Ceedling - Test-Centered Build System for C
+#   ThrowTheSwitch.org
+#   Copyright (c) 2010-24 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   SPDX-License-Identifier: MIT
+# =========================================================================
+
+require 'rake'
+
+require 'rbconfig'
+
+def windows?()
+  return (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
+end
+
+# Add `ruby` to the command line on Windows to execute the Ruby-based shell script bin/ceedling
+CEEDLING_CLI_EXEC = "#{'ruby ' if windows?}../../../../bin/ceedling"
+
+def prep_test
+end
+
+def assert_file_exist(path)
+  if File.exist?(path)
+    puts "File #{path} exists."
+  else
+    raise "File #{path} doesn't exist after create"
+  end
+end
+
+def assert_file_contains(path, expected)
+  if File.exist?(path)
+    actual = File.read(path)
+    if actual.match?(expected)
+      puts "File #{path} exists and contains specified contents."
+    else
+      puts "Expected content: #{expected}" # Debug logging
+      puts "Actual content: #{actual}" # Debug logging
+      raise "File #{path} exists but doesn't contain specified contents."
+    end
+  else
+    raise "File #{path} doesn't exist after create"
+  end
+end
+
+def assert_file_not_exist(path)
+  unless File.exist?(path)
+    puts "File #{path} doesn't exist after destroy"
+  else
+    raise "File #{path} still exists after destroy."
+  end
+end
+
+def assert_cmd_return(cmd, expected)
+  retval = `#{CEEDLING_CLI_EXEC} #{cmd}`
+  if (retval.include? expected)
+    puts "Testing included `#{expected}`"
+  else
+    puts retval # Debug logging
+    raise "Testing did not include `#{expected}`"
+  end
+end
+
+def assert_cmd_not_return(cmd, expected)
+  retval = `#{CEEDLING_CLI_EXEC} #{cmd}`
+  if (!retval.include? expected)
+    puts "Testing didn't included `#{expected}`"
+  else
+    raise "Testing included `#{expected}`, which was unexpected."
+  end
+end
+
+desc "Run integration test on example"
+task :integration_test do
+  chdir("./example/boss") do
+
+    # Start with a blank example project
+    prep_test
+
+    # verify we can clean the dependencies
+    puts "\nCleaning the Dependencies:"
+    assert_cmd_not_return("dependencies:clean",'error')
+    assert_file_not_exist("./third_party/bees/source/makefile")
+    assert_file_not_exist("./third_party/bees/source/src/worker.c")
+    assert_file_not_exist("./third_party/bees/source/src/worker.h")
+    assert_file_not_exist("./third_party/bees/source/build/libworker.a")
+    assert_file_not_exist("./third_party/bees/source/build/libworker.h")
+    assert_file_not_exist("../supervisor/build/release/libsupervisor.a")
+    assert_file_not_exist("../supervisor/build/artifacts/release/libsupervisor.a")
+    assert_file_exist("../supervisor/src/supervisor.c")
+    assert_file_exist("../supervisor/src/supervisor.h")
+
+    # verify we can fetch the dependencies
+    puts "\nFetching the Dependencies:"
+    assert_cmd_not_return("dependencies:fetch",'error')
+    assert_file_exist("./third_party/bees/source/makefile")
+    assert_file_exist("./third_party/bees/source/src/worker.c")
+    assert_file_exist("./third_party/bees/source/src/worker.h")
+    assert_file_not_exist("./third_party/bees/source/build/libworker.a")
+    assert_file_not_exist("./third_party/bees/source/build/libworker.h")
+    assert_file_not_exist("../supervisor/build/release/libsupervisor.a")
+    assert_file_not_exist("../supervisor/build/artifacts/release/libsupervisor.a")
+    assert_file_exist("../supervisor/src/supervisor.c")
+    assert_file_exist("../supervisor/src/supervisor.h")
+
+    # verify we can make the dependencies
+    puts "\nMaking the Dependencies:"
+    assert_cmd_not_return("dependencies:make",'error')
+    assert_file_exist("./third_party/bees/source/makefile")
+    assert_file_exist("./third_party/bees/source/src/worker.c")
+    assert_file_exist("./third_party/bees/source/src/worker.h")
+    assert_file_exist("./third_party/bees/source/build/libworker.a")
+    assert_file_exist("./third_party/bees/source/build/libworker.h")
+    assert_file_exist("../supervisor/build/release/libsupervisor.a")
+    assert_file_exist("../supervisor/build/artifacts/release/libsupervisor.a")
+    assert_file_exist("../supervisor/src/supervisor.c")
+    assert_file_exist("../supervisor/src/supervisor.h")
+
+    # verify we can clean the dependencies again
+    puts "\nCleaning the Dependencies (round 2):"
+    assert_cmd_not_return("dependencies:clean",'error')
+    assert_file_not_exist("./third_party/bees/source/makefile")
+    assert_file_not_exist("./third_party/bees/source/src/worker.c")
+    assert_file_not_exist("./third_party/bees/source/src/worker.h")
+    assert_file_not_exist("./third_party/bees/source/build/libworker.a")
+    assert_file_not_exist("./third_party/bees/source/build/libworker.h")
+    assert_file_not_exist("../supervisor/build/release/libsupervisor.a")
+    assert_file_not_exist("../supervisor/build/artifacts/release/libsupervisor.a")
+    assert_file_exist("../supervisor/src/supervisor.c")
+    assert_file_exist("../supervisor/src/supervisor.h")
+
+    # verify dependencies are built automatically for a release build
+    puts "\nRelease with Dependencies:"
+    assert_cmd_not_return("release",'error')
+    assert_file_exist("./third_party/bees/source/makefile")
+    assert_file_exist("./third_party/bees/source/src/worker.c")
+    assert_file_exist("./third_party/bees/source/src/worker.h")
+    assert_file_exist("./third_party/bees/source/build/libworker.a")
+    assert_file_exist("./third_party/bees/source/build/libworker.h")
+    assert_file_exist("../supervisor/build/release/libsupervisor.a")
+    assert_file_exist("../supervisor/build/artifacts/release/libsupervisor.a")
+    assert_file_exist("../supervisor/src/supervisor.c")
+    assert_file_exist("../supervisor/src/supervisor.h")
+
+    # verify we can clean the dependencies again
+    puts "\nCleaning the Dependencies (round 3):"
+    assert_cmd_not_return("dependencies:clean",'error')
+    assert_file_not_exist("./third_party/bees/source/makefile")
+    assert_file_not_exist("./third_party/bees/source/src/worker.c")
+    assert_file_not_exist("./third_party/bees/source/src/worker.h")
+    assert_file_not_exist("./third_party/bees/source/build/libworker.a")
+    assert_file_not_exist("./third_party/bees/source/build/libworker.h")
+    assert_file_not_exist("../supervisor/build/release/libsupervisor.a")
+    assert_file_not_exist("../supervisor/build/artifacts/release/libsupervisor.a")
+    assert_file_exist("../supervisor/src/supervisor.c")
+    assert_file_exist("../supervisor/src/supervisor.h")
+
+    # verify dependencies are built automatically for a test build
+    puts "\nTesting with Dependencies:"
+    assert_cmd_not_return("test:all",'error')
+    assert_file_exist("./third_party/bees/source/makefile")
+    assert_file_exist("./third_party/bees/source/src/worker.c")
+    assert_file_exist("./third_party/bees/source/src/worker.h")
+    assert_file_exist("./third_party/bees/source/build/libworker.a")
+    assert_file_exist("./third_party/bees/source/build/libworker.h")
+    assert_file_exist("../supervisor/build/release/libsupervisor.a")
+    assert_file_exist("../supervisor/build/artifacts/release/libsupervisor.a")
+    assert_file_exist("../supervisor/src/supervisor.c")
+    assert_file_exist("../supervisor/src/supervisor.h")
+
+    # verify we can clean the dependencies again
+    puts "\nCleaning the Dependencies (round 4):"
+    assert_cmd_not_return("dependencies:clean",'error')
+    assert_file_not_exist("./third_party/bees/source/makefile")
+    assert_file_not_exist("./third_party/bees/source/src/worker.c")
+    assert_file_not_exist("./third_party/bees/source/src/worker.h")
+    assert_file_not_exist("./third_party/bees/source/build/libworker.a")
+    assert_file_not_exist("./third_party/bees/source/build/libworker.h")
+    assert_file_not_exist("../supervisor/build/release/libsupervisor.a")
+    assert_file_not_exist("../supervisor/build/artifacts/release/libsupervisor.a")
+    assert_file_exist("../supervisor/src/supervisor.c")
+    assert_file_exist("../supervisor/src/supervisor.h")
+
+    puts "\nPASSES MODULE SELF-TESTS"
+
+  end
+end
+
+task :default => [:integration_test]

data/plugins/dependencies/config/defaults.yml

@@ -1,5 +1,78 @@
+# =========================================================================
+#   Ceedling - Test-Centered Build System for C
+#   ThrowTheSwitch.org
+#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   SPDX-License-Identifier: MIT
+# =========================================================================
+
 ---
 :dependencies:
-  :libraries: []
+  :deps: []
+
+:tools:  
+  :deps_compiler:  
+    :executable: gcc
+    :name: 'Dependencies compiler'
+    :arguments:  
+      - -g  
+      - -I"$": COLLECTION_PATHS_DEPS  
+      - -D$: COLLECTION_DEFINES_DEPS  
+      - -c "${1}"  
+      - -o "${2}"  
+
+  :deps_linker:
+    :executable: ar  
+    :name: 'Dependencies archiver'
+    :arguments:  
+      - rcs  
+      - ${2}  
+      - ${1}
+
+  :deps_zip:
+    :executable: unzip
+    :name: 'Dependencies zip unarchiver'
+    :optional: true
+    :arguments:
+      - -o
+      - ${1}  # Filepath
+
+  :deps_targzip:
+    :executable: tar
+    :name: 'Dependencies tar gzip unarchiver'
+    :optional: true
+    :arguments:
+      - -xvzf
+      - ${1}  # Filepath
+      - -C
+      - ./
+
+  :deps_git_clone:
+    :executable: git
+    :name: 'Dependencies git clone'
+    :optional: true
+    :arguments:
+      - clone
+      - ${1}  # Optional branch with `-b` flag
+      - ${2}  # Optional depth with `--depth` flag
+      - ${3}  # Repository source
+      - .
+
+  :deps_git_checkout:
+    :executable: git
+    :name: 'Dependencies git checkout'
+    :optional: true
+    :arguments:
+      - checkout
+      - ${1}  # Git hash
+
+  :deps_subversion:
+    :executable: svn
+    :name: 'Dependencies subversion'
+    :optional: true
+    :arguments:
+      - checkout
+      - ${1}  # Optional branch with `--revision` flag
+      - ${2}  # Repository source
+      - .
 
 ...

data/plugins/dependencies/dependencies.rake

@@ -1,5 +1,11 @@
+# =========================================================================
+#   Ceedling - Test-Centered Build System for C
+#   ThrowTheSwitch.org
+#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   SPDX-License-Identifier: MIT
+# =========================================================================
 
-DEPENDENCIES_LIBRARIES.each do |deplib|
+DEPENDENCIES_DEPS.each do |deplib|
 
   # Look up the name of this dependency library
   deplib_name = @ceedling[DEPENDENCIES_SYM].get_name(deplib)
@@ -13,6 +19,7 @@ DEPENDENCIES_LIBRARIES.each do |deplib|
   all_deps = @ceedling[DEPENDENCIES_SYM].get_static_libraries_for_dependency(deplib) +
              @ceedling[DEPENDENCIES_SYM].get_dynamic_libraries_for_dependency(deplib) +
              @ceedling[DEPENDENCIES_SYM].get_include_directories_for_dependency(deplib) +
+             @ceedling[DEPENDENCIES_SYM].get_include_files_for_dependency(deplib) +
              @ceedling[DEPENDENCIES_SYM].get_source_files_for_dependency(deplib)
 
   # Add a rule for building the actual libraries from dependency list
@@ -24,8 +31,9 @@ DEPENDENCIES_LIBRARIES.each do |deplib|
 
       # We double-check that it doesn't already exist, because this process sometimes
       # produces multiple files, but they may have already been flagged as invoked
-      unless (File.exists?(path))
-
+      if (File.exist?(path))
+        @ceedling[:loginator].log("Nothing to do for dependency #{path}", Verbosity::OBNOXIOUS)
+      else
         # Set Environment Variables, Fetch, and Build
         @ceedling[DEPENDENCIES_SYM].set_env_if_required(path)
         @ceedling[DEPENDENCIES_SYM].fetch_if_required(path)
@@ -36,13 +44,15 @@ DEPENDENCIES_LIBRARIES.each do |deplib|
 
   # Add a rule for building the source and includes from dependency list
   (@ceedling[DEPENDENCIES_SYM].get_include_directories_for_dependency(deplib) +
+   @ceedling[DEPENDENCIES_SYM].get_include_files_for_dependency(deplib) +
    @ceedling[DEPENDENCIES_SYM].get_source_files_for_dependency(deplib)
   ).each do |libpath|
     task libpath do |filetask|
-      path = filetask.name
-
-      unless (File.file?(path) || File.directory?(path))
+      path = File.expand_path(filetask.name)
 
+      if (File.file?(path) || File.directory?(path))
+        @ceedling[:loginator].log("Nothing to do for dependency #{path}", Verbosity::OBNOXIOUS)
+      else
         # Set Environment Variables, Fetch, and Build
         @ceedling[DEPENDENCIES_SYM].set_env_if_required(path)
         @ceedling[DEPENDENCIES_SYM].fetch_if_required(path)
@@ -74,12 +84,16 @@ DEPENDENCIES_LIBRARIES.each do |deplib|
 
     namespace :fetch do
       # Add task to directly clobber this dependency
-      task(deplib_name) do
+      task(deplib_name => @ceedling[DEPENDENCIES_SYM].get_source_path(deplib)) do
         @ceedling[DEPENDENCIES_SYM].fetch_if_required(deplib_name)
       end
     end
   end
 
+
+  # grab our own reference to the main configuration hash
+  project_config = @ceedling[:configurator].project_config_hash
+
   # Add source files to our list of things to build during release
   source_files = @ceedling[DEPENDENCIES_SYM].get_source_files_for_dependency(deplib)
   task PROJECT_RELEASE_BUILD_TARGET => source_files
@@ -92,10 +106,6 @@ DEPENDENCIES_LIBRARIES.each do |deplib|
   dynamic_libs = @ceedling[DEPENDENCIES_SYM].get_dynamic_libraries_for_dependency(deplib)
   task RELEASE_SYM => dynamic_libs
 
-  # Add the include dirs / files to our list of dependencies for release
-  headers = @ceedling[DEPENDENCIES_SYM].get_include_directories_for_dependency(deplib)
-  task RELEASE_SYM => headers
-
   # Paths to Libraries need to be Added to the Lib Path List
   all_libs = static_libs + dynamic_libs
   PATHS_LIBRARIES ||= []
@@ -108,6 +118,8 @@ DEPENDENCIES_LIBRARIES.each do |deplib|
   all_libs.each {|lib| LIBRARIES_SYSTEM << File.basename(lib,'.*').sub(/^lib/,'') }
   LIBRARIES_SYSTEM.uniq!
   LIBRARIES_SYSTEM.reject!{|s| s.empty?}
+
+  task :prepare => all_deps
 end
 
 # Add any artifact:include or :source folders to our release & test includes paths so linking and mocking work.
@@ -116,16 +128,16 @@ end
 # Add tasks for building or cleaning ALL depencies
 namespace DEPENDENCIES_SYM do
   desc "Deploy missing dependencies."
-  task :deploy => DEPENDENCIES_LIBRARIES.map{|deplib| "#{DEPENDENCIES_SYM}:deploy:#{@ceedling[DEPENDENCIES_SYM].get_name(deplib)}"}
+  task :deploy => DEPENDENCIES_DEPS.map{|deplib| "#{DEPENDENCIES_SYM}:deploy:#{@ceedling[DEPENDENCIES_SYM].get_name(deplib)}"}
 
   desc "Build any missing dependencies."
-  task :make => DEPENDENCIES_LIBRARIES.map{|deplib| "#{DEPENDENCIES_SYM}:make:#{@ceedling[DEPENDENCIES_SYM].get_name(deplib)}"}
+  task :make => DEPENDENCIES_DEPS.map{|deplib| "#{DEPENDENCIES_SYM}:make:#{@ceedling[DEPENDENCIES_SYM].get_name(deplib)}"}
 
   desc "Clean all dependencies."
-  task :clean => DEPENDENCIES_LIBRARIES.map{|deplib| "#{DEPENDENCIES_SYM}:clean:#{@ceedling[DEPENDENCIES_SYM].get_name(deplib)}"}
+  task :clean => DEPENDENCIES_DEPS.map{|deplib| "#{DEPENDENCIES_SYM}:clean:#{@ceedling[DEPENDENCIES_SYM].get_name(deplib)}"}
 
   desc "Fetch all dependencies."
-  task :fetch => DEPENDENCIES_LIBRARIES.map{|deplib| "#{DEPENDENCIES_SYM}:fetch:#{@ceedling[DEPENDENCIES_SYM].get_name(deplib)}"}
+  task :fetch => DEPENDENCIES_DEPS.map{|deplib| "#{DEPENDENCIES_SYM}:fetch:#{@ceedling[DEPENDENCIES_SYM].get_name(deplib)}"}
 end
 
 namespace :files do
@@ -133,7 +145,7 @@ namespace :files do
   task :dependencies do
     puts "dependency files:"
     deps = []
-    DEPENDENCIES_LIBRARIES.each do |deplib|
+    DEPENDENCIES_DEPS.each do |deplib|
       deps << @ceedling[DEPENDENCIES_SYM].get_static_libraries_for_dependency(deplib)
       deps << @ceedling[DEPENDENCIES_SYM].get_dynamic_libraries_for_dependency(deplib)
     end
@@ -143,5 +155,3 @@ namespace :files do
   end
 end
 
-# Make sure that we build dependencies before attempting to tackle any of the unit tests
-Rake::Task[:test_deps].enhance ['dependencies:make']