demake 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1ac5a31edb2868543dc574371715f1c5b06d6c1dda1de3a52172b5208bd7a19
-  data.tar.gz: a393eec65c429d5dc9067f1e867870c5377a971e369f5cd19bf66bb6d01190aa
+  metadata.gz: 3e635ec0a30c148dc71c4aa8bb14e12cd0f45e62346fca6918e9164eef07b153
+  data.tar.gz: ca1693da772c3417751021bf9a436119af069a18becbb6882ad438fdb1e5fcaa
 SHA512:
-  metadata.gz: 974c3c5b88f6f359215f971ba62a13055c2fd7a8556a841f28ac71ca4ecfd5cf58f39fab3eb7c67a24f0f3b8ec3aaf31d0efd0bdf0212225eba1882c7336cff2
-  data.tar.gz: 94ed99765ca34c0bd95e5e052501695605e469f4b9733b8d75868f3fbb21d704d2c9a158d0fa94f60db2151f5d642b438f73c104b7f68fe422252c8c4b4482cd
+  metadata.gz: 354c414bfae2e7e9138dfd7bf7facc0b09f4b3aa71e420a305c2dda6330e9e7846de943f3ba9296014f1658d6638d2586442aa9d32a26c725e841619444ffb33
+  data.tar.gz: ccab035b4f0477e8b2d2b9676936bf28bcfe400a7997e88b11bd1ff623214d7a19734466850f1af3175bf57803982224cbeb0b3f0239392c730e9869e0a113de

data/bin/demake

@@ -1,29 +1,39 @@
 #!/usr/bin/env ruby
 
 #
-# demake - Executeable script which uses Ruby to generate decorated make files
+# demake - Single self-contained executeable script which uses Ruby to generate decorated make files
 #          for multiple related applications.
 
 require 'pipetext'
 
+demake_version = "0.0.3"
+
 debug = true
 quiet = false
 compiler = "gcc"
 #compiler = "clang"
 #compiler = "arm-none-eabi-gcc"
 #compiler = "arm-linux-gnu-gcc"
+
+flags = String.new
+linux_flags = String.new
+x86_64_flags = String.new
+aarch64_flags = String.new
+darwin_flags = String.new
+libraries = String.new
+@raw_binary_files = String.new
+
 binary_directory = "bin"
 source_directory = "src"
 object_directory = "obj"
-@raw_binary_files = String.new
-
-flags = "-ansi -pedantic -D_DEFAULT_SOURCE"
-#flags = "-ansi -pedantic -static -static-libgcc"
-
-libraries = "-lc"
 
 @pipe = Class.new.extend(PipeText)
 
+#
+# !!! If there is a demake/settings.rb file that gets executed NOW as raw code               !!!
+#
+# !!! Incredibly convenient, but potentially a security nightmare -- secure your environment !!!
+#
 begin
   code = File.open('demake/settings.rb').read
   eval code
@@ -63,7 +73,7 @@ end
 
 @output = <<-END_OF_STRING
 #
-# Makefile automatically generated by demake
+# Makefile automatically generated by demake #{demake_version}
 #
 END_OF_STRING
 
@@ -85,21 +95,28 @@ END_OF_STRING
 
 @output << compiler_settings
 
-compiler_flags = <<-END_OF_STRING
-FLAGS = #{flags}
-ifeq '$(OS)' 'Linux'
-  ifeq '$(CC)' 'gcc'
-    FLAGS += -static -static-libgcc
-  else
-    FLAGS += -static
-  endif
-endif
-ifeq '$(OS)' 'Darwin'
-  FLAGS += -bundle
-endif
-ifeq '$(MACHINE)' 'aarch64'
-  FLAGS += -march=native
-endif
+compiler_flags = "FLAGS = #{flags}\n"
+if(linux_flags != "")
+  compiler_flags << "ifeq '$(OS)' 'Linux'\n"
+  compiler_flags << "  FLAGS += #{linux_flags}\n"
+  compiler_flags << "endif\n"
+end
+if(darwin_flags != "")
+  compiler_flags << "ifeq '$(OS)' 'Darwin'\n"
+  compiler_flags << "  FLAGS += #{darwin_flags}\n"
+  compiler_flags << "endif\n"
+end
+if(aarch64_flags != "")
+  compiler_flags << "ifeq '$(MACHINE)' 'aarch64'\n"
+  compiler_flags << "  FLAGS += #{aarch64_flags}\n"
+  compiler_flags << "endif\n"
+end
+if(x86_64_flags != "")
+  compiler_flags << "ifeq '$(MACHINE)' 'x86_64'\n"
+  compiler_flags << "  FLAGS += #{x86_64_flags}\n"
+  compiler_flags << "endif\n"
+end
+compiler_flags += <<-END_OF_STRING
 ifeq '$(DEBUG)' 'true'
   FLAGS += -g -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings
 else
@@ -107,11 +124,11 @@ else
 endif
 CFLAGS = $(FLAGS)
 END_OF_STRING
-
 if(defined?($flags_override))
 STDERR.puts("Overriding compiler flags")
   compiler_flags = "FLAGS = #{flags}\nCFLAGS = $(FLAGS)\n"
 end
+
 @output << compiler_flags
 
 compiler_directories = <<-END_OF_STRING
@@ -137,6 +154,17 @@ counter = 0
   rescue Errno::ENOENT
     @output << "FL#{counter} ="
   end
+  if(File.directory?(source_directory + '/' + app[0]) == true)
+    Dir.entries(source_directory + '/' + app[0]).each do |e|
+      if(e != '.' && e != '..' && e =~ /(.*)\.cp?p?$/)
+        Dir.chdir(source_directory + '/' + app[0]) do
+          if(File.directory?(e) == false)
+            @output << " " + app[0] + '/' + $1 + '.o'
+          end
+        end
+      end
+    end
+  end
   app[1]['dependencies'].each do |dep|
     if(File.directory?(source_directory + '/' + dep) == true)
       Dir.entries(source_directory + '/' + dep).each do |e|
@@ -159,28 +187,26 @@ end
 
 menu_target = <<-END_OF_STRING
 menu :
-\t@clear
-\t@echo "|-[|20-]|o"
-\t@echo "|]28|-! Make targets:|;!|o"
-\t@echo "|]28|-!|;!|o"
-\t@echo "|]27|-! |g|[wrench]|n |Cbuild|n|;!|o"
-\t@echo "|]27|-! |B|[droplet]|n |Cclean|n|;!|o"
-\t@echo "|]27|-! |s|[nut and bolt]|n |Cinstall|n|;!|o"
-\t@echo "|]27|-! |m|[counterclockwise arrows button]|n |Ctest|n|;!|o"
-\t@echo "|-{|20-}|o"
+\t@echo "|-[|23-]|o"
+\t@echo "|-! Make targets:|9 !|o"
+\t@echo "|-!|23 !|o"
+\t@echo "|-! |g|[wrench]|n |Cbuild|n|14 !|o"
+\t@echo "|-! |B|[droplet]|n |Cclean|n|14 !|o"
+\t@echo "|-! |s|[nut and bolt]|n |Cinstall|n|12 !|o"
+\t@echo "|-! |m|[counterclockwise arrows button]|n |Ctest|n|15 !|o"
+\t@echo "|-{|23-}|o"
 END_OF_STRING
 @output << "\n"
 @output << @pipe.pipetext(menu_target)
 
 default_target = <<-END_OF_STRING
 default :
-	@clear
 END_OF_STRING
 
 @applications.each do |app|
   execute_target = <<-END_OF_STRING
 \t@echo "|-[|50-]|o"
-\t@echo "|]57|-! |g|[wrench] |nBuilding executable: |g#{app[0]}|n|;!|o"
+\t@echo "|-! |g|[wrench] |nBuilding executable: |g#{app[0]}|n|17 !|o"
 \t@echo "|-{|50-}|o"
 \t@$(MAKE) #{app[0]}
 END_OF_STRING
@@ -192,13 +218,12 @@ end
 
 build_target = <<-END_OF_STRING
 build :
-	@clear
 END_OF_STRING
 
 @applications.each do |app|
   execute_target = <<-END_OF_STRING
 \t@echo "|-[|50-]|o"
-\t@echo "|]57|-! |g|[wrench] |nBuilding executable: |g#{app[0]}|n|;!|o"
+\t@echo "|-! |g|[wrench] |nBuilding executable: |g#{app[0]}|n|17 !|o"
 \t@echo "|-{|50-}|o"
 \t@$(MAKE) #{app[0]}
 END_OF_STRING
@@ -220,7 +245,7 @@ def add_dependencies(filename, path)
       dependency_targets = <<-END_OF_STRING
 # Dependencies
 $(OBJECT)#{path}#{filename.sub(/\.cp?p?$/, '.o')} : $(SOURCE)#{path}#{filename}#{dependencies}
-\t@echo "|=!|O |R|[fire]|n Compiling... |c$(OBJECT)#{path}#{filename.sub(/\.cp?p?$/, '.o')}|n"
+\t@echo "|=!|O |R|[fire]|n Compiling... |Y$(OBJECT)#{path}#{filename.sub(/\.cp?p?$/, '.o')}|n"
 ifeq '$(OS)' 'Linux'
 \t@mkdir -p $(OBJECT)#{path}
 else
@@ -266,14 +291,14 @@ counter = 0
   execute_target = <<-END_OF_STRING
 #{app[0]} : $(OL#{counter})
 \t@echo "|-[|50-]|o"
-\t@echo "|]57|-! |B|[link]|n Linking Files... |g#{app[0]}|n|;!|o"
+\t@echo "|-! |B|[link]|n Linking Files... |g#{app[0]}|n|21 !|o"
 \t@echo "|-{|50-}|o"
 ifeq '$(OS)' 'Linux'
 \t@mkdir -p $(BINARY)
 else
 \t@if not exist $(BINARY) @mkdir $(BINARY)
 endif
-\t$(CC) $(LIBS) -o $(BINARY)/#{app[0]} $(OL#{counter})#{@raw_binary_files}
+\t$(CC) $(CFLAGS) $(LIBS) -o $(BINARY)/#{app[0]} $(OL#{counter})#{@raw_binary_files}
 END_OF_STRING
   @output << "\n"
   @output << @pipe.pipetext(execute_target)
@@ -282,7 +307,7 @@ end
 dependency_targets = <<-END_OF_STRING
 # General Auto-Dependencies
 $(OBJECT)/%.o : $(SOURCE)/%.c
-\t@echo "|=!|o |R|[fire]|n Compiling... |c$(@)|n"
+\t@echo "|=!|o |R|[fire]|n Compiling... |Y$(@)|n"
 ifeq '$(OS)' 'Linux'
 \t@mkdir -p $(BINARY)
 \t@mkdir -p $(OBJECT)
@@ -310,7 +335,7 @@ END_OF_STRING
 
 test_target = <<-END_OF_STRING
 test :
-\t@echo "|m|[counterclockwise arrows button]|n Starting tests..."
+\t@echo -n "|m|[counterclockwise arrows button]|n Running tests"
 END_OF_STRING
 begin
   code = File.open('demake/test-target.rb').read

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: demake
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Minaswan Nakamoto
@@ -86,7 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="