rbbt-util 5.25.18 → 5.25.19
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/rbbt/resource/util.rb +3 -1
- data/share/install/software/lib/install_helpers +24 -12
- data/share/rbbt_commands/workflow/task +11 -4
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 19dd26d611fcf6834367bf1403b6bcc42d69f15a
|
4
|
+
data.tar.gz: ccae2bc66bc0875870ec66ae8d0f53cb26e9cfc2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 6a02502d91c9499f37fd9cd63025f9b9d7f047c5a394fabe0305de74cb5d479eaec94a8eb1716d81d409627b08ffbbae3c98d591d987083235e3f22de288c4c9
|
7
|
+
data.tar.gz: b8b91bb18a5998f58c1f8a62b74f3b641891fa5874183738a947088980dd949383cea036460617c5eade54215c68cfdfef1cc2b4277c5d4bc6db10d477ebaf1a
|
data/lib/rbbt/resource/util.rb
CHANGED
@@ -53,12 +53,14 @@ module Resource
|
|
53
53
|
Open.read(File.join opt_dir, '.c-paths').split(/\n/).each do |line|
|
54
54
|
dir = line.chomp
|
55
55
|
dir = File.join(opt_dir, dir) unless dir[0] == "/"
|
56
|
-
Misc.env_add('
|
56
|
+
Misc.env_add('CPLUS_INCLUDE_PATH',dir)
|
57
|
+
Misc.env_add('C_INCLUDE_PATH',dir)
|
57
58
|
end if File.exist? File.join(opt_dir, '.c-paths')
|
58
59
|
|
59
60
|
Open.read(File.join opt_dir, '.ld-paths').split(/\n/).each do |line|
|
60
61
|
dir = line.chomp
|
61
62
|
dir = File.join(opt_dir, dir) unless dir[0] == "/"
|
63
|
+
Misc.env_add('LIBRARY_PATH',dir)
|
62
64
|
Misc.env_add('LD_LIBRARY_PATH',dir)
|
63
65
|
Misc.env_add('LD_RUN_PATH',dir)
|
64
66
|
end if File.exist? File.join(opt_dir, '.ld-paths')
|
@@ -122,9 +122,9 @@ get_git(){
|
|
122
122
|
fi
|
123
123
|
else
|
124
124
|
if [ $version == 'none' ];then
|
125
|
-
git clone "$url" "$name"
|
125
|
+
git clone --recursive "$url" "$name"
|
126
126
|
else
|
127
|
-
git clone "$url" "$name" -b $version
|
127
|
+
git clone --recursive "$url" "$name" -b $version
|
128
128
|
fi
|
129
129
|
fi
|
130
130
|
|
@@ -179,6 +179,9 @@ build(){
|
|
179
179
|
|
180
180
|
local old_pwd="`expand_path $(pwd)`"
|
181
181
|
cd "`build_dir`"
|
182
|
+
|
183
|
+
[ -d src -a ! -e CMakeLists.txt -a ! -e Makefile ] && cd src
|
184
|
+
|
182
185
|
echo PWD: `pwd`
|
183
186
|
ls
|
184
187
|
|
@@ -216,19 +219,26 @@ build(){
|
|
216
219
|
if [ -f CMakeLists.txt ]; then
|
217
220
|
[ -d build ] || mkdir build
|
218
221
|
cd build
|
219
|
-
cmake -DCMAKE_INSTALL_PREFIX
|
220
|
-
|
221
|
-
|
222
|
-
|
223
|
-
|
224
|
-
|
222
|
+
cmake -DCMAKE_INSTALL_PREFIX=/install_dir ..
|
223
|
+
|
224
|
+
if [ -f ../configure ]; then
|
225
|
+
../configure --prefix="$(opt_dir "$name")" $extra
|
226
|
+
make -j4
|
227
|
+
make install || (cd .. ; mv build "$(opt_dir "$name")")
|
228
|
+
else
|
229
|
+
make DESTDIR="$(opt_dir "$name")" -j4
|
230
|
+
make DESTDIR="$(opt_dir "$name")" install || (cd .. ; mv build "$(opt_dir "$name")")
|
231
|
+
|
232
|
+
if [ -d "$(opt_dir "$name")/install_dir" ]; then
|
233
|
+
mv "$(opt_dir "$name")/install_dir"/** "$(opt_dir "$name")"
|
234
|
+
rmdir "$(opt_dir "$name")/install_dir"
|
235
|
+
fi
|
225
236
|
fi
|
226
237
|
|
227
238
|
setup "$name"
|
228
239
|
clean_build
|
229
240
|
else
|
230
241
|
if [ -f configure ]; then
|
231
|
-
echo ./configure --prefix="$(opt_dir "$name")" $extra
|
232
242
|
./configure --prefix="$(opt_dir "$name")" $extra
|
233
243
|
compile "$name" $extra
|
234
244
|
setup "$name"
|
@@ -298,15 +308,18 @@ setup(){
|
|
298
308
|
else
|
299
309
|
local old_pwd="`expand_path $(pwd)`"
|
300
310
|
|
301
|
-
for exe in ` find "$pkg_dir/" -maxdepth 1 -type f -executable`; do
|
311
|
+
for exe in ` find "$pkg_dir/" "$pkg_dir/src/" -maxdepth 1 -type f -executable`; do
|
312
|
+
orig=$exe
|
302
313
|
exe=$(basename $exe)
|
314
|
+
echo "EXE $exe"
|
303
315
|
rm -f "$OPT_DIR/bin/$exe"
|
304
|
-
link "$
|
316
|
+
link "$orig" "$OPT_DIR/bin/$exe" 2>/dev/null
|
305
317
|
done
|
306
318
|
fi
|
307
319
|
|
308
320
|
([ -d "$pkg_dir/include" ] && add2file "$OPT_DIR/.c-paths" "$pkg_dir/include")
|
309
321
|
([ -d "$pkg_dir/lib" ] && add2file "$OPT_DIR/.ld-paths" "$pkg_dir/lib")
|
322
|
+
([ -d "$pkg_dir/lib64" ] && add2file "$OPT_DIR/.ld-paths" "$pkg_dir/lib64")
|
310
323
|
([ -d "$pkg_dir/lib/pkgconfig" ] && add2file "$OPT_DIR/.pkgconfig-paths" "$pkg_dir/lib/pkgconfig")
|
311
324
|
}
|
312
325
|
|
@@ -370,7 +383,6 @@ install_jar(){
|
|
370
383
|
|
371
384
|
[ -d "$OPT_DIR/$name/" ] || mkdir -p "$OPT_DIR/$name/"
|
372
385
|
wget "$url" -O "$OPT_DIR/jars/$name.jar" | wget "$url" -O "$OPT_DIR/jars/$name.jar" --no-check-certificate
|
373
|
-
link "$OPT_DIR/$name/$name.jar" "$OPT_JAR_DIR/$name.jar"
|
374
386
|
}
|
375
387
|
|
376
388
|
jar2bin(){
|
@@ -319,10 +319,17 @@ if clean
|
|
319
319
|
end
|
320
320
|
|
321
321
|
if clean_task
|
322
|
-
|
323
|
-
|
324
|
-
|
325
|
-
|
322
|
+
clean_task.split(",").each do |clean_task|
|
323
|
+
if clean_task.include? "#"
|
324
|
+
clean_workflow, clean_task = clean_task.split("#")
|
325
|
+
end
|
326
|
+
|
327
|
+
job.rec_dependencies.each do |dep|
|
328
|
+
next unless dep.task_name.to_s == clean_task.to_s
|
329
|
+
next unless clean_workflow.nil? || clean_workflow == dep.workflow.to_s
|
330
|
+
dep.clean
|
331
|
+
dep.set_info :status, :cleaned
|
332
|
+
end
|
326
333
|
end
|
327
334
|
end
|
328
335
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rbbt-util
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 5.25.
|
4
|
+
version: 5.25.19
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Miguel Vazquez
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-01-
|
11
|
+
date: 2019-01-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|