* bug#26625: [PATCH] gnu : Add unshield.
@ 2017-04-23 17:23 manolis837
2017-04-24 14:52 ` Marius Bakke
0 siblings, 1 reply; 7+ messages in thread
From: manolis837 @ 2017-04-23 17:23 UTC (permalink / raw)
To: 26625
From: Manolis Ragkousis <manolis837@gmail.com>
* gnu/packages/compression.scm (unshield): New variable.
---
gnu/packages/compression.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 4793755c2..79029df5f 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -15,6 +15,7 @@
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net>
+;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -40,6 +41,7 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system perl)
#:use-module (guix build-system python)
+ #:use-module (guix build-system cmake)
#:use-module (gnu packages)
#:use-module (gnu packages assembly)
#:use-module (gnu packages autotools)
@@ -50,6 +52,7 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages valgrind)
+ #:use-module (gnu packages tls)
#:use-module (ice-9 match)
#:use-module ((srfi srfi-1) #:select (last)))
@@ -1159,6 +1162,28 @@ or junctions, and always follows hard links.")
;; expat-licenced (or ‘MIT’) code.
license:expat))))
+(define-public unshield
+ (package
+ (name "unshield")
+ (version "1.4.2")
+ (source
+ (origin (method url-fetch)
+ (uri (string-append "http://github.com/twogood/unshield/archive/"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "0x7ps644yp5dka2zhb8w0ifqmw3d255jafpzfwv8xbcpgq6fmm2x"))))
+ (build-system cmake-build-system)
+ (inputs
+ `(("zlib" ,zlib)
+ ("openssl" ,openssl)))
+ (arguments
+ `(#:tests? #f)) ; no test target
+ (home-page "https://github.com/twogood/unshield")
+ (synopsis "Tool to extract CAB files.")
+ (description "Extracts CAB files from InstallShield installers")
+ (license license:expat)))
+
(define-public unrar
(package
(name "unrar")
--
2.12.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* bug#26625: [PATCH] gnu : Add unshield.
2017-04-23 17:23 bug#26625: [PATCH] gnu : Add unshield manolis837
@ 2017-04-24 14:52 ` Marius Bakke
2017-05-02 10:57 ` manolis837
0 siblings, 1 reply; 7+ messages in thread
From: Marius Bakke @ 2017-04-24 14:52 UTC (permalink / raw)
To: manolis837, 26625
[-- Attachment #1: Type: text/plain, Size: 2205 bytes --]
manolis837@gmail.com writes:
> * gnu/packages/compression.scm (unshield): New variable.
[...]
> @@ -40,6 +41,7 @@
> #:use-module (guix build-system gnu)
> #:use-module (guix build-system perl)
> #:use-module (guix build-system python)
> + #:use-module (guix build-system cmake)
> #:use-module (gnu packages)
> #:use-module (gnu packages assembly)
> #:use-module (gnu packages autotools)
> @@ -50,6 +52,7 @@
> #:use-module (gnu packages pkg-config)
> #:use-module (gnu packages python)
> #:use-module (gnu packages valgrind)
> + #:use-module (gnu packages tls)
Please try to keep module imports, inputs, etc alphabetically sorted,
when they are so from before.
> +(define-public unshield
> + (package
> + (name "unshield")
> + (version "1.4.2")
> + (source
> + (origin (method url-fetch)
> + (uri (string-append "http://github.com/twogood/unshield/archive/"
> + version ".tar.gz"))
> + (sha256
> + (base32
> + "0x7ps644yp5dka2zhb8w0ifqmw3d255jafpzfwv8xbcpgq6fmm2x"))))
> + (build-system cmake-build-system)
> + (inputs
> + `(("zlib" ,zlib)
> + ("openssl" ,openssl)))
> + (arguments
> + `(#:tests? #f)) ; no test target
There is a test script shipped with the source, can you try replacing
the "check" phase with code that executes "./run_tests"?
> + (home-page "https://github.com/twogood/unshield")
> + (synopsis "Tool to extract CAB files.")
> + (description "Extracts CAB files from InstallShield installers")
So synopses should not end with punctuations, but descriptions do. `guix
lint` should warn about this. It would be good to have a little more
information here as well.
Maybe something like this (minimal variant):
(synopsis "Extract CAB files from InstallShield installers")
(description
"@command{unshield} is a tool and library for extracting @file{.cab}
archives from InstallShield installers.")
If this software works with the "normal" .cab files commonly found in MS
Windows systems, it would be good to encapsulate that information too.
Otherwise LGTM.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* bug#26625: [PATCH] gnu : Add unshield.
2017-04-24 14:52 ` Marius Bakke
@ 2017-05-02 10:57 ` manolis837
2017-05-02 10:57 ` manolis837
2017-06-04 8:06 ` Manolis Ragkousis
0 siblings, 2 replies; 7+ messages in thread
From: manolis837 @ 2017-05-02 10:57 UTC (permalink / raw)
To: 26625
Hello Marius,
Thank you for looking into the patch.
The tests needed some work to be able to run in guix, but they work now.
If everythin is okay, I will push it to master.
Thank you,
Manolis
^ permalink raw reply [flat|nested] 7+ messages in thread
* bug#26625: [PATCH] gnu : Add unshield.
2017-05-02 10:57 ` manolis837
@ 2017-05-02 10:57 ` manolis837
2017-06-04 8:06 ` Manolis Ragkousis
1 sibling, 0 replies; 7+ messages in thread
From: manolis837 @ 2017-05-02 10:57 UTC (permalink / raw)
To: 26625
From: Manolis Ragkousis <manolis837@gmail.com>
* gnu/packages/compression.scm (unshield): New variable.
---
gnu/packages/compression.scm | 76 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 76 insertions(+)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 4793755c2..b333e6ded 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -15,6 +15,7 @@
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net>
+;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -37,6 +38,7 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
+ #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system perl)
#:use-module (guix build-system python)
@@ -46,10 +48,13 @@
#:use-module (gnu packages backup)
#:use-module (gnu packages base)
#:use-module (gnu packages check)
+ #:use-module (gnu packages curl)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages tls)
#:use-module (gnu packages valgrind)
+ #:use-module (gnu packages zip)
#:use-module (ice-9 match)
#:use-module ((srfi srfi-1) #:select (last)))
@@ -1159,6 +1164,77 @@ or junctions, and always follows hard links.")
;; expat-licenced (or ‘MIT’) code.
license:expat))))
+(define-public unshield
+ (package
+ (name "unshield")
+ (version "1.4.2")
+ (source
+ (origin (method url-fetch)
+ (uri (string-append "http://github.com/twogood/unshield/archive/"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "0x7ps644yp5dka2zhb8w0ifqmw3d255jafpzfwv8xbcpgq6fmm2x"))))
+ (build-system cmake-build-system)
+ (inputs
+ `(("zlib" ,zlib)
+ ("openssl" ,openssl)
+ ;; test data that is otherwise downloaded with curl
+ ("unshield-avigomanager11b22.zip"
+ ,(origin
+ (method url-fetch)
+ (uri (string-append "https://www.dropbox.com/s/8r4b6752swe3nhu/\"
+unshield-avigomanager11b22.zip?dl=1"))
+ (sha256
+ (base32 "0fwq7lih04if68wpwpsk5wjqyvh32db76a41sq6gbx4dn1lc3ddn"))
+ (file-name "unshield-avigomanager11b22.zip")))
+ ("unshield-the-feeble-files-spanish.zip"
+ ,(origin
+ (method url-fetch)
+ (uri (string-append "https://www.dropbox.com/s/1ng0z9kfxc7eb1e/\"
+unshield-the-feeble-files-spanish.zip?dl=1"))
+ (sha256
+ (base32 "1k5cw6vnpja8yjlnhx5124xrw9i8s1l539hfdqqrqz3l5gn0bnyd"))
+ (file-name "unshield-the-feeble-files-spanish.zip")))))
+ (native-inputs
+ `(("unzip" ,unzip)))
+ (arguments
+ `(#:out-of-source? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'check 'pre-check
+ (lambda* (#:key inputs #:allow-other-keys)
+ (for-each (lambda (i)
+ (copy-file (assoc-ref inputs i)
+ (string-append "test/v0/" i)))
+ '("unshield-avigomanager11b22.zip"
+ "unshield-the-feeble-files-spanish.zip"))
+ (substitute* (find-files "test/" "/*\\.sh")
+ ;; Tests expect the unshield binary in a specific
+ ;; location.
+ (("/var/tmp/unshield/bin/unshield")
+ (string-append (getcwd) "/src/unshield"))
+ ;; We no longer need to download the data.
+ ((".?URL=.*$") "")
+ (("curl -(|f)sSL -o test.zip .*") ""))
+ (substitute* "test/v0/avigomanager.sh"
+ (("test.zip")
+ (string-append (getcwd)
+ "/test/v0/unshield-avigomanager11b22.zip")))
+ (substitute* "test/v0/the-feeble-files-spanish.sh"
+ (("test.zip")
+ (string-append (getcwd)
+ "/test/v0/unshield-the-feeble-files-spanish.zip")))))
+ (replace 'check
+ (lambda _
+ (zero? (system* "./run-tests.sh")))))))
+ (home-page "https://github.com/twogood/unshield")
+ (synopsis "Extract CAB files from InstallShield installers")
+ (description
+ "@command{unshield} is a tool and library for extracting @file{.cab}
+ archives from InstallShield installers.")
+ (license license:expat)))
+
(define-public unrar
(package
(name "unrar")
--
2.12.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* bug#26625: [PATCH] gnu : Add unshield.
2017-05-02 10:57 ` manolis837
2017-05-02 10:57 ` manolis837
@ 2017-06-04 8:06 ` Manolis Ragkousis
2017-06-04 12:03 ` Marius Bakke
1 sibling, 1 reply; 7+ messages in thread
From: Manolis Ragkousis @ 2017-06-04 8:06 UTC (permalink / raw)
To: mbakke; +Cc: 26625
Hey Marius,
I don't know if you have seen the updated version of the patch so I am
pinging you :)
If you don't have any objections to the updated version, I will push it
to master.
Manolis
On 05/02/2017 01:57 PM, manolis837@gmail.com wrote:
> Hello Marius,
>
> Thank you for looking into the patch.
>
> The tests needed some work to be able to run in guix, but they work now.
>
> If everythin is okay, I will push it to master.
>
> Thank you,
> Manolis
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* bug#26625: [PATCH] gnu : Add unshield.
2017-06-04 8:06 ` Manolis Ragkousis
@ 2017-06-04 12:03 ` Marius Bakke
2017-06-04 15:11 ` Manolis Ragkousis
0 siblings, 1 reply; 7+ messages in thread
From: Marius Bakke @ 2017-06-04 12:03 UTC (permalink / raw)
To: Manolis Ragkousis; +Cc: 26625
[-- Attachment #1: Type: text/plain, Size: 375 bytes --]
Manolis Ragkousis <manolis837@gmail.com> writes:
> Hey Marius,
>
> I don't know if you have seen the updated version of the patch so I am
> pinging you :)
>
> If you don't have any objections to the updated version, I will push it
> to master.
Please add a #t at the end of the pre-check phase since (substitute*...)
has an unspecified return value. The rest LGTM, thanks!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* bug#26625: [PATCH] gnu : Add unshield.
2017-06-04 12:03 ` Marius Bakke
@ 2017-06-04 15:11 ` Manolis Ragkousis
0 siblings, 0 replies; 7+ messages in thread
From: Manolis Ragkousis @ 2017-06-04 15:11 UTC (permalink / raw)
To: Marius Bakke; +Cc: 26625
[-- Attachment #1.1: Type: text/plain, Size: 53 bytes --]
Done and pushed to master.
Thank you,
Manolis
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-06-04 15:12 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-23 17:23 bug#26625: [PATCH] gnu : Add unshield manolis837
2017-04-24 14:52 ` Marius Bakke
2017-05-02 10:57 ` manolis837
2017-05-02 10:57 ` manolis837
2017-06-04 8:06 ` Manolis Ragkousis
2017-06-04 12:03 ` Marius Bakke
2017-06-04 15:11 ` Manolis Ragkousis
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.