canoe 0.3.3.5 → 0.3.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3111ef55f0ad1370cff694b437b63ae49dce9f59347e3b70dab2e5abecabd32
-  data.tar.gz: 97a41a1bf0f2cd914398db463bcafa05705ddf3b6a1987e815a9cc306b4a3d14
+  metadata.gz: e50f9ba8d96948ef0cf070c3cf105641b3abc7e6c6b83823b989fb5b83f51cc5
+  data.tar.gz: '02916721983f2bd1fc18837f7db4a73dd77c42bebbe4c36d498e0a8e4b73fe2f'
 SHA512:
-  metadata.gz: 81c885681b3c65a638915922df7ad598b90d206c3c988f35b0ac685d648634288e4cfe67094fc53c91b6a691c241cc1097c0da4e2794f75511b502af92290636
-  data.tar.gz: f4813ff8c8f3150fd1108a7a3bdf4db809d108c4b519fed546532d1a314bfc811ec2fa4e297f0a1ae83ff94d27a184292aa8df2986e2d82b3a3a93dafb4a2773
+  metadata.gz: ad38fa76f5190af9de7579ee5f8e11da9f42b35ec57b833f19e63a01ded4255f9dca913959c6fa5306b2a136b45228b0f8c5e3522bae64b7fcb99c9df29168f1
+  data.tar.gz: 5877024cb80c0bd1bd767982c28ea3ceea82aa883f5ae27d0c45d28f2b73339df917dbc50cfecf5fd5c09bbc7f8cfb538ef963e9c6b0b865c5c41dd4bb1f33a1

data/lib/workspace/make.rb

@@ -242,7 +242,6 @@ module Canoe
         objs = ["$(OBJ_#{n})"] + extract_one_file_obj(filename, deps).map do |o|
           "$(OBJ_#{File.basename(o, '.*').upcase})"
         end
-
         makefile.puts("$(#{n}): #{objs.join ' '}\n\t$(#{cmplr}) $(#{cmplr}FLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS)")
         makefile.puts ''
       end
@@ -264,6 +263,7 @@ module Canoe
       make_out_rules makefile, deps
       makefile.puts ''
       make_obj_rules makefile, deps
+      makefile.puts ''
       make_tests_rules makefile, deps
       makefile.puts ''
       make_clean makefile

data/lib/workspace/test.rb

@@ -9,12 +9,43 @@ module Canoe
       test_single(args[0], args[1..].join(" "))
     end
 
-    # extract one test file's dependency
+    # extract all files the file depends on, including headers
     def extract_one_file(file, deps)
-      ret = deps[file].map { |f| f.gsub(".#{@header_suffix}", ".#{@source_suffix}") }
+      ret = []
+      holder = deps[file] + deps[file].map { |f| f.gsub(".#{@header_suffix}", ".#{@source_suffix}") }
+      extract_one_file_helper(file, deps, holder, ret)
+      ret.uniq
+    end
+
+    def extract_one_file_obj(file, deps)
+      ret = extract_one_file(file, deps).map do |f|
+        file_to_obj(f)
+      end
+      ret.uniq
+    end
+
+    def extract_one_file_header(file, deps)
+      ret = extract_one_file(file, deps).map do |f|
+        f.gsub(".#{@source_suffix}", ".#{@header_suffix}")
+      end
+      ret.uniq
+    end
+
+    def extract_one_file_source(file, deps)
+      ret = extract_one_file(file, deps).map do |f|
+        f.gsub(".#{@header_suffix}", ".#{@source_suffix}")
+      end
+      ret.uniq
+    end
+
+    private
+
+    # extract one test file's dependency
+    def extract_one_file_helper(file, deps, ref, ret)
       begin
-        deps[file].each do |f|
-          dep = extract_one_file(f, deps)
+        ref.each do |f|
+          ret << f unless ret.include?(f)
+          dep = extract_one_file_helper(f, deps, deps[f], ret) 
           dep.each do |d|
             ret << d unless ret.include?(d)
           end
@@ -23,17 +54,8 @@ module Canoe
         puts "#{"Fatal: ".red}file #{file} is circularly included"
         exit false
       end      
-      ret.map { |f| f.gsub(".#{@header_suffix}", ".#{@source_suffix}") }
-    end
-
-    def extract_one_file_obj(file, deps)
-      extract_one_file(file, deps).map do |f|
-        file_to_obj(f)
-      end
     end
 
-    private
-
     def test_all
       build_test
       fetch_all_test_files.each do |f|
@@ -84,14 +106,13 @@ module Canoe
 
     def link_one_test(test_file, deps)
       target = "#{@target_short}/#{File.basename(test_file, '.*')}"
-      all_objs = Dir.glob("obj/*.o").reject { |f| f.start_with?('obj/test_') || f == 'obj/main.o'} 
-      @compiler.link_executable target, all_objs + [file_to_obj(test_file)]
+      @compiler.link_executable target, [file_to_obj(test_file)] + extract_one_file_obj(test_file, deps)
     end
 
     def build_one_test(test_file, deps, indent = "")
       files = DepAnalyzer.compiling_filter(target_deps, Time.new(0), @source_suffix, @header_suffix)
+                .intersection(extract_one_file_source(test_file, deps)) << test_file
       flag = true
-      files << test_file
 
       stepper = Stepper.new(files.size, files.size)
 

data/lib/workspace/version.rb

@@ -2,7 +2,7 @@ module Canoe
   class WorkSpace
     def self.version
       puts <<~VER
-           canoe v0.3.3.5
+           canoe v0.3.3.6
            For features in this version, please visit https://github.com/Dicridon/canoe
            Currently, canoe can do below:
                - project creation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canoe
 version: !ruby/object:Gem::Version
-  version: 0.3.3.5
+  version: 0.3.3.6
 platform: ruby
 authors:
 - XIONG Ziwei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-19 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies: []
 description: |+
   Canoe offers project management and building facilities to C/C++ projects.