From 0879068a262495cc67d592f2722cdbd1ce3537f2 Mon Sep 17 00:00:00 2001 From: ghidra1 Date: Wed, 13 Nov 2024 14:59:49 -0500 Subject: [PATCH] GP-5124 Avoid duplication of UserAgreement within source tree --- .../Public_Release/build.gradle | 10 ++++++++-- .../src/global/docs/UserAgreement.html | 20 ------------------- 2 files changed, 8 insertions(+), 22 deletions(-) delete mode 100644 Ghidra/Configurations/Public_Release/src/global/docs/UserAgreement.html diff --git a/Ghidra/Configurations/Public_Release/build.gradle b/Ghidra/Configurations/Public_Release/build.gradle index defe20000a..c64578792b 100644 --- a/Ghidra/Configurations/Public_Release/build.gradle +++ b/Ghidra/Configurations/Public_Release/build.gradle @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,3 +19,9 @@ apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle" apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle" apply plugin: 'eclipse' eclipse.project.name = 'Z Public Release' + +rootProject.assembleDistribution { + from ("${this.projectDir}/src/main/resources/UserAgreement.html") { + into "docs" + } +} diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/UserAgreement.html b/Ghidra/Configurations/Public_Release/src/global/docs/UserAgreement.html deleted file mode 100644 index 1285f35cee..0000000000 --- a/Ghidra/Configurations/Public_Release/src/global/docs/UserAgreement.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - -Licensed under the Apache License, Version 2.0 (the "License"); Unless required by applicable law or -agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. -
-
-As a software reverse engineering (SRE) framework, Ghidra is designed solely to facilitate -lawful SRE activities. You should always ensure that any SRE activities in which you engage are -permissible as computer software may be protected under governing law (e.g., copyright) or under an -applicable licensing agreement. In making Ghidra available for public use, the National Security -Agency does not condone or encourage any improper usage of Ghidra. Consistent with the Apache 2.0 -license under which Ghidra has been made available, you are solely responsible for determining the -appropriateness of using or redistributing Ghidra. - - -