shog-build 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 7f49d027a321448925e0f892832dccc8b404ca19bc4bc0562c1d8f590e7bcc56
-  data.tar.gz: 3e6e8a0c6735f9f384fbfae3801a7dc9dd308a66741e8cb984b0b1bf666d2905
+SHA1:
+  metadata.gz: a26351c3bae67007049fe193705610225870f2b2
+  data.tar.gz: 5fd6af4692ed58a853d217cb17e865d998640382
 SHA512:
-  metadata.gz: 42fe34af7f11eae56ed29ab62143436c9edfdfd6cddfb39e4467081e6ff9be6e8ea025eaab644991eb662d73a2dba3ece969db197c42e54e2c64a4c8e1f7bf06
-  data.tar.gz: a0d658bd2812311da1d7814d928d974cffe871e6e1e0dc2f0139b6329d5a3fd8d0be69bbe7ed3e317affd41d9d6471bedec75ab80314620502f4b679052757e5
+  metadata.gz: 0e57714c706dd40877a7779ad0ac0c1820ed4fe0834f0b86dd778998007066e4ea190b7f6d0d477b0765dd8afd0cf17f422f101d73287da1fc38d5444d22c842
+  data.tar.gz: 1e1a0af9442049652ed6a89e78ebf7122ce4b4119c8ee3b7c3b2492f0f92803ba46d8d3871c30dfb22b0a0184010e0f36c96e06fb9477b3fe1523dbb4ecd30d7

data/lib/context.rb

@@ -1,5 +1,5 @@
-require_relative 'util'
-require_relative 'pathset'
+require_relative "util"
+require_relative "pathset"
 
 module Shog
   # An instance of this class is visible to our build scripts with name @shog
@@ -30,7 +30,7 @@ module Shog
       ctx = new_ctx ? deep_clone() : self
 
       Path.pwd = File.join(Path.pwd, dir)
-      script = cwd('shog.build')
+      script = cwd("shog.build")
       @rule[:generate_build].deps << script
       script_name = script.path
       build_script = File.read(script_name)

data/lib/generator.rb

@@ -1,10 +1,10 @@
-require_relative 'context'
-require_relative 'rule/cc'
-require_relative 'rule/link'
-require_relative 'rule/objcopy'
-require_relative 'rule/kconfig'
-require_relative 'rule/generate_build'
-require_relative 'rule/yacc'
+require_relative "context"
+require_relative "rule/cc"
+require_relative "rule/link"
+require_relative "rule/objcopy"
+require_relative "rule/kconfig"
+require_relative "rule/generate_build"
+require_relative "rule/yacc"
 
 module Shog
   class Generator
@@ -16,8 +16,9 @@ module Shog
       emitter = @backend.emitter
       ctx = Context.new(@backend, emitter)
 
-      if File.exists?('Kconfig') and not File.exists?('.config')
-        system 'conf --alldefconfig -s Kconfig'
+      if File.exists?("Kconfig") and not File.exists?(".config")
+        success = system("conf --alldefconfig -s Kconfig")
+        exit 1 unless success
       end
 
       # Register all rules
@@ -28,8 +29,8 @@ module Shog
       ctx.register_rule(GenerateBuild)
       ctx.register_rule(Yacc)
 
-      Path.pwd = '.'
-      ctx.visit_dir('.', false)
+      Path.pwd = "."
+      ctx.visit_dir(".", false)
 
       emitter.default(ctx.default_target)
 

data/lib/ninja.rb

@@ -3,8 +3,8 @@ module Shog
     attr_reader :backend_file
 
     def initialize
-      @out_dir = 'out'
-      @backend_file = File.join(@out_dir, 'build.ninja')
+      @out_dir = "out"
+      @backend_file = File.join(@out_dir, "build.ninja")
     end
 
     def configured?
@@ -21,7 +21,7 @@ module Shog
 
     class Emitter
       def initialize(file)
-        @out = File.open(file, 'w')
+        @out = File.open(file, "w")
       end
 
       def finish
@@ -30,7 +30,7 @@ module Shog
 
       def default(target)
         unless target.empty?
-          @out.puts "default #{target.join(' ')}"
+          @out.puts "default #{target.join(" ")}"
           @out.puts
         end
       end
@@ -46,13 +46,13 @@ module Shog
 
       def emit(target)
         rule = target[:rule]
-        input = target[:input].join(' ')
+        input = target[:input].join(" ")
         implicit_input = if target[:implicit_input] and not target[:implicit_input].empty?
-                           ' | ' + target[:implicit_input].join(' ')
+                           " | " + target[:implicit_input].join(" ")
                          else
-                           ''
+                           ""
                          end
-        output = target[:output].join(' ')
+        output = target[:output].join(" ")
         variables = target[:variables]
         @out.puts "build #{output}: #{rule} #{input}#{implicit_input}"
         for k, v in variables

data/lib/path.rb

@@ -1,8 +1,8 @@
-require 'pathname'
+require "pathname"
 
 module Shog
   class Path
-    @pwd = '.'
+    @pwd = "."
 
     class << self
       attr_accessor :pwd
@@ -65,7 +65,7 @@ module Shog
       if @outoftree or @absolute
         @path
       else
-        File.join('..', @path)
+        File.join("..", @path)
       end
     end
   end

data/lib/pathset.rb

@@ -1,4 +1,4 @@
-require_relative 'path'
+require_relative "path"
 
 module Shog
   class PathSet < Array

data/lib/rule/cc.rb

@@ -1,4 +1,4 @@
-require_relative '../path'
+require_relative "../path"
 
 module Shog
   class CC
@@ -16,10 +16,10 @@ module Shog
 
     def rule
       {
-        'command' => '$bin $cflags -MMD -MQ $out -MF $out.d -c $in -o $out',
-        'description' => 'Compile $in',
-        'deps' => 'gcc',
-        'depfile' => '$out.d',
+        "command" => "$bin $cflags -MMD -MQ $out -MF $out.d -c $in -o $out",
+        "description" => "Compile $in",
+        "deps" => "gcc",
+        "depfile" => "$out.d",
       }
     end
 
@@ -31,25 +31,25 @@ module Shog
       if params[:output]
         output << Path.make(params[:output], :outoftree => true)
       else
-        output << Path.make(params[:input].single_path, :outoftree => true).with_suffix('.o')
+        output << Path.make(params[:input].single_path, :outoftree => true).with_suffix(".o")
       end
 
       cflags = @cflags.dup
       cflags << params[:cflags] if params[:cflags]
-      cflags += @includes.map { |i| '-I' + i }
+      cflags += @includes.map { |i| "-I" + i }
       includes = params[:includes]
       if includes
         includes = PathSet.make(includes)
-        cflags += includes.map { |i| '-I' + i }
+        cflags += includes.map { |i| "-I" + i }
       end
 
       variables = {
-        'cflags' => cflags.join(' '),
-        'bin' => params[:bin] || @bin || 'gcc',
+        "cflags" => cflags.join(" "),
+        "bin" => params[:bin] || @bin || "gcc",
       }
       implicit_input = @implicit_input.dup
       implicit_input += params[:implicit_input] if params[:implicit_input]
-      {:rule => 'cc', :input => input, :implicit_input => implicit_input, :output => output, :variables => variables}
+      {:rule => "cc", :input => input, :implicit_input => implicit_input, :output => output, :variables => variables}
     end
   end
 end

data/lib/rule/generate_build.rb

@@ -1,4 +1,4 @@
-require_relative '../path'
+require_relative "../path"
 
 module Shog
   class GenerateBuild
@@ -14,20 +14,20 @@ module Shog
 
     def rule
       {
-        'command' => 'cd .. && shog generate',
-        'description' => 'Generate Build Script',
+        "command" => "cd .. && (shog generate || rm out/build.ninja)",
+        "description" => "Generate Build Script",
       }
     end
 
     def target(params)
       output = PathSet.new
-      output << Path.make('build.ninja', :outoftree => true, :root => true)
+      output << Path.make("build.ninja", :outoftree => true, :root => true)
       variables = {
-        'generator' => '1',
+        "generator" => "1",
       }
       input = PathSet.new(params[:input])
       input += @deps
-      {:rule => 'generate_build', :input => input, :output => output, :variables => variables}
+      {:rule => "generate_build", :input => input, :output => output, :variables => variables}
     end
   end
 end

data/lib/rule/kconfig.rb

@@ -1,4 +1,4 @@
-require_relative '../path'
+require_relative "../path"
 
 module Shog
   class Kconfig
@@ -12,21 +12,21 @@ module Shog
 
     def rule
       {
-        'command' => 'KCONFIG_CONFIG=$out conf --oldconfig -s $in',
-        'description' => 'Generate .config file',
+        "command" => "KCONFIG_CONFIG=$out conf --oldconfig -s $in",
+        "description" => "Generate .config file",
       }
     end
 
     def target(params)
       output = PathSet.new(Path.make(params[:output]))
       input = PathSet.new(Path.make(params[:input]))
-      {:rule => 'kconfig', :input => input, :output => output}
+      {:rule => "kconfig", :input => input, :output => output}
     end
 
     def self.parse(file)
       config = {}
       for line in IO.readlines(file)
-        next if line.start_with?('#')
+        next if line.start_with?("#")
         if line =~ /^CONFIG_(.*?)=(.*)$/
           key = $1.to_sym
           val = $2

data/lib/rule/link.rb

@@ -1,4 +1,4 @@
-require_relative '../path'
+require_relative "../path"
 
 module Shog
   class Link
@@ -14,8 +14,8 @@ module Shog
 
     def rule
       {
-        'command' => '$bin $ldflags $in -o $out',
-        'description' => 'Linking $out',
+        "command" => "$bin $ldflags $in -o $out",
+        "description" => "Linking $out",
       }
     end
 
@@ -24,17 +24,17 @@ module Shog
       input = PathSet.make(params[:input])
       ldflags = params[:ldflags]
       if ldflags.nil?
-        ldflags = ''
+        ldflags = ""
       elsif ldflags.is_a?(Array)
-        ldflags = ldflags.join(' ')
+        ldflags = ldflags.join(" ")
       end
       variables = {
-        'ldflags' => ldflags,
-        'bin' => params[:bin] || @bin || 'gcc',
+        "ldflags" => ldflags,
+        "bin" => params[:bin] || @bin || "gcc",
       }
       implicit_input = @implicit_input.dup
       implicit_input += params[:implicit_input] if params[:implicit_input]
-      {:rule => 'ld', :input => input, :implicit_input => implicit_input, :output => output, :variables => variables}
+      {:rule => "ld", :input => input, :implicit_input => implicit_input, :output => output, :variables => variables}
     end
   end
 end

data/lib/rule/objcopy.rb

@@ -1,4 +1,4 @@
-require_relative '../path'
+require_relative "../path"
 
 module Shog
   class ObjCopy
@@ -10,8 +10,8 @@ module Shog
 
     def rule
       {
-        'command' => '$bin -O $arch $in $out',
-        'description' => 'Objcopy $out',
+        "command" => "$bin -O $arch $in $out",
+        "description" => "Objcopy $out",
       }
     end
 
@@ -26,10 +26,10 @@ module Shog
                end
 
       variables = {
-        'bin' => params[:bin] || @bin || 'objcopy',
+        "bin" => params[:bin] || @bin || "objcopy",
       }
-      variables['arch'] = params[:arch] if params[:arch]
-      {:rule => 'objcopy', :input => input, :output => output, :variables => variables}
+      variables["arch"] = params[:arch] if params[:arch]
+      {:rule => "objcopy", :input => input, :output => output, :variables => variables}
     end
   end
 end

data/lib/rule/yacc.rb

@@ -1,4 +1,4 @@
-require_relative '../path'
+require_relative "../path"
 
 module Shog
   class Yacc
@@ -8,15 +8,15 @@ module Shog
 
     def rule
       {
-        'command' => 'yacc -o $out $in',
-        'description' => 'Yacc $in',
+        "command" => "yacc -o $out $in",
+        "description" => "Yacc $in",
       }
     end
 
     def target(params)
       input = PathSet.make(params[:input])
       output = PathSet.make(Path.make(params[:output], :outoftree => true))
-      {:rule => 'yacc', :input => input, :output => output, :variables => {}}
+      {:rule => "yacc", :input => input, :output => output, :variables => {}}
     end
   end
 end

data/lib/runner.rb

@@ -1,9 +1,9 @@
-require_relative 'ninja'
-require_relative 'generator'
+require_relative "ninja"
+require_relative "generator"
 
 module Shog
   module Runner
-    WORKDIR = 'out'
+    WORKDIR = "out"
 
     def generate(backend)
       Dir.mkdir(WORKDIR) unless Dir.exists?(WORKDIR)
@@ -12,7 +12,7 @@ module Shog
     end
 
     def run(argv)
-      unless File.exists?('shog.build')
+      unless File.exists?("shog.build")
         puts "shog.build file is not found in #{Dir.pwd}"
         exit 1
       end
@@ -20,13 +20,14 @@ module Shog
       backend = Ninja.new
 
       cmd = argv[0]
-      if cmd == 'generate'
+      if cmd == "generate"
         generate(backend)
         return
       end
 
       generate(backend) unless backend.configured?
-      backend.run
+      success = backend.run
+      exit 1 unless success
     end
 
     module_function :run, :generate

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shog-build
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Anatol Pomozov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2018-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby frontend for Ninja build system