Skip to content

Commit

Permalink
Merge branch 'master' of gitlab.evoforge.org:ghidra/ghidra into debugger
Browse files Browse the repository at this point in the history
  • Loading branch information
nsadeveloper789 committed Apr 1, 2021
2 parents 015858b + 472ad40 commit f7984f7
Show file tree
Hide file tree
Showing 517 changed files with 9,595 additions and 3,330 deletions.
68 changes: 47 additions & 21 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -3,53 +3,79 @@

# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.java text
*.gradle text
*.manifest text
*.bash text
*.c text
*.cc text
*.command text
*.cpp text
*.cspec text
*.css text
*.gradle text
*.groovy text
*.h text
*.hh text
*.htm text
*.html text
*.java text
*.jj text
*.js text
*.json text
*.jsp text
*.jspf text
*.jspx text
*.l text
*.lang text
*.ldefs text
*.manifest text
*.opinion text
*.props text
*.properties text
*.proto text
*.pspec text
*.py text
*.rxg text
*.sh text
*.sla text
*.tag text
*.tld text
*.tool text
*.trans text
*.txt text
*.tag text
*.xml text
*.c text
*.h text
*.cpp text
*.hh text
*.cc text
*.y text

# Declare files that will always have CRLF line endings on checkout.
*.bat text eol=crlf
*.sln text eol=crlf
*.vcproj text eol=crlf
*.vcxproj text eol=crlf
*.bat text eol=crlf

# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary
*.a binary
*.apk binary
*.bmp binary
*.class binary
*.dll binary
*.dmg binary
*.ear binary
*.exe binary
*.gdt binary
*.gif binary
*.gz binary
*.gzf binary
*.ico binary
*.ipsw binary
*.jar binary
*.jpeg binary
*.so binary
*.war binary
*.pdf binary
*.exe binary
*.jpg binary
*.lib binary
*.o binary
*.obj binary
*.pdf binary
*.png binary
*.sa binary
*.gz binary
*.gzf binary
*.tgz binary
*.so binary
*.tar binary
*.sh binary

*.tgz binary
*.war binary
*.zip binary
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ If applicable, please attach any files that caused problems or log files generat
**Environment (please complete the following information):**
- OS: [e.g. macOS 10.14.2]
- Java Version: [e.g. 11.0]
- Ghidra Version: [e.g. 9.0]
- Ghidra Version: [e.g. 9.1.2]
- Ghidra Origin: [e.g. official ghidra-sre.org distro, third party distro, locally built]

**Additional context**
Add any other context about the problem here.
5 changes: 4 additions & 1 deletion GPL/CabExtract/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/* ###
* IP: Public Domain
*/
apply from: file("../gpl.gradle").getCanonicalPath()

if (findProject(':Generic') != null) {
Expand Down Expand Up @@ -57,4 +60,4 @@ if (['linux64', 'osx64'].contains(currentPlatform)) {
delete file("build/unpack/${cabextract}")
}
}
}
}
2 changes: 0 additions & 2 deletions GPL/CabExtract/certification.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
##MODULE IP: GPL 3
##MODULE IP: Public Domain
Module.manifest||Public Domain||||END|
build.gradle||Public Domain||||END|
data/cabextract-1.6.tar.gz||GPL 3||||END|
settings.gradle||Public Domain||||END|
3 changes: 3 additions & 0 deletions GPL/CabExtract/settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/* ###
* IP: Public Domain
*/
3 changes: 3 additions & 0 deletions GPL/DMG/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/* ###
* IP: Public Domain
*/
apply from: file("../gpl.gradle").getCanonicalPath()

if (findProject(':Generic') != null) {
Expand Down
2 changes: 0 additions & 2 deletions GPL/DMG/certification.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
##MODULE IP: LGPL 2.1
##MODULE IP: Public Domain
Module.manifest||Public Domain||||END|
build.gradle||Public Domain||||END|
data/lib/catacombae_csframework.jar||LGPL 2.1||||END|
data/lib/catacombae_hfsx.jar||GPL 3||||END|
data/lib/catacombae_hfsx_dmglib.jar||GPL 3||||END|
Expand All @@ -16,4 +15,3 @@ data/os/win64/llio_amd64.dll||GPL 3||||END|
data/os/win64/llio_i386.dll||GPL 3||||END|
data/os/win64/llio_ia64.dll||GPL 3||||END|
data/server_memory.cfg||Public Domain||||END|
settings.gradle||Public Domain||||END|
3 changes: 3 additions & 0 deletions GPL/DMG/settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/* ###
* IP: Public Domain
*/
3 changes: 3 additions & 0 deletions GPL/DemanglerGnu/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/* ###
* IP: Public Domain
*/
apply from: file("../gpl.gradle").getCanonicalPath()

if (findProject(':Generic') != null) {
Expand Down
2 changes: 0 additions & 2 deletions GPL/DemanglerGnu/certification.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,5 @@
##MODULE IP: LGPL 3.0
##MODULE IP: Public Domain
Module.manifest||Public Domain||||END|
build.gradle||Public Domain||||END|
settings.gradle||Public Domain||||END|
src/demangler_gnu_v2_24/README.txt||Public Domain||||END|
src/demangler_gnu_v2_33_1/README.txt||Public Domain||||END|
3 changes: 3 additions & 0 deletions GPL/DemanglerGnu/settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/* ###
* IP: Public Domain
*/
3 changes: 3 additions & 0 deletions GPL/GnuDisassembler/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/* ###
* IP: Public Domain
*/
// If extension module does not reside within the Ghidra GPL directory, the Ghidra installation directory
// must be specified either by setting the GHIDRA_INSTALL_DIR environment variable or Gradle
// project property:
Expand Down
3 changes: 3 additions & 0 deletions GPL/GnuDisassembler/buildGdis.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/* ###
* IP: Public Domain
*/
/*******************************************************************************************
* build.gradle file that applies this script must define two properties
* 1) binutilsLocation - the folder where the original binutils.zip lives
Expand Down
3 changes: 0 additions & 3 deletions GPL/GnuDisassembler/certification.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
.project||GHIDRA||||END|
Module.manifest||Public Domain||||END|
README.txt||Public Domain||||END|
build.gradle||Public Domain||||END|
buildGdis.gradle||Public Domain||||END|
data/arm_test1.s||Public Domain||||END|
data/big.elf||Public Domain||||END|
data/little.elf||Public Domain||||END|
extension.properties||Public Domain||||END|
settings.gradle||Public Domain||||END|
3 changes: 3 additions & 0 deletions GPL/GnuDisassembler/settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/* ###
* IP: Public Domain
*/
3 changes: 0 additions & 3 deletions GPL/certification.local.manifest
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
##VERSION: 2.0
##MODULE IP: Public Domain
gpl.gradle||Public Domain||||END|
nativeBuildProperties.gradle||Public Domain||||END|
vsconfig.gradle||GHIDRA||||END|
4 changes: 3 additions & 1 deletion GPL/gpl.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@

/* ###
* IP: Public Domain
*/
// BIN_REPO only useable in full Ghidra source configuration
project.ext.BIN_REPO = file("../../../ghidra.bin").absolutePath

Expand Down
3 changes: 3 additions & 0 deletions GPL/nativeBuildProperties.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/* ###
* IP: Public Domain
*/
/****************************************************************************
* nativeBuildProperties.gradle
*
Expand Down
15 changes: 15 additions & 0 deletions GPL/vsconfig.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/* ###
* IP: GHIDRA
*
* 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.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/****************************************************************************
* Establish Visual Studio configuration environment for Windows native builds
*
Expand Down
15 changes: 15 additions & 0 deletions Ghidra/Configurations/Public_Release/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/* ###
* IP: GHIDRA
*
* 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.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
##VERSION: 2.0
Module.manifest||GHIDRA||||END|
build.gradle||GHIDRA||||END|
data/PDB_SYMBOL_SERVER_URLS.pdburl||GHIDRA||||END|
src/global/docs/ChangeHistory.html||GHIDRA||||END|
src/global/docs/UserAgreement.html||GHIDRA||||END|
Expand Down
Loading

0 comments on commit f7984f7

Please sign in to comment.