Revert "Uncommented the previous code that removes the non-commercially redistributable code from the project before building."

This reverts commit 803bce3df3.
main
Jacob Sowder 1 year ago
parent de4d8904a7
commit a3aedbe4fb

@ -75,48 +75,47 @@
;; )) ;; ))
(modules '((guix build utils) (modules '((guix build utils)
(ice-9 regex))) (ice-9 regex)))
(snippet ;; (snippet
'(begin ;; '(begin
;; remove files which mustn't be commercially redistributed. see ;; ;; remove files which mustn't be commercially redistributed. see
;; <https://zdoom.org/wiki/license#commercial_use>, the contribution ;; ;; <https://zdoom.org/wiki/license#commercial_use>, the contribution
;; guidelines at <https://github.com/zdoom>, and guix issue #73435. ;; ;; guidelines at <https://github.com/zdoom>, and guix issue #73435.
(for-each ;; (for-each
(lambda (directory) ;; (lambda (directory)
(delete-file-recursively directory) ;; (delete-file-recursively directory)
(substitute* "CMakeLists.txt" ;; (substitute* "CMakeLists.txt"
(((string-append "add_subdirectory\\([[:blank:]]*" ;; (((string-append "add_subdirectory\\([[:blank:]]*"
directory ;; directory
"[[:blank:]]*\\)")) ;; "[[:blank:]]*\\)"))
""))) ;; "")))
'( ;; '( ;; "wadsrc_extra" ;game_support.pk3
;"wadsrc_extra" ;game_support.pk3 ;; "wadsrc_bm")) ;brightmaps.pk3
"wadsrc_bm")) ;brightmaps.pk3
;; removing game_support.pk3 entirely would break freedoom & remove ;; ;; removing game_support.pk3 entirely would break freedoom & remove
;; users' ability to play commercial games, despite owning (only) the ;; ;; users' ability to play commercial games, despite owning (only) the
;; non-functional data. that can't be right. out of an abundance of ;; ;; non-functional data. that can't be right. out of an abundance of
;; caution, remove anything from the pk3 that could conceivably be ;; ;; caution, remove anything from the pk3 that could conceivably be
;; derived from copyrightable data that's not freely redistributable. ;; ;; derived from copyrightable data that's not freely redistributable.
;; (display "keeping only the following game_support.pk3 files:\n") ;; ;; (display "keeping only the following game_support.pk3 files:\n")
;; (let* ((regexps (list "/font\\.inf$" ;; ;; (let* ((regexps (list "/font\\.inf$"
;; "/harmony/.*\\.(txt|zs)$" ;; ;; "/harmony/.*\\.(txt|zs)$"
;; "/(iwadinfo|mapinfo|sprofs)\\.txt$" ;; ;; "/(iwadinfo|mapinfo|sprofs)\\.txt$"
;; "\\.z$")) ;; ;; "\\.z$"))
;; (regexp* (format #f "(~{~a~^|~})" regexps)) ;; ;; (regexp* (format #f "(~{~a~^|~})" regexps))
;; (regexp (make-regexp regexp* regexp/icase))) ;; ;; (regexp (make-regexp regexp* regexp/icase)))
;; (define (keep-file? file stat) ;; ;; (define (keep-file? file stat)
;; (let ((keep? (regexp-exec regexp file))) ;; ;; (let ((keep? (regexp-exec regexp file)))
;; (when keep? ;; ;; (when keep?
;; (format #t " ~a~%" file)) ;; ;; (format #t " ~a~%" file))
;; keep?)) ;; ;; keep?))
;; (for-each delete-file (find-files "wadsrc_extra/static" ;; ;; (for-each delete-file (find-files "wadsrc_extra/static"
;; (negate keep-file?)))) ;; ;; (negate keep-file?))))
;; ;; remove some bundled libraries. xxx there are more, but removing
;; remove some bundled libraries. xxx there are more, but removing ;; ;; them would require, at least, patching the build system.
;; them would require, at least, patching the build system. ;; (with-directory-excursion "libraries"
(with-directory-excursion "libraries" ;; (delete-file-recursively "bzip2")
(delete-file-recursively "bzip2")))) ;; )))
)) ))
(arguments (arguments
(list (list

Loading…
Cancel
Save