p4ruby 1.0.5 → 1.0.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/install.rb +7 -3
- data/p4ruby.gemspec +1 -1
- metadata +1 -1
data/install.rb
CHANGED
|
@@ -306,6 +306,7 @@ class Installer
|
|
|
306
306
|
end
|
|
307
307
|
|
|
308
308
|
def build
|
|
309
|
+
puts "building..."
|
|
309
310
|
rm_rf(BUILD_DIR)
|
|
310
311
|
mkdir_p(BUILD_DIR)
|
|
311
312
|
|
|
@@ -334,6 +335,7 @@ class Installer
|
|
|
334
335
|
end
|
|
335
336
|
|
|
336
337
|
def install
|
|
338
|
+
puts "installing..."
|
|
337
339
|
Dir.chdir(@s.p4ruby_build_dir) {
|
|
338
340
|
make("install")
|
|
339
341
|
}
|
|
@@ -343,6 +345,7 @@ class Installer
|
|
|
343
345
|
end
|
|
344
346
|
|
|
345
347
|
def verify_install(on_error = nil)
|
|
348
|
+
puts "verifying..."
|
|
346
349
|
files =
|
|
347
350
|
if @s.gem_config
|
|
348
351
|
GEM_INSTALL_FILES
|
|
@@ -376,11 +379,12 @@ class Installer
|
|
|
376
379
|
fetch_spec(spec)
|
|
377
380
|
|
|
378
381
|
error = lambda {
|
|
379
|
-
puts "The Perforce Windows
|
|
380
|
-
puts "
|
|
382
|
+
puts "The Perforce P4Ruby Windows installer failed!"
|
|
383
|
+
puts "You may re-run it manually here:"
|
|
381
384
|
puts spec.local.expand_path
|
|
382
385
|
}
|
|
383
386
|
|
|
387
|
+
puts "running Perforce P4Ruby Windows installer..."
|
|
384
388
|
if system(spec.local, "/S", "/v/qn")
|
|
385
389
|
if @s.gem_config
|
|
386
390
|
sleep(1)
|
|
@@ -388,7 +392,7 @@ class Installer
|
|
|
388
392
|
sleep(1)
|
|
389
393
|
unless system(spec.local, "/V", "/x", "/S", "/v/qn")
|
|
390
394
|
# We don't much care if this fails; just write to the log
|
|
391
|
-
puts "Note: the Perforce Windows
|
|
395
|
+
puts "Note: the Perforce P4Ruby Windows uninstaller failed."
|
|
392
396
|
end
|
|
393
397
|
end
|
|
394
398
|
verify_install(error)
|
data/p4ruby.gemspec
CHANGED