diff --git a/GPL/CabExtract/Module.manifest b/GPL/CabExtract/Module.manifest deleted file mode 100644 index d98fc28fe9..0000000000 --- a/GPL/CabExtract/Module.manifest +++ /dev/null @@ -1,2 +0,0 @@ -MODULE FILE LICENSE: os/linux64/cabextract GPL 3 -MODULE FILE LICENSE: os/osx64/cabextract GPL 3 diff --git a/GPL/CabExtract/build.gradle b/GPL/CabExtract/build.gradle deleted file mode 100644 index 374a463115..0000000000 --- a/GPL/CabExtract/build.gradle +++ /dev/null @@ -1,67 +0,0 @@ -/* ### - * IP: Public Domain - */ -apply from: file("../gpl.gradle").getCanonicalPath() - -if (findProject(':Generic') != null) { - apply from: "$rootProject.projectDir/gradle/nativeProject.gradle" - apply from: "$rootProject.projectDir/gradle/distributableGPLModule.gradle" -} -else { - apply from: "../nativeBuildProperties.gradle" -} - -apply plugin: 'eclipse' - -eclipse.project.name = 'GPL CabExtract' - -project.ext.cabextract = "cabextract-1.6" - -/********************************************************************************* - * Deprecated - will be removed - *********************************************************************************/ - -/********************************************************************************* - * CabExtract platform specific tasks - * - * The cabextract tool requires that its 'configure' script is called before make. - *********************************************************************************/ -def currentPlatform = getCurrentPlatformName() -if (['linux64', 'osx64'].contains(currentPlatform)) { - - def makeName = "${currentPlatform}CabExtractMake" - - task (makeName, type: Exec) { - group "private" - workingDir "build/unpack/${cabextract}" - executable "make" - - // Specify output so cabextract is only built if this is missing - outputs.file("build/os/${currentPlatform}/cabextract") - - // Extract archive and ./configure - doFirst { - copy { - from tarTree(file("data/${cabextract}.tar.gz")) - into 'build/unpack' - } - // Force all unpacked files to have the same timestamp - ant.touch() { - fileset(dir: file("build/unpack/${cabextract}")) - } - exec { - workingDir "build/unpack/${cabextract}" - executable "./configure" - } - } - - // Move out the built cabextract and delete the extracted files - doLast { - copy { - from "build/unpack/${cabextract}/cabextract" - into "build/os/${currentPlatform}" - } - delete file("build/unpack/${cabextract}") - } - } -} diff --git a/GPL/CabExtract/certification.manifest b/GPL/CabExtract/certification.manifest deleted file mode 100644 index aa851666c6..0000000000 --- a/GPL/CabExtract/certification.manifest +++ /dev/null @@ -1,5 +0,0 @@ -##VERSION: 2.0 -##MODULE IP: GPL 3 -##MODULE IP: Public Domain -Module.manifest||Public Domain||||END| -data/cabextract-1.6.tar.gz||GPL 3||||END| diff --git a/GPL/CabExtract/data/cabextract-1.6.tar.gz b/GPL/CabExtract/data/cabextract-1.6.tar.gz deleted file mode 100644 index 0c8f398d2a..0000000000 Binary files a/GPL/CabExtract/data/cabextract-1.6.tar.gz and /dev/null differ diff --git a/GPL/CabExtract/settings.gradle b/GPL/CabExtract/settings.gradle deleted file mode 100644 index 1092a7aaab..0000000000 --- a/GPL/CabExtract/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -/* ### - * IP: Public Domain - */ diff --git a/gradle/root/eclipse.gradle b/gradle/root/eclipse.gradle index 035602cd50..aa1d8a1732 100644 --- a/gradle/root/eclipse.gradle +++ b/gradle/root/eclipse.gradle @@ -127,15 +127,7 @@ eclipse { id = 'org.eclipse.ui.ide.multiFilter' arguments = '1.0-name-matches-false-false-GhidraDocs' } - } - resourceFilter { - appliesTo = 'FILES_AND_FOLDERS' - type = 'EXCLUDE_ALL' - matcher { - id = 'org.eclipse.ui.ide.multiFilter' - arguments = '1.0-name-matches-false-true-CabExtract' - } - } + } resourceFilter { appliesTo = 'FILES_AND_FOLDERS' type = 'EXCLUDE_ALL'