comet-build 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4f3908e7c959e1cdec30c3c6bcbdba7a1ed0fba
-  data.tar.gz: 0f9b019db674c87c8ccc583310899d0acfc7f5f8
+  metadata.gz: e9162a2dc4bc62ea97f9b8411ddab3fff3ff49bb
+  data.tar.gz: '093a32b3f660ada542d2238b1825d173922aa725'
 SHA512:
-  metadata.gz: 0320fec38fe8576fc16507c2b340586646f03d362b28c6f226a4172893cc5314697225e4d448a01387441a5f51bcd00ef5845ad87228dc5be0dc854d906df6d9
-  data.tar.gz: 697683512fe9754bbcedb348aa6f8d6188f1e1d9c3d8109a6897ec010f909fb94a3d6bb12cc30725a6d323dba35c1805fd9f46cbcbb4ff7dd0183ec5b6ff720a
+  metadata.gz: e9108c92b2713c45d661cc44acaa0f5122d8d1d75b22724c3ed968d0b8eea024d50322e1a12e2438155fba3166a2ecaac504992c9ac7577bb7cef96caf802178
+  data.tar.gz: 5c4d1c9cc942266ab8d084245aafa620f7d5b68d46e354d900bebf82d602299c969884f71b79e20f6d922df9ded931df059f304784d0d153eb134559a6de005f

data/lib/comet/makefile.rb

@@ -8,7 +8,8 @@ module Comet
     end
 
     def contents
-      (commands + @rules.map(&:contents)).flatten.join "\n"
+      output = (commands + @rules.map(&:contents))
+      output.flatten.map(&:rstrip).join("\n") + "\n"
     end
 
     def execute(*args)

data/lib/comet/rules/link.rb

@@ -26,9 +26,11 @@ module Comet
       end
 
       def contents
+        obj_dependencies = "#{@dependency.target} #{@native_sources.join ' '}"
+
         [
-          "#{target}: #{@dependency.target} #{@native_sources.join ' '} #{@linker.script_ || ''} | #{Comet::TMPDIR}",
-          "\t#{clang_link} #{formatted_script} #{formatted_flags.join ' '} -Wl,-Map=#{map_file} -o $@ $^ #{formatted_libraries}"
+          "#{target}: #{obj_dependencies} #{@linker.script_ || ''} | #{Comet::TMPDIR}",
+          "\t#{clang_link} #{formatted_script} #{formatted_flags.join ' '} -Wl,-Map=#{map_file} -o $@ #{obj_dependencies} #{formatted_libraries}"
         ]
       end
 

data/lib/comet/version.rb

@@ -1,3 +1,3 @@
 module Comet
-  VERSION = '0.1.7'.freeze
+  VERSION = '0.1.8'.freeze
 end

data/spec/comet/complex_c_program/Makefile

@@ -23,7 +23,7 @@ test/linux_x86: .comet/8030c3912f57888f83ad.phony
 	$(COMET_CP) .comet/e7b25529bcd9f873ade7.bin bin/test_linux_x64.bin
 	$(COMET_CP) .comet/e542f5d8ea9b413c1db8.map bin/test_linux_x86.map
 .comet/e542f5d8ea9b413c1db8.elf: .comet/ae8d70c4ad166e5f05e6.s   | .comet
-	$(COMET_LD) --target=x86-unknown-linux-gnu -march=skylake -mcpu=skylake   -Wl,-Map=.comet/e542f5d8ea9b413c1db8.map -o $@ $^ 
+	$(COMET_LD) --target=x86-unknown-linux-gnu -march=skylake -mcpu=skylake   -Wl,-Map=.comet/e542f5d8ea9b413c1db8.map -o $@ .comet/ae8d70c4ad166e5f05e6.s
 .comet/ae8d70c4ad166e5f05e6.s: .comet/1a6fa701e7f59b5130cf.ll | .comet
 	$(COMET_OPT) -S -Ofast --target=x86-unknown-linux-gnu -march=skylake -mcpu=skylake -o $@ $<
 .comet/1a6fa701e7f59b5130cf.ll: .comet/848a630ef53895b3e139.ll .comet/44b0462bd14ef6c5f324.ll .comet/3e98d572194d9f0797c2.ll | .comet
@@ -41,7 +41,7 @@ test/linux_x86: .comet/8030c3912f57888f83ad.phony
 	$(COMET_CP) .comet/9dc94950d9e3e85125d8.elf bin/test_linux_x64.elf
 	$(COMET_CP) .comet/9dc94950d9e3e85125d8.map bin/test_linux_x64.map
 .comet/9dc94950d9e3e85125d8.elf: .comet/c8008c83512b753cc0f5.s   | .comet
-	$(COMET_LD) --target=x86_64-unknown-linux-gnu -march=skylake -mcpu=skylake   -Wl,-Map=.comet/9dc94950d9e3e85125d8.map -o $@ $^ 
+	$(COMET_LD) --target=x86_64-unknown-linux-gnu -march=skylake -mcpu=skylake   -Wl,-Map=.comet/9dc94950d9e3e85125d8.map -o $@ .comet/c8008c83512b753cc0f5.s
 .comet/c8008c83512b753cc0f5.s: .comet/5b532eac405115700e15.ll | .comet
 	$(COMET_OPT) -S -O3 --target=x86_64-unknown-linux-gnu -march=skylake -mcpu=skylake -o $@ $<
 .comet/5b532eac405115700e15.ll: .comet/4b993a43966c8f84b121.ll .comet/29c2bb990093d697ea4f.ll .comet/1872519e0f2a83f8c783.ll | .comet
@@ -54,4 +54,4 @@ test/linux_x86: .comet/8030c3912f57888f83ad.phony
 	$(COMET_CC) -x c --target=x86_64-unknown-linux-gnu -march=skylake -mcpu=skylake -S -flto -Isrc -Iinclude -std=c89 -o $@ -c $<
 .PHONY: clean
 clean:
-	$(COMET_RM) -rf .comet
+	$(COMET_RM) -rf .comet

data/spec/comet/empty_build_file/Makefile

@@ -1,10 +1,10 @@
 COMET_LN ?= ln
 COMET_RM ?= rm
 .PHONY: all
-all: 
+all:
 .PHONY: .comet
 .comet:
 	if [ ! -d "$@" ] || [ ! -d "`readlink .comet`" ]; then $(COMET_LN) -sf `mktemp -d` $@; fi
 .PHONY: clean
 clean:
-	$(COMET_RM) -rf .comet
+	$(COMET_RM) -rf .comet

data/spec/comet/nested_circular_reference/Makefile

@@ -2,4 +2,4 @@ COMET_LN ?= ln
 $(error Circular dependency involving `foo' detected)
 .PHONY: .comet
 .comet:
-	if [ ! -d "$@" ] || [ ! -d "`readlink .comet`" ]; then $(COMET_LN) -sf `mktemp -d` $@; fi
+	if [ ! -d "$@" ] || [ ! -d "`readlink .comet`" ]; then $(COMET_LN) -sf `mktemp -d` $@; fi

data/spec/comet/no_build_file/Makefile

@@ -2,4 +2,4 @@ COMET_LN ?= ln
 $(error No build file 'comet.rb' found)
 .PHONY: .comet
 .comet:
-	if [ ! -d "$@" ] || [ ! -d "`readlink .comet`" ]; then $(COMET_LN) -sf `mktemp -d` $@; fi
+	if [ ! -d "$@" ] || [ ! -d "`readlink .comet`" ]; then $(COMET_LN) -sf `mktemp -d` $@; fi

data/spec/comet/self_referential/Makefile

@@ -2,4 +2,4 @@ COMET_LN ?= ln
 $(error Circular dependency involving `foo' detected)
 .PHONY: .comet
 .comet:
-	if [ ! -d "$@" ] || [ ! -d "`readlink .comet`" ]; then $(COMET_LN) -sf `mktemp -d` $@; fi
+	if [ ! -d "$@" ] || [ ! -d "`readlink .comet`" ]; then $(COMET_LN) -sf `mktemp -d` $@; fi

data/spec/comet/simple_c_program/Makefile

@@ -18,7 +18,7 @@ main/linux_x64: .comet/116dd1901deffe3fa447.phony
 .comet/116dd1901deffe3fa447.phony: .comet/457234dc02f9dfb5542f.elf
 	$(COMET_CP) .comet/457234dc02f9dfb5542f.elf main
 .comet/457234dc02f9dfb5542f.elf: .comet/ccb40296b80a66398214.s   | .comet
-	$(COMET_LD) --target=x86_64-unknown-linux-gnu -march=skylake -mcpu=skylake   -Wl,-Map=.comet/457234dc02f9dfb5542f.map -o $@ $^ 
+	$(COMET_LD) --target=x86_64-unknown-linux-gnu -march=skylake -mcpu=skylake   -Wl,-Map=.comet/457234dc02f9dfb5542f.map -o $@ .comet/ccb40296b80a66398214.s
 .comet/ccb40296b80a66398214.s: .comet/93cf4b5489860f6a6154.ll | .comet
 	$(COMET_OPT) -S -O1 --target=x86_64-unknown-linux-gnu -march=skylake -mcpu=skylake -o $@ $<
 .comet/93cf4b5489860f6a6154.ll: .comet/02c92d481320c450e153.ll | .comet
@@ -27,4 +27,4 @@ main/linux_x64: .comet/116dd1901deffe3fa447.phony
 	$(COMET_CC) -x c --target=x86_64-unknown-linux-gnu -march=skylake -mcpu=skylake -S -flto -I.  -o $@ -c $<
 .PHONY: clean
 clean:
-	$(COMET_RM) -rf .comet
+	$(COMET_RM) -rf .comet

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comet-build
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Thomas Beneteau