rmk-ruby 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be3404ff6e1f80db98d4853acdf332a936f94ed8619a42a9449f1ce582a4392a
-  data.tar.gz: 828c0fb3c99466fec6ac8eb8ed66d48722565261ea19b19fdf317986f9e58f72
+  metadata.gz: a2f8e946c94da26efa07f21a22538d1c03a41def9990c7a51123366fff63f6dc
+  data.tar.gz: 6484a1d3da557c05b7b8b9356fd99f319ede7616e65122282fbf0f19add6f3c0
 SHA512:
-  metadata.gz: 506fd0d6e89f221ba6d05f4bdef35bfc344c32f0fda511da4c93efdd27dad51abb2458e40d3cce834e19118c826ece4d182826f507a6331a02fb0b51c6f32a5f
-  data.tar.gz: b1053e4e6612a23cd9433299d6f867380982ed3b78cbba64c89d26936740549909815464a3c6c24ff6e1e029332678a2077c0d28138d489856968b30241aac2d
+  metadata.gz: 1ce6f5455e2e95323c1222fbb3ddb7f2c17f93f773789fff69810ae5103dbe62f5b35b004eec91805248721c5d85a004011e1e6d57e1ef11deef423dff4a7d3f
+  data.tar.gz: 6aea3ab211a8297850136e56deaeb6c735d5716863c93eb9ee3b5f86adfa567b33d9b01529f8c20696efe64f76f4a98e8e77565b5645a449d978b82d2dda4a83

data/exe/rmk

@@ -1,23 +1,36 @@
 #!/usr/bin/env ruby
 
 require 'optparse'
-require 'iniparse'
 require "rmk"
 
 options = {}
+cache_options = {}
 parser = OptionParser.new{ |opts|
 	opts.summary_width = 48
 	opts.banner = 'Usage: rmk [Options] [targets]'
-	opts.separator ''
-	opts.on '-O', '--outdir=dir', 'output root dir,can be absolute or relative to pwd,default _Build' do |dir|
-		options[:outroot] = dir
+	opts.separator 'repository options:'
+	opts.on '-C', '--directory=dir', 'repository root dir, will change to this dir before other operation, default pwd' do |dir|
+		options[:prjroot] = dir
 	end
-	opts.on '-S', '--srcdir=dir', 'source root dir,can be absolute or relative to output root(start with ..),default ..' do |dir|
-		options[:srcroot] = dir
+
+	opts.separator 'directory options(will be cached when seted):'
+	opts.on '-O', '--outdir=dir', 'output root dir, can be absolute or relative to repository root, default _Build' do |dir|
+		cache_options[:outroot] = dir
+	end
+	opts.on '-S', '--srcdir=dir', 'source root dir, can be absolute or relative to output root(start with ..), default ..' do |dir|
+		cache_options[:srcroot] = dir
 	end
-	opts.on '-V', '--variant [x,y,z]', Array, 'variant list to build, empty for build all variants' do |list|
-		options[:variants] = list || []
+	opts.on '--link-outdir=dir', 'symbol link outdir to this dir, default <system temp dir>/<repository name>, set / to disable' do |dir|
+		cache_options[:link] = dir
 	end
+	opts.on '--name=name', "repository name, default repository root dir's name" do |name| cache_options[:name] = name end
+
+	opts.separator 'variant options:'
+	opts.on '-V', '--variant x,y,z', Array, 'variant list to build' do |list|
+		options[:variants] = list
+	end
+
+	opts.separator 'info options:'
 	opts.on '-h', '--help', 'show this help' do
 		puts opts
 		exit
@@ -28,47 +41,57 @@ parser = OptionParser.new{ |opts|
 	end
 }
 targets = parser.parse(ARGV)
-if options[:variants]
-	raise "variants config file 'variants.rmk' not exist" unless File.exist? 'variants.rmk'
-	inifile = IniParse.open 'variants.rmk'
+Dir.chdir options[:prjroot] if options[:prjroot]
+options_file = '.rmk/options'
+loaded_options = File.exist?(options_file) ? Marshal.load(IO.binread options_file) : {}
+changed = false
+%i(outroot srcroot link name).each do |key|
+	next changed = true if cache_options.include? key
+	next cache_options[key] = loaded_options[key] if loaded_options[key]
+	changed = true
+end
+cache_options[:outroot] ||= '_Build'
+cache_options[:srcroot] ||= '..'
+cache_options[:name] ||= File.basename Dir.pwd
+cache_options[:link] ||= File.join ENV['TMP'], cache_options[:name]
+if changed
+	Dir.mkdir '.rmk' unless Dir.exist? '.rmk'
+	IO.binwrite options_file, Marshal.dump(cache_options)
+end
+dir, link = cache_options[:outroot], cache_options[:link]
+if link && link != '/'
+	require 'fileutils'
+	link = link.gsub(/\$(?:(\$)|{(.*?)})/){$1 || ENV[$2]}.gsub! ?\\, ?\/
+	FileUtils.mkpath link unless Dir.exist? link
+	if File.symlink? dir
+		if File.readlink(dir) != link
+			Dir.rmdir dir
+			File.symlink link, dir
+		end
+	elsif Dir.exist?(dir) || File.exist?(dir)
+		raise "need symlink '#{dir}' as outroot, but file(or dir) '#{dir}' already exist"
+	else
+		FileUtils.mkpath File.dirname dir
+		File.symlink link, dir
+	end
+else
+	FileUtils.mkpath dir
+end
+variants = options[:variants]
+if variants && variants.size != 1
 	targets = targets.map{|tgt| %|"#{tgt}"|}.join ' '
 	exe = File.join RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']
 	thrs = []
-	(options[:variants].empty? ? inifile : options[:variants].map!{|vn|
-		variant = inifile[vn]
-		warn "variant '#{vn}' doesn't exist" unless variant
-		variant
-	}).each do |variant|
-		next unless variant
-		thrs << Thread.new{ system %|"#{exe}" "#{__FILE__}" -O"#{variant['outdir']}" -S"#{variant['srcdir']}" #{targets}|}
-	end
+	variants.each {|name| thrs << Thread.new {system %|"#{exe}" "#{__FILE__}" -V #{name} #{targets}|}}
 	thrs.each{|thr| thr.join}
 	exit
 end
-if File.exist? 'ini.rmk'
-	inifile = IniParse.open 'ini.rmk'
-	dir, link = inifile['Outdir']['Path'], inifile['Outdir']['LinkTo']
-	if link
-		require 'fileutils'
-		link = link.gsub(/\$(?:(\$)|{(.*?)})/){$1 || ENV[$2]}.gsub! ?\/, ?\\
-		FileUtils.mkpath link unless Dir.exist? link
-		if File.symlink? dir
-			if File.readlink(dir) != link
-				Dir.rmdir dir
-				File.symlink link, dir
-			end
-		elsif Dir.exist?(dir) || File.exist?(dir)
-			raise "need symlink '#{dir}' as outroot, but file(or dir) '#{dir}' already exist"
-		else
-			FileUtils.mkpath File.dirname dir
-			File.symlink link, dir
-		end
-	else
-		FileUtils.mkpath dir
-	end
-	options[:srcroot] ||= inifile['Srcdir']['Path']
-	options[:outroot] ||= dir
+if variants
+	variants = variants[0]
+	src = cache_options[:srcroot].match?(/^[a-z]:\//i) ? cache_options[:srcroot] : File.join('..', cache_options[:srcroot])
+	rmk = Rmk.new srcroot:src, outroot:File.join(cache_options[:outroot], variants), variant:variants
+else
+	rmk = Rmk.new srcroot:cache_options[:srcroot], outroot:cache_options[:outroot]
 end
-rmk = Rmk.new srcroot:options[:srcroot] || '..', outroot:options[:outroot] || '_Build'
 rmk.parse
 rmk.build *targets

data/lib/rmk/build.rb

@@ -124,16 +124,6 @@ class Rmk::Build
 		storage.sync{|data| data[@outfiles[0].path] = digest}
 	end
 
-	@output_mutex = Thread::Mutex.new
-	def self.puts(*parms) @output_mutex.synchronize{$stdout.puts *parms} end
-	def self.err_puts(*parms) @output_mutex.synchronize{$stderr.puts *parms} end
-	def self.log_cmd_out(out, err)
-		@output_mutex.synchronize do
-			$stdout.puts out unless out.empty?
-			$stderr.puts err unless err.empty?
-		end
-	end
-
 	def parser_force_run!
 		return if @runed
 		@runed = :force
@@ -182,14 +172,13 @@ class Rmk::Build
 			env['PATH'] = @vars['PATH_prepend'] + ENV['PATH'] if @vars['PATH_prepend']
 			@vars['ENV_export'].split(/\s+/).each{|name| env[name] = @vars[name] if @vars.include? name} if @vars['ENV_export']
 			std, err, result = env.empty? ? Open3.capture3(cmd) : Open3.capture3(env, cmd)
-			std = std.empty? ? @vars['echo'] || "Rmk: run: #{cmd}" : (@vars['echo'] || "Rmk: run: #{cmd}") + ?\n + std
 			if result.exitstatus != 0
 				err = "execute faild: '#{cmd}'" if err.empty?
-				Rmk::Build.log_cmd_out std, err
+				@dir.rmk.log_cmd_out @vars['echo'] || cmd, std, err
 				@outfiles.each{|file| File.delete file.path if File.exist? file.path}
 				return false
 			end
-			Rmk::Build.log_cmd_out std, err
+			@dir.rmk.log_cmd_out @vars['echo'] || cmd, std, err
 		end
 		true
 	end
@@ -197,12 +186,12 @@ class Rmk::Build
 	private def process_depfile
 		return unless @vars['deptype']
 		unless File.exist? @vars['depfile']
-			Rmk::Build.err_puts "Rmk: depend file '#{@vars['depfile']}' which must be created by build '#{@vars['out']}' not found"
+			@dir.rmk.err_puts 'error: ', "depend file '#{@vars['depfile']}' which must be created by build '#{@vars['out']}' not found"
 		end
 		if @vars['deptype'] == 'make'
 			files = parse_make_depfile @vars['depfile']
 			File.delete @vars['depfile']
-			return Rmk::Build.err_puts "Rmk: syntax of depend file '#{@vars['depfile']}' not support yet" unless files
+			return @dir.rmk.err_puts 'error: ' "syntax of depend file '#{@vars['depfile']}' not support yet" unless files
 			@dir.rmk.dep_storage[@outfiles[0].path] = files
 			files.each do |file|
 				file = File.absolute_path Rmk.normalize_path(file), @dir.rmk.outroot
@@ -211,7 +200,7 @@ class Rmk::Build
 			end
 			files
 		else
-			Rmk::Build.err_puts "Rmk: depend type '#{@vars['deptype']}' not support"
+			@dir.rmk.err_puts 'warn: ', "depend type '#{@vars['deptype']}' not support"
 		end
 	end
 

data/lib/rmk/rmk.rb

@@ -8,11 +8,37 @@ class Rmk
 	# @return [String]
 	def self.normalize_path(path) path.gsub(?\\, ?/).sub(/^[a-z](?=:)/){|ch|ch.upcase} end
 
+	private def log(stream, mark, *parms)
+		return stream.puts *parms unless mark
+		stream.print @log_prefix, mark
+		return stream.puts *parms unless parms.size > 1
+		stream.puts ''
+		parms.each{|parm| stream.print ?\t; stream.puts parm}
+		nil
+	end
+
+	def std_puts(mark, *parms) @stdoe_mutex.synchronize{log $stdout, mark, *parms} end
+
+	def err_puts(mark, *parms) @stdoe_mutex.synchronize{log $stderr, mark, *parms} end
+
+	private def split_log(stream, mark, lines)
+		begin stream.print @log_prefix; stream.puts mark end if mark
+		lines.each_line{|line| stream.print ?\t; stream.puts line}
+	end
+
+	def log_cmd_out(mark, out, err)
+		@stdoe_mutex.synchronize do
+			split_log $stdout, mark, out
+			split_log $stderr, nil, err unless err.empty?
+		end
+	end
+
 	# create Rmk object
 	# @param srcroot [String] source root dir,can be absolute or relative to output root(start with ..)
 	# @param outroot [String] output root dir,can be absolute or relative to pwd,default pwd
-	def initialize(srcroot:'', outroot:'')
+	def initialize(srcroot:'', outroot:'', variant:nil)
 		@files_mutex = Thread::Mutex.new	# files operate mutex
+		@stdoe_mutex = Thread::Mutex.new	# stdout and stderr mutex
 
 		srcroot = Rmk.normalize_path srcroot
 		@outroot = File.join Rmk.normalize_path(File.absolute_path outroot), ''
@@ -29,7 +55,10 @@ class Rmk
 		@srcfiles = {}
 		@outfiles = {}
 		@defaultfiles = []
-		@vars = {'srcroot'=>@srcroot[0..-2], 'outroot'=>@outroot[0..-2], 'src_rto_root'=>(@src_relative || @srcroot)[0..-2]}.freeze
+		@vars = {'srcroot'=>@srcroot[0..-2], 'outroot'=>@outroot[0..-2], 'src_rto_root'=>(@src_relative || @srcroot)[0..-2]}
+		@vars['variant'] = variant if variant
+		@vars.freeze
+		@log_prefix = variant ? "Rmk (#{variant}): " : 'Rmk: '
 		@virtual_root = Rmk::VDir.new self, nil
 	end
 	attr_reader :srcroot, :outroot, :vars, :virtual_root, :srcfiles, :outfiles
@@ -145,17 +174,17 @@ class Rmk
 	# parse project
 	# @return [self]
 	def parse
-		puts 'Rmk: parse start'
+		std_puts 'parse start'
 		@mid_storage.wait_ready
 		@dep_storage.wait_ready
 		@cml_storage.wait_ready
 		@virtual_root.parse
-		puts 'Rmk: parse done'
+		std_puts 'parse done'
 		self
 	end
 
 	def build(*tgts)
-		puts 'Rmk: build start'
+		std_puts 'build start'
 		if tgts.empty?
 			files = @defaultfiles
 		else
@@ -178,14 +207,14 @@ class Rmk
 				fi.output_ref_build.orderfiles.each &checkproc
 			end
 			files.each &checkproc
-			exit puts('found nothing to build') || 0 if checklist.empty?
+			exit std_puts('','found nothing to build') || 0 if checklist.empty?
 			checklist.each {|file| file.check_for_build}
 		end
 		while Thread.list.size > 1
 			thr = Thread.list[-1]
 			thr.join unless thr == Thread.current
 		end
-		puts 'Rmk: build end'
+		std_puts 'build end'
 		@mid_storage.save
 		@dep_storage.data!.each_key {|key| @dep_storage.data!.delete key unless @outfiles.include? key}
 		@dep_storage.save

data/lib/rmk/vdir.rb

@@ -490,8 +490,8 @@ class Rmk::VDir
 			state = begin_define_nonvar indent
 			parms = line.match /^((error)|warn|(info))\s+(.*)$/
 			raise 'syntax error' unless parms
-			line = "Rmk: #{parms[1]}: " + state[:vars].interpolate_str(parms[4])
-			parms[3] ? puts(line) : $stderr.puts(line)
+			line = state[:vars].interpolate_str(parms[4])
+			parms[3] ? @rmk.std_puts(parms[1] + ': ', line) : @rmk.err_puts(parms[1] + ': ', line)
 			exit 2 if parms[2]
 		else
 			match = /^(?:(?<append>\+=)|=)(?(<append>)|\s*)(?<value>.*)$/.match line

data/lib/rmk/version.rb

@@ -1,3 +1,3 @@
 class Rmk
-	VERSION = "0.1.0"
+	VERSION = "0.1.1"
 end

data/rmk.gemspec

@@ -29,7 +29,5 @@ Gem::Specification.new do |spec|
 	spec.executables = spec.files.grep(%r{^exe/}) {|f| File.basename(f)}
 	spec.require_paths = ['lib']
 
-	spec.add_development_dependency 'bundler', '~> 1.15'
-
-	spec.add_dependency 'iniparse','~> 1.4'
+	spec.add_development_dependency 'rake', '>= 12.3.0'
 end

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rmk-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - pbl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-03 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 12.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
-- !ruby/object:Gem::Dependency
-  name: iniparse
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 12.3.0
 description: build tool like make, tup, ninja...
 email:
 - a@pbl.pw