demake 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad64570b38ff8a61ee1a0707c671e207443422c403048971107ecb88a8b397bf
-  data.tar.gz: a8ec76e1e656f91b352c5f4207da9727f887d71ad69127f028405153c56789fd
+  metadata.gz: 26203e52997d7a1856baddeb73d1d10140b37e97aaf809e1f8ba09fbeaeda684
+  data.tar.gz: 2aa16613885a325c1a81cf968c8e637ca8535c25c041ff4a66c2f5948f8ec9f5
 SHA512:
-  metadata.gz: 92df21acfb3f996384d3e6284f4c75ae4a0807b75deba072a4d88473c9f6adb22b8348b1b6c8c2c6d7ccdd56880ebe8b904c88b610e72adf3da41d32496136ad
-  data.tar.gz: 433713d18c06f6ce22aa64f819d5acf98d55f6581dafb57affcb3b0e57e76cf8001703ae6499833dfd4ec1ccd01c2bad2b4752c4999681dc1c3f8d17bee50288
+  metadata.gz: d15794d5c2c4c5cc0859a729a440231e677775da91aeb891249641eafb60c3fd62c250adcd3dc2eddfab439c94165d0c3319fd7554c20116f0cc7e5db4bb8f9c
+  data.tar.gz: eccd204c1e31f78b80428ea59ffb16d63690e7fb492a2be7b61910874e12da3e9d419db3311fb92c6a0bbdfca2373e99499676fbbe7c526ca8c35051bf4627ac

data/bin/demake

@@ -5,7 +5,7 @@
 #
 require 'pipetext'
 
-demake_version = "0.1.1"
+demake_version = "0.1.2"
 
 @silent = false
 @compiler = "gcc"
@@ -16,6 +16,10 @@ demake_version = "0.1.1"
 # Raise if you have more cores and a long compile time
 @num_threads = 8
 
+WIDTH		= 75
+BOX_WIDTH	= WIDTH + "\t@echo".length		# To normalize for Makefile format
+SHORT_WIDTH	= BOX_WIDTH - 8
+
 # Where to install binaries
 @prefix = "/usr/local/bin/"
 @library_prefix = "/usr/local/lib64/"
@@ -642,26 +646,26 @@ end
 menu_target = <<-END_OF_STRING
 .PHONY : menu
 menu :
-\t@echo "|]78|=[|70-]|O"
+\t@echo "|]#{BOX_WIDTH}|=[|#{SHORT_WIDTH}-]|O"
 \t@echo "|=!|;!|O"
-\t@echo "|=!|26 Make targets:|;!|O"
+\t@echo "|=!|27 Make targets:|;!|O"
 \t@echo "|=!|;!|O"
-\t@echo "|=!|28 #{@emoji_build} |cbuild|n|;!|O"
-\t@echo "|=!|28 #{@emoji_clean} |cclean|n|;!|O"
-\t@echo "|=!|28 #{@emoji_debug} |cdebug|n|;!|O"
-\t@echo "|=!|28 #{@emoji_install} |cinstall|n|;!|O"
-\t@echo "|=!|28 #{@emoji_uninstall} |cuninstall|n|;!|O"
-\t@echo "|=!|28 #{@emoji_test} |ctest|n|;!|O"
+\t@echo "|=!|29 #{@emoji_build} |cbuild|n|;!|O"
+\t@echo "|=!|29 #{@emoji_clean} |cclean|n|;!|O"
+\t@echo "|=!|29 #{@emoji_debug} |cdebug|n|;!|O"
+\t@echo "|=!|29 #{@emoji_install} |cinstall|n|;!|O"
+\t@echo "|=!|29 #{@emoji_uninstall} |cuninstall|n|;!|O"
+\t@echo "|=!|29 #{@emoji_test} |ctest|n|;!|O"
 \t@echo "|=!|;!|O"
-\t@echo "|=>|70-<|O"
+\t@echo "|=>|#{SHORT_WIDTH}-<|O"
 END_OF_STRING
 @applications.each do |app|
-  menu_target << "\t@echo \"|=!|]78  Executable: bin/|g#{app[0]}|n|;!|O\"\n"
+  menu_target << "\t@echo \"|=!|]#{BOX_WIDTH}  Executable: bin/|O|g#{app[0]}|n|=|;!|O\"\n"
 end
 @build_libraries.each do |lib|
-  menu_target << "\t@echo \"|=!|]78  Library:    bin/|g#{lib[0]}#{@library_extension}|n|;!|O\"\n"
+  menu_target << "\t@echo \"|=!|]#{BOX_WIDTH}  Library:    bin/|O|g#{lib[0]}#{@library_extension}|n|=|;!|O\"\n"
 end
-menu_target << "\t@echo \"|={|70-}|O\"\n"
+menu_target << "\t@echo \"|={|#{SHORT_WIDTH}-}|O\"\n"
 @output << "\n"
 if(@emojis == false)
   strip_emojis!(menu_target)
@@ -675,9 +679,9 @@ END_OF_STRING
 
 @applications.each do |app|
   executable_target = <<-END_OF_STRING
-\t@echo "|=[|70-]|O"
-\t@echo "|]78|=! #{@emoji_build} Building executable: bin/|g#{app[0]}|n|;!|O"
-\t@echo "|={|70-}|O"
+\t@echo "|=[|#{SHORT_WIDTH}-]|O"
+\t@echo "|]#{BOX_WIDTH}|=! #{@emoji_build} Building executable: bin/|O|g#{app[0]}|n|=|;!|O"
+\t@echo "|={|#{SHORT_WIDTH}-}|O"
 \t@$(MAKE) $(BINARY)/#{app[0]}
 END_OF_STRING
   if(@emojis == false)
@@ -688,9 +692,9 @@ end
 
 @build_libraries.each do |lib|
   library_target = <<-END_OF_STRING
-\t@echo "|=[|70-]|O"
-\t@echo "|]78|=! #{@emoji_build} Building library: bin/|g#{lib[0]}|n|;!|O"
-\t@echo "|={|70-}|O"
+\t@echo "|=[|#{SHORT_WIDTH}-]|O"
+\t@echo "|]#{BOX_WIDTH}|=! #{@emoji_build} Building library: bin/|O|g#{lib[0]}|n|=|;!|O"
+\t@echo "|={|#{SHORT_WIDTH}-}|O"
 \t@$(MAKE) $(BINARY)/#{lib[0]}#{@library_extension}
 END_OF_STRING
   if(@emojis == false)
@@ -702,24 +706,29 @@ end
 @output << "\n"
 @output << build_target
 
+def add_dependencies_from_file(dependencies, filename, path)
+  File.readlines(filename).each do |line|
+    if(line =~ /#include \"(.*)\"/)
+      included_filename = @working_directory + '/' + @source_directory + path + $1
+      begin
+        File.open(included_filename)
+        add_dependencies_from_file(dependencies, included_filename, path)
+      rescue Errno::ENOENT
+        notify("|YWARNING|n: included dependency does not exist - Removing #{filename}:#{included_filename}\n")
+        next
+      rescue
+        notify("|YWARNING|n: #{$!} - Removing #{filename}:#{included_filename}\n")
+        next
+      end
+      dependencies << "\t\\\n\t$(SOURCE)#{path}#{$1}"
+    end
+  end
+end
+
 def add_dependencies(filename, path)
   begin
     dependencies = String.new
-    File.readlines(filename).each do |line|
-      if(line =~ /^#include \"(.*)\"/)
-        file_name = @working_directory + '/' + @source_directory + path + $1
-        begin
-          File.open(file_name)
-        rescue Errno::ENOENT
-          notify("|YWARNING|n: included dependency does not exist - Removing #{filename}:#{file_name}\n")
-          next
-        rescue
-          notify("|YWARNING|n: #{$!} - Removing #{filename}:#{file_name}\n")
-          next
-        end
-        dependencies << "\t\\\n\t$(SOURCE)#{path}#{$1}"
-      end
-    end
+    add_dependencies_from_file(dependencies, filename, path)
     if(dependencies != "")
       dependency_targets = <<-END_OF_STRING
 # Dependencies
@@ -766,7 +775,7 @@ def add_all_dependencies(directory, path)
   Dir.entries(directory).each do |e|
     if(e != '.' && e != '..')
       Dir.chdir(directory) do
-        if(File.directory?(e) == false)
+        if(File.directory?(e) == false && (e =~ /.c$/ || e =~ /.cpp$/))
           add_dependencies(e, path)
         end
       end
@@ -781,9 +790,9 @@ counter = 0
   counter += 1
   executable_target = <<-END_OF_STRING
 $(BINARY)/#{app[0]} : $(OL#{counter})
-\t@echo "|=[|70-]|O"
-\t@echo "|]78|=! #{@emoji_link} Linking Files...|O bin/|g#{app[0]}|=|n|;!|O"
-\t@echo "|={|70-}|O"
+\t@echo "|=[|#{SHORT_WIDTH}-]|O"
+\t@echo "|]#{BOX_WIDTH}|=! #{@emoji_link} Linking Files...|O bin/|g#{app[0]}|=|n|;!|O"
+\t@echo "|={|#{SHORT_WIDTH}-}|O"
 ifeq '$(OS)' 'Windows_NT'
 \t@test -d $(BINARY) |||| mkdir $(BINARY)
 else
@@ -808,9 +817,9 @@ end
   counter += 1
   library_target = <<-END_OF_STRING
 $(BINARY)/#{lib[0]}#{@library_extension} : $(OL#{counter})
-\t@echo "|=[|70-]|O"
-\t@echo "|]78|=! #{@emoji_link} Linking Files...|O bin/|g#{lib[0]}#{@library_extension}|=|n|;!|O"
-\t@echo "|={|70-}|O"
+\t@echo "|=[|#{SHORT_WIDTH}-]|O"
+\t@echo "|]#{BOX_WIDTH}|=! #{@emoji_link} Linking Files...|O bin/|g#{lib[0]}#{@library_extension}|=|n|;!|O"
+\t@echo "|={|#{SHORT_WIDTH}-}|O"
 ifeq '$(OS)' 'Windows_NT'
 \t@test -d $(BINARY) |||| mkdir $(BINARY)
 else
@@ -831,9 +840,9 @@ counter = 0
   counter += 1
   debug_executable_target = <<-END_OF_STRING
 $(BINARY)/#{app[0]}_debug : $(DOL#{counter})
-\t@echo "|=[|70-]|O"
-\t@echo "|]78|=! #{@emoji_debug} #{@emoji_link} Linking Files...|O bin/|g#{app[0]}_debug|=|n|;!|O"
-\t@echo "|={|70-}|O"
+\t@echo "|=[|#{SHORT_WIDTH}-]|O"
+\t@echo "|]#{BOX_WIDTH}|=! #{@emoji_debug} #{@emoji_link} Linking Files...|O bin/|g#{app[0]}_debug|=|n|;!|O"
+\t@echo "|={|#{SHORT_WIDTH}-}|O"
 ifeq '$(OS)' 'Windows_NT'
 \t@test -d $(BINARY) |||| mkdir $(BINARY)
 else
@@ -852,9 +861,9 @@ end
   counter += 1
   debug_library_target = <<-END_OF_STRING
 $(BINARY)/#{lib[0]}_debug#{@library_extension} : $(DOL#{counter})
-\t@echo "|=[|70-]|O"
-\t@echo "|]78|=! #{@emoji_debug} #{@emoji_link} Linking Files...|O bin/|g#{lib[0]}_debug#{@library_extension}|=|n|;!|O"
-\t@echo "|={|70-}|O"
+\t@echo "|=[|#{SHORT_WIDTH}-]|O"
+\t@echo "|]#{BOX_WIDTH}|=! #{@emoji_debug} #{@emoji_link} Linking Files...|O bin/|g#{lib[0]}_debug#{@library_extension}|=|n|;!|O"
+\t@echo "|={|#{SHORT_WIDTH}-}|O"
 ifeq '$(OS)' 'Windows_NT'
 \t@test -d $(BINARY) |||| mkdir $(BINARY)
 else
@@ -916,9 +925,9 @@ END_OF_STRING
 
 @applications.each do |app|
   executable_debug_target = <<-END_OF_STRING
-\t@echo "|=[|70-]|O"
-\t@echo "|]78|=! #{@emoji_debug} #{@emoji_build} |nBuilding executable:|O bin/|g#{app[0]}_debug|=|n|;!|O"
-\t@echo "|={|70-}|O"
+\t@echo "|=[|#{SHORT_WIDTH}-]|O"
+\t@echo "|]#{BOX_WIDTH}|=! #{@emoji_debug} #{@emoji_build} |nBuilding executable:|O bin/|g#{app[0]}_debug|=|n|;!|O"
+\t@echo "|={|#{SHORT_WIDTH}-}|O"
 \t@$(MAKE) $(BINARY)/#{app[0]}_debug
 END_OF_STRING
   if(@emojis == false)
@@ -929,9 +938,9 @@ end
 
 @build_libraries.each do |lib|
   library_debug_target = <<-END_OF_STRING
-\t@echo "|=[|70-]|O"
-\t@echo "|]78|=! #{@emoji_debug} #{@emoji_build} Building library:|O bin/|g#{lib[0]}_debug#{@library_extension}|=|n|;!|O"
-\t@echo "|={|70-}|O"
+\t@echo "|=[|#{SHORT_WIDTH}-]|O"
+\t@echo "|]#{BOX_WIDTH}|=! #{@emoji_debug} #{@emoji_build} Building library:|O bin/|g#{lib[0]}_debug#{@library_extension}|=|n|;!|O"
+\t@echo "|={|#{SHORT_WIDTH}-}|O"
 \t@$(MAKE) $(BINARY)/#{lib[0]}_debug#{@library_extension}
 END_OF_STRING
   if(@emojis == false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: demake
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Minaswan Nakamoto