pjam 0.0.3.pre → 0.0.4.pre

data/bin/pjam

@@ -18,7 +18,7 @@ where [options] are:
 EOS
 
     opt :p, "path to project", :type => :string
-    opt :fast, "run is fast mode, skip some build steps", :default => false
+    opt :skip_pinto, "skipp adding distos to pinto", :default => false
     opt :only, "only build this projects", :type => :string, :default => nil
 end
 
@@ -42,49 +42,51 @@ else
     sources_list = config['sources'].select {|i| p_only.include? i }
 end
 
-sources_list.each do |src|
+compile_list = []
+compile_list_pp = {}
 
+sources_list.each do |src|
 
-    cmd = "cd #{project_id}/#{src} && rm -rf cpanlib && svn up"
+    cmd = "cd #{project_id}/#{src} && rm -rf cpanlib && svn up -q"
     st = system(cmd) == true or  raise "failed do cmd: #{cmd}" 
 
-
-    cmd = "cd #{project_id}/#{src} && rm -rf *.gz && rm -rf MANIFEST && perl Build.PL --quiet 1>/dev/null 2>module_build.err.log  && ./Build manifest --quiet 2>/dev/null 1>/dev/null  && ./Build dist --quiet 1>/dev/null"
+    cmd = "cd #{project_id}/#{src} && rm -rf *.gz && rm -rf MANIFEST && perl Build.PL --quiet 1>/dev/null 2>module_build.err.log  && ./Build realclean && perl Build.PL --quiet 1>/dev/null 2>module_build.err.log && ./Build manifest --quiet 2>/dev/null 1>/dev/null  && ./Build dist --quiet 1>/dev/null"
     system(cmd) == true or raise "failed do cmd: #{cmd}"
 
-#    cmd ="cd #{project_id}/#{src}/ && pinto list -s #{config['stack']}  -D `ls *.gz` --format %f | grep  `ls *.gz` -q"
-#    distro_exists = system(cmd)
+    distro_name = `cd #{project_id}/#{src} &&  ls *.gz`.chomp!
 
-    distro_exists = true 
-    if distro_exists == false
-	puts dark { blue  { bold {  "add #{src} to pinto for the first time" } } }
-        cmd ="cd #{project_id}/#{src} && pinto add -s #{config['stack']} -v `ls *.gz`"
-	system(cmd) == true or raise "failed do cmd: #{cmd}"
-    elsif distro_exists == true && opts[:fast] == false
+    if opts[:skip_pinto] == true
 
-	puts dark { magenta  { bold {  "delete #{src} from pinto" } } }
-        cmd ="cd #{project_id}/#{src}/ && pinto delete -v PINTO/`ls *.gz`"
-	system(cmd) == true # or raise "failed do cmd: #{cmd}"
+        compile_list << distro_name
+	compile_list_pp[distro_name] = src
 
-	puts dark { blue  { bold {  "add #{src} to pinto" } } }
-        cmd ="cd #{project_id}/#{src} && pinto add -s #{config['stack']} -v `ls *.gz`"
-	system(cmd) == true or raise "failed do cmd: #{cmd}"
-    end
+    else
 
+        puts dark { magenta  { bold {  "add #{src} [#{distro_name}] to pinto" } } }    
+    
+	cmd ="cd #{project_id}/#{src} && pinto delete -v PINTO/#{distro_name}"
+        system(cmd) == true
 
+	cmd ="cd #{project_id}/#{src} && pinto add -s #{config['stack']} -v #{distro_name}"
+        system(cmd) == true or raise "failed do cmd: #{cmd}"
+
+        compile_list << distro_name
+        compile_list_pp[distro_name] = src
+
+    end
+    
 end
 
 
-config['sources'].each do |src|
-    puts blue { bold { "compile #{src}" } }
-    cmd = "cd #{project_id}/#{src} && export PERL5LIB=/usr/local/rle/lib/perl5 && pinto install -s #{config['stack']} -L #{local_lib} -o 'q' PINTO/`ls *.gz`"
-    puts cmd
+compile_list.each do |d|
+    puts green { bold { "compile #{compile_list_pp[d]} [#{d}]" } }
+    cmd = "pinto install -s #{config['stack']} -l #{local_lib} -o 'q' PINTO/#{d}"
     system(cmd) == true or raise "failed do cmd: #{cmd}"
 end
 
 
 puts yellow { bold {  "make distributive from #{config['application']}" } }
-cmd = "eval $(perl -Mlocal::lib=#{local_lib}) && cd #{project_id}/#{config['application']} && rm -rf cpanlib && mkdir cpanlib/ && cp -r #{local_lib}/* cpanlib/ && rm -rf *.gz && ./Build realclean --quiet 1>/dev/null && perl Build.PL --quiet 1>/dev/null && ./Build manifest --quiet 2>/dev/null 1>/dev/null && ./Build dist --quiet 1>/dev/null && ln -fs `ls #{project_id}/#{config['application']}/*.gz` #{project_id}/current.tar.gz && echo -n `ls *.gz` > #{project_id}/current.txt"
+cmd = "cd #{project_id}/#{config['application']} && rm -rf cpanlib && mkdir cpanlib/ && cp -r #{local_lib}/* cpanlib/ && rm -rf *.gz && ./Build realclean --quiet 1>/dev/null && perl Build.PL --quiet 1>/dev/null 2>module_build.err.log && ./Build manifest --quiet 2>/dev/null 1>/dev/null && ./Build dist --quiet 1>/dev/null && ln -fs `ls #{project_id}/#{config['application']}/*.gz` #{project_id}/current.tar.gz && echo -n `ls *.gz` > #{project_id}/current.txt"
 system(cmd) == true or raise "failed do cmd: #{cmd}"
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pjam
 version: !ruby/object:Gem::Version
-  version: 0.0.3.pre
+  version: 0.0.4.pre
   prerelease: 6
 platform: ruby
 authors: