canoe 0.3.3.6 → 0.3.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e50f9ba8d96948ef0cf070c3cf105641b3abc7e6c6b83823b989fb5b83f51cc5
-  data.tar.gz: '02916721983f2bd1fc18837f7db4a73dd77c42bebbe4c36d498e0a8e4b73fe2f'
+  metadata.gz: 27fc12be4cfd0775886ed271cbc9ef488af257f39b042bf2d05e0c9e15383ced
+  data.tar.gz: c7098cf99ac368904025146a345dc9568c10bf22b6ad92d20bb3a650c78f3353
 SHA512:
-  metadata.gz: ad38fa76f5190af9de7579ee5f8e11da9f42b35ec57b833f19e63a01ded4255f9dca913959c6fa5306b2a136b45228b0f8c5e3522bae64b7fcb99c9df29168f1
-  data.tar.gz: 5877024cb80c0bd1bd767982c28ea3ceea82aa883f5ae27d0c45d28f2b73339df917dbc50cfecf5fd5c09bbc7f8cfb538ef963e9c6b0b865c5c41dd4bb1f33a1
+  metadata.gz: 41c42a532260ed0cb89b6885cbd9dae8058b26e5ddd90b4bb30a8f439b7d09e86a500e078bd6a807242c9e1a4be3e87ec43901a69538afdb60adf6ed48d4b4de
+  data.tar.gz: 2f2aa63dbf22b89538a56f9854de86ff27912b70cda5081c9201a469e36f957d27b5a1997f0c8d8b42423bd41efb6767993c53e12c59317ed26ed9a8839f85b9

data/lib/workspace/build.rb

@@ -66,6 +66,7 @@ module Canoe
     end
 
     def link_exectutable(odir, objs)
+      puts "#{'[LINKING TARGET]'.magenta}..."
       puts "#{"[100%]".green} linking"
       @compiler.link_executable "#{odir}/#{@name}", objs
     end
@@ -97,6 +98,7 @@ module Canoe
     end
 
     def build_common(files)
+      return true if files.empty?
       all = SourceFiles.get_all(@src_short) { |f| f.end_with? @source_suffix }
       stepper = Stepper.new all.size, files.size
       flag = true
@@ -138,8 +140,7 @@ module Canoe
       files = DepAnalyzer.compiling_filter(target_deps, build_time, @source_suffix, @header_suffix)
 
       if files.empty? && File.exist?(target)
-        puts "nothing to do, all up to date"
-        return true
+        puts "nothing to compile, trying to link"
       end
 
       self.send "build_#{@mode.to_s}", files
@@ -169,7 +170,7 @@ module Canoe
     end
 
     def add_command_object(dir, arguments, file)
-      temp = {             
+      temp = {
         "arguments" => arguments,
         "directory" => dir,
         "file" => file

data/lib/workspace/test.rb

@@ -14,6 +14,8 @@ module Canoe
       ret = []
       holder = deps[file] + deps[file].map { |f| f.gsub(".#{@header_suffix}", ".#{@source_suffix}") }
       extract_one_file_helper(file, deps, holder, ret)
+
+      ret = ret + ret.map{ |f| f.gsub(".#{@header_suffix}", ".#{@source_suffix}") }
       ret.uniq
     end
 
@@ -45,7 +47,7 @@ module Canoe
       begin
         ref.each do |f|
           ret << f unless ret.include?(f)
-          dep = extract_one_file_helper(f, deps, deps[f], ret) 
+          dep = extract_one_file_helper(f, deps, deps[f], ret)
           dep.each do |d|
             ret << d unless ret.include?(d)
           end
@@ -53,7 +55,7 @@ module Canoe
       rescue SystemStackError
         puts "#{"Fatal: ".red}file #{file} is circularly included"
         exit false
-      end      
+      end
     end
 
     def test_all
@@ -64,7 +66,8 @@ module Canoe
     end
 
     def test_single(name, args = "")
-      rebuild = false;
+      puts "[COMPILING TEST #{name}]".magenta
+      rebuild = false
       bin = "#{@target_short}/test_#{name}"
 
       rebuild ||= !File.exist?(bin)
@@ -74,16 +77,19 @@ module Canoe
       rebuild ||= File.mtime(bin) < File.mtime(file)
 
       deps = fetch_all_deps
+
       extract_one_file(file, deps).each do |f|
         rebuild ||= File.mtime(bin) < File.mtime(f) || File.mtime(bin) < File.mtime(hdr_of_src(f))
       end
 
       cmd = "#{bin} #{args}"
+      build_compiler_from_config
       if rebuild
-        build_compiler_from_config
         run_command cmd if build_one_test(file, deps)
       else
-        run_command cmd
+        puts "nothing to compile, all up to date"
+        puts "[RELINKING...]".magenta
+        run_command cmd if link_one_test(file, deps)
       end
     end
 
@@ -123,7 +129,7 @@ module Canoe
         stepper.step
       end
       abort_on_err("Compiling errors encountered") unless flag;
-      
+
       printf "#{indent}#{stepper.progress_as_str.green} compiling finished\n"
       puts "#{indent}[100%]".green + " linking"
       link_one_test(test_file, deps)

data/lib/workspace/version.rb

@@ -2,7 +2,7 @@ module Canoe
   class WorkSpace
     def self.version
       puts <<~VER
-           canoe v0.3.3.6
+           canoe v0.3.3.9
            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.6
+  version: 0.3.3.9
 platform: ruby
 authors:
 - XIONG Ziwei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2023-08-27 00:00:00.000000000 Z
 dependencies: []
 description: |+
   Canoe offers project management and building facilities to C/C++ projects.