rbbt-util 5.25.18 → 5.25.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32456b2f23ba8e3a018ae100b41b565a04284ccf
-  data.tar.gz: '0646998ae0c7d8ed85eef12e028e7e57ace7c380'
+  metadata.gz: 19dd26d611fcf6834367bf1403b6bcc42d69f15a
+  data.tar.gz: ccae2bc66bc0875870ec66ae8d0f53cb26e9cfc2
 SHA512:
-  metadata.gz: c1fa0f6562f1ed28a8d932372ab7cb6991d28c7587586e10d5e4a9235c5f045f9b7ba2dc8a7620d998c24b3f129dae89f7d6ce9950926ece5eeeed23ca097403
-  data.tar.gz: 2392d0dce826ea7e4c02da67a07e3fc7e11df664564ecc264946214327d1e3ddcbb68021dba50a791740e8b2bd93d0b475dca9e1bdb260cab318bb68148a82aa
+  metadata.gz: 6a02502d91c9499f37fd9cd63025f9b9d7f047c5a394fabe0305de74cb5d479eaec94a8eb1716d81d409627b08ffbbae3c98d591d987083235e3f22de288c4c9
+  data.tar.gz: b8b91bb18a5998f58c1f8a62b74f3b641891fa5874183738a947088980dd949383cea036460617c5eade54215c68cfdfef1cc2b4277c5d4bc6db10d477ebaf1a

data/lib/rbbt/resource/util.rb

@@ -53,12 +53,14 @@ module Resource
       Open.read(File.join opt_dir, '.c-paths').split(/\n/).each do |line|
         dir = line.chomp
         dir = File.join(opt_dir, dir) unless dir[0] == "/"
-        Misc.env_add('C_INCLULDE_PATH',dir)
+        Misc.env_add('CPLUS_INCLUDE_PATH',dir)
+        Misc.env_add('C_INCLUDE_PATH',dir)
       end if File.exist? File.join(opt_dir, '.c-paths')
 
       Open.read(File.join opt_dir, '.ld-paths').split(/\n/).each do |line|
         dir = line.chomp
         dir = File.join(opt_dir, dir) unless dir[0] == "/"
+        Misc.env_add('LIBRARY_PATH',dir)
         Misc.env_add('LD_LIBRARY_PATH',dir)
         Misc.env_add('LD_RUN_PATH',dir)
       end if File.exist? File.join(opt_dir, '.ld-paths')

data/share/install/software/lib/install_helpers

@@ -122,9 +122,9 @@ get_git(){
         fi
     else
       if [ $version == 'none' ];then
-        git clone "$url" "$name"
+        git clone --recursive "$url" "$name"
       else
-        git clone "$url" "$name" -b $version
+        git clone --recursive "$url" "$name" -b $version
       fi
     fi
 
@@ -179,6 +179,9 @@ build(){
 
     local old_pwd="`expand_path $(pwd)`"
     cd "`build_dir`"
+
+    [ -d src -a ! -e CMakeLists.txt -a ! -e Makefile ] && cd src
+
     echo PWD: `pwd`
     ls
 
@@ -216,19 +219,26 @@ build(){
     if [ -f CMakeLists.txt ]; then
       [ -d build ] || mkdir build
       cd build
-      cmake -DCMAKE_INSTALL_PREFIX:PATH=/install_dir ..
-      make DESTDIR="$(opt_dir "$name")"  -j4
-      make DESTDIR="$(opt_dir "$name")" install || (cd .. ; mv build "$(opt_dir "$name")")
-      if [ -d "$(opt_dir "$name")/install_dir" ]; then
-        mv "$(opt_dir "$name")/install_dir"/** "$(opt_dir "$name")"
-        rmdir "$(opt_dir "$name")/install_dir"
+      cmake -DCMAKE_INSTALL_PREFIX=/install_dir ..
+
+      if [ -f ../configure ]; then
+        ../configure --prefix="$(opt_dir "$name")" $extra
+        make -j4
+        make install || (cd .. ; mv build "$(opt_dir "$name")")
+      else
+        make DESTDIR="$(opt_dir "$name")"  -j4
+        make DESTDIR="$(opt_dir "$name")" install || (cd .. ; mv build "$(opt_dir "$name")")
+
+        if [ -d "$(opt_dir "$name")/install_dir" ]; then
+          mv "$(opt_dir "$name")/install_dir"/** "$(opt_dir "$name")"
+          rmdir "$(opt_dir "$name")/install_dir"
+        fi
       fi
 
       setup "$name"
       clean_build
     else
       if [ -f configure ]; then 
-        echo ./configure --prefix="$(opt_dir "$name")" $extra
         ./configure --prefix="$(opt_dir "$name")" $extra
         compile "$name" $extra
         setup "$name"
@@ -298,15 +308,18 @@ setup(){
     else
         local old_pwd="`expand_path $(pwd)`"
 
-        for exe in ` find "$pkg_dir/" -maxdepth 1 -type f -executable`; do
+        for exe in ` find "$pkg_dir/" "$pkg_dir/src/" -maxdepth 1 -type f -executable`; do
+            orig=$exe
             exe=$(basename $exe)
+            echo "EXE $exe"
             rm -f "$OPT_DIR/bin/$exe"
-            link "$pkg_dir/$exe" "$OPT_DIR/bin/$exe" 2>/dev/null
+            link "$orig" "$OPT_DIR/bin/$exe" 2>/dev/null
         done
     fi
     
     ([ -d "$pkg_dir/include" ]       && add2file "$OPT_DIR/.c-paths" "$pkg_dir/include")
     ([ -d "$pkg_dir/lib" ]           && add2file "$OPT_DIR/.ld-paths" "$pkg_dir/lib")
+    ([ -d "$pkg_dir/lib64" ]         && add2file "$OPT_DIR/.ld-paths" "$pkg_dir/lib64")
     ([ -d "$pkg_dir/lib/pkgconfig" ] && add2file "$OPT_DIR/.pkgconfig-paths" "$pkg_dir/lib/pkgconfig")
 }
 
@@ -370,7 +383,6 @@ install_jar(){
 
     [ -d  "$OPT_DIR/$name/" ] || mkdir -p  "$OPT_DIR/$name/"
     wget "$url" -O "$OPT_DIR/jars/$name.jar" | wget "$url" -O "$OPT_DIR/jars/$name.jar" --no-check-certificate
-    link "$OPT_DIR/$name/$name.jar" "$OPT_JAR_DIR/$name.jar" 
 }
 
 jar2bin(){

data/share/rbbt_commands/workflow/task

@@ -319,10 +319,17 @@ if clean
 end
 
 if clean_task
-  job.rec_dependencies.each do |dep|
-    next unless dep.task_name.to_s == clean_task.to_s
-    dep.clean 
-    dep.set_info :status, :cleaned
+  clean_task.split(",").each do |clean_task|
+    if clean_task.include? "#"
+      clean_workflow, clean_task = clean_task.split("#")
+    end
+
+    job.rec_dependencies.each do |dep|
+      next unless dep.task_name.to_s == clean_task.to_s
+      next unless clean_workflow.nil? || clean_workflow == dep.workflow.to_s
+      dep.clean 
+      dep.set_info :status, :cleaned
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.25.18
+  version: 5.25.19
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake