canoe 0.3.3.3 → 0.3.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7002afc65c5738fb7929e1b81cc491b9d7a7196b2ada01f3b6f580ccfe25133
-  data.tar.gz: 48632ed95d610599712de7f84fbfb8108c1195d9460cf1a96b8b22cccb59891c
+  metadata.gz: e50f9ba8d96948ef0cf070c3cf105641b3abc7e6c6b83823b989fb5b83f51cc5
+  data.tar.gz: '02916721983f2bd1fc18837f7db4a73dd77c42bebbe4c36d498e0a8e4b73fe2f'
 SHA512:
-  metadata.gz: fa9c3ccf050acd66acd89bdc4b7f4fc280c68e926be7d027cfbb44cecf9f89b51aa7b61b44269f6f7d4a2c2524f4b67e65ba507a074824bba7018940dfb19d82
-  data.tar.gz: 23f4cd1c8e5bb9e57d8bda28974366d7486efca3a5d7c275c1042a27a7c039dd80e699d792330417647a72b3615ba164aba502c7e16097a549fd16b41fc45135
+  metadata.gz: ad38fa76f5190af9de7579ee5f8e11da9f42b35ec57b833f19e63a01ded4255f9dca913959c6fa5306b2a136b45228b0f8c5e3522bae64b7fcb99c9df29168f1
+  data.tar.gz: 5877024cb80c0bd1bd767982c28ea3ceea82aa883f5ae27d0c45d28f2b73339df917dbc50cfecf5fd5c09bbc7f8cfb538ef963e9c6b0b865c5c41dd4bb1f33a1

data/lib/coloring.rb

@@ -10,7 +10,7 @@ class String
       34 => :blue,
       35 => :magenta,
       36 => :cyan,
-      37 => :white,
+      37 => :white
     }
     colors.each do |k, v|
       define_method v do

data/lib/dependence.rb

@@ -17,6 +17,7 @@ module Canoe
     include SystemCommand
 
     class << self
+      include Err
       include WorkSpaceUtil
       def read_from(filename)
         File.open(filename, 'r') do |f|
@@ -32,29 +33,28 @@ module Canoe
 
       def compiling_filter(deps, build_time, src_sfx = 'cpp', hdr_sfx = 'hpp')
         files = []
-        @processed = {}
         @recompiles = {}
         deps.each_key do |k|
-          @processed[k] = false
           @recompiles[k] = false
         end
         deps.each do |k, v|
           next if k.end_with? ".#{hdr_sfx}"
 
-          if should_recompile?(k, build_time)
-            files << k
-            @processed[k] = true
-            @recompiles[k] = true
-            next
-          end
+          # first analyze dependency to discover circular includes
           v.each do |f|
             next unless mark(f, build_time, deps) || mark(f.sub(".#{hdr_sfx}", ".#{src_sfx}"), build_time, deps)
 
             files << k
-            @processed[k] = true
             @recompiles[k] = true
             break
           end
+
+          next if @recompiles[k]
+
+          if should_recompile?(k, build_time)
+            files << k
+            @recompiles[k] = true
+          end
         end
         files
       end
@@ -62,22 +62,19 @@ module Canoe
       private
 
       def mark(file, build_time, deps)
-        ret = false
         return false unless File.exist? file
-        return true if should_recompile?(file, build_time)
 
+        # first analyze dependency to discover circular includes
         deps[file].each do |f|
-          if @processed[f]
-            ret |= @recompiles[f]
-            next
-          end
-          @processed[f] = true
           if mark(f, build_time, deps)
             @recompiles[f] = true
             return true
           end
+        rescue SystemStackError
+          puts "#{"Fatal: ".red}file #{file} is circularly included"
+          exit false
         end
-        ret
+        true if should_recompile?(file, build_time)
       end
 
       def should_recompile?(file, build_time)

data/lib/workspace/make.rb

@@ -84,7 +84,7 @@ module Canoe
     def define_variables(makefile, deps)
       define_dirs(makefile)
       src_files = deps.keys.select { |f| f.end_with? get_source_suffix }
-      
+
       generate_all_names(src_files)
       define_srcs(makefile, src_files)
       makefile.puts ''
@@ -163,15 +163,20 @@ module Canoe
     end
 
     def get_all_dep_name(file_name, deps)
-      dep = deps[file_name]
-      if dep.empty?
-        []
-      else
-        tmp = dep.map { |n| extract_name(n, @workspace.components_prefix).upcase }
-        dep.each do |d|
-          tmp += get_all_dep_name(d, deps)
+      begin
+        dep = deps[file_name]
+        if dep.empty?
+          []
+        else
+          tmp = dep.map { |n| extract_name(n, @workspace.components_prefix).upcase }
+          dep.each do |d|
+            tmp += get_all_dep_name(d, deps)
+          end
+          tmp
         end
-        tmp
+      rescue SystemStackError
+        puts "#{"Fatal: ".red}file #{file_name} is circularly included"
+        exit false
       end
     end
 
@@ -237,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
@@ -246,7 +250,7 @@ module Canoe
     def make_clean(makefile)
       clean = <<~DOC
             .PHONY: clean
-            clean: 
+            clean:
             \trm ./target/*
             \trm ./obj/*.o
             DOC
@@ -259,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,27 +9,53 @@ 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}") }
-
-      deps[file].each do |f|
-        dep = extract_one_file(f, deps)
-        dep.each do |d|
-          ret << d unless ret.include?(d)
-        end
-      end
-      ret.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)
-      extract_one_file(file, deps).map do |f|
+      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
+        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
+        end
+      rescue SystemStackError
+        puts "#{"Fatal: ".red}file #{file} is circularly included"
+        exit false
+      end      
+    end
+
     def test_all
       build_test
       fetch_all_test_files.each do |f|
@@ -80,20 +106,26 @@ module Canoe
 
     def link_one_test(test_file, deps)
       target = "#{@target_short}/#{File.basename(test_file, '.*')}"
-      @compiler.link_executable target, extract_one_file_obj(test_file, deps) + [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)
+    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)
 
       files.each do |f|
         o = file_to_obj(f)
+        printf "#{indent}#{stepper.progress_as_str.green} compiling #{f.yellow}: "
         flag &= compile f, o
+        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)
     end
 
@@ -105,8 +137,8 @@ module Canoe
       stepper = Stepper.new fetch_all_test_files.size, files.size
 
       files.each do |f|
-        printf "#{stepper.progress_as_str.green} compiling #{f} "
-        build_one_test(f, deps)
+        printf "#{stepper.progress_as_str.green} building #{File.basename(f, "." + @source_suffix).yellow}:\n"
+        build_one_test(f, deps, "    ")
         stepper.step
       end
     end

data/lib/workspace/version.rb

@@ -2,7 +2,7 @@ module Canoe
   class WorkSpace
     def self.version
       puts <<~VER
-           canoe v0.3.3.3
+           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.3
+  version: 0.3.3.6
 platform: ruby
 authors:
 - XIONG Ziwei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-13 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.