Merge branch 'Ghidra_9.0'

This commit is contained in:
Dan 2019-03-29 11:45:10 -04:00
commit 002942cbbd
3 changed files with 5 additions and 1 deletions

View File

@ -1,5 +1,5 @@
application.name=Ghidra application.name=Ghidra
application.version=9.0.1 application.version=9.0.2-DEV
application.release.name=PUBLIC application.release.name=PUBLIC
application.layout.version=1 application.layout.version=1
application.gradle.version=5.0 application.gradle.version=5.0

View File

@ -196,6 +196,8 @@ task assembleCommon (type: Copy) {
exclude "**/.project" exclude "**/.project"
exclude "**/.classpath" exclude "**/.classpath"
exclude "**/delete.me" exclude "**/delete.me"
exclude "**/.vs/**"
exclude "**/*.vcxproj.user"
///////////////// /////////////////
// GHIDRA PROJECTS // GHIDRA PROJECTS

View File

@ -122,6 +122,8 @@ def Map<String, List<String>> getIpForModule(Project p) {
exclude "**/*.sla" exclude "**/*.sla"
exclude "**/.gradle/**" exclude "**/.gradle/**"
exclude "**/.settings/**" exclude "**/.settings/**"
exclude "**/.vs/**"
exclude "**/*.vcxproj.user"
} }
tree.each { file -> tree.each { file ->
String ip = getIp(p.projectDir, file) String ip = getIp(p.projectDir, file)