canoe 0.3.3.3 → 0.3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7002afc65c5738fb7929e1b81cc491b9d7a7196b2ada01f3b6f580ccfe25133
-  data.tar.gz: 48632ed95d610599712de7f84fbfb8108c1195d9460cf1a96b8b22cccb59891c
+  metadata.gz: 28de761c23336af9df9ed1117d47f85c22f77abd3030195462d0e43ccba5091c
+  data.tar.gz: f0734ecf77c58d6d86a72835fff2e56e1ff49504be3f2ad7cc3e182e550b5623
 SHA512:
-  metadata.gz: fa9c3ccf050acd66acd89bdc4b7f4fc280c68e926be7d027cfbb44cecf9f89b51aa7b61b44269f6f7d4a2c2524f4b67e65ba507a074824bba7018940dfb19d82
-  data.tar.gz: 23f4cd1c8e5bb9e57d8bda28974366d7486efca3a5d7c275c1042a27a7c039dd80e699d792330417647a72b3615ba164aba502c7e16097a549fd16b41fc45135
+  metadata.gz: ff0167eca4be655a4cc33258b5dddfa07e7cbad53d6745b38d75eb301c032403d5338e6249f7704dee460dbaa87a3a4141b8f1ca023abcff5af4a660691b4f2c
+  data.tar.gz: f5c494d7cefeefca5e2fd14353f9645479c29f4bb338330ebb9075d103fce73ea678bbb62823053bafdbe3bad497d7b5ecc8a3ca369ff078b937d1e7296e5fbd

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
 
@@ -246,7 +251,7 @@ module Canoe
     def make_clean(makefile)
       clean = <<~DOC
             .PHONY: clean
-            clean: 
+            clean:
             \trm ./target/*
             \trm ./obj/*.o
             DOC

data/lib/workspace/test.rb

@@ -12,13 +12,17 @@ module Canoe
     # extract one test file's dependency
     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)
+      begin
+        deps[file].each do |f|
+          dep = extract_one_file(f, deps)
+          dep.each do |d|
+            ret << d unless ret.include?(d)
+          end
         end
-      end
+      rescue SystemStackError
+        puts "#{"Fatal: ".red}file #{file} is circularly included"
+        exit false
+      end      
       ret.map { |f| f.gsub(".#{@header_suffix}", ".#{@source_suffix}") }
     end
 
@@ -83,17 +87,23 @@ module Canoe
       @compiler.link_executable target, extract_one_file_obj(test_file, deps) + [file_to_obj(test_file)]
     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)
       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 +115,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.4
            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.4
 platform: ruby
 authors:
 - XIONG Ziwei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-13 00:00:00.000000000 Z
+date: 2021-12-19 00:00:00.000000000 Z
 dependencies: []
 description: |+
   Canoe offers project management and building facilities to C/C++ projects.