From 6b1b4796c2aa330759c7da1fce8a2dfbbf918df0 Mon Sep 17 00:00:00 2001 From: Thad House Date: Sun, 17 Jun 2018 19:52:18 -0700 Subject: [PATCH] Remove Link Script (#1159) This is no longer required due to the move to GradleRIO (it was only used for Eclipse). --- wpilibc/publish.gradle | 69 ------------------------------------------ 1 file changed, 69 deletions(-) diff --git a/wpilibc/publish.gradle b/wpilibc/publish.gradle index 04dd93728e..37b43b8a36 100644 --- a/wpilibc/publish.gradle +++ b/wpilibc/publish.gradle @@ -56,26 +56,8 @@ task cppHeadersZip(type: Zip) { build.dependsOn cppHeadersZip build.dependsOn cppSourcesZip -def linkFile = project.file("${buildDir}/libwpi.so") - -task linkScriptZip(type: Zip) { - destinationDir = outputsFolder - baseName = '_GROUP_edu_wpi_first_wpilibc_ID_wpilibc-linkscripts_CLS' - classifier = "linuxathena" - - from(licenseFile) { - into '/' - } - from(linkFile) { - into '/linux/athena/shared' - } -} - -build.dependsOn linkScriptZip - addTaskToCopyAllOutputs(cppHeadersZip) addTaskToCopyAllOutputs(cppSourcesZip) -addTaskToCopyAllOutputs(linkScriptZip) model { publishing { @@ -85,50 +67,6 @@ model { allTask = createAllCombined(wpilibCTaskList, 'wpilibc', zipBaseName, Zip, project) } - $.components.each { - if (it in NativeLibrarySpec && it.name == 'wpilibc') { - def libSpec = it - tasks.create('generateWpilibLinkScript', Task) { - build.dependsOn it - linkScriptZip.dependsOn it - libSpec.binaries.each { - if (getClassifier(it) == 'linuxathena' && it in SharedLibraryBinarySpec) { - dependsOn it.buildTask - } - } - - outputs.file linkFile - outputs.upToDateWhen { false } - - doLast { - def libs = [] - libSpec.binaries.each { - if (getClassifier(it) == 'linuxathena' && it in SharedLibraryBinarySpec) { - it.libs.each { - it.linkFiles.each { - libs.add it.name - } - - } - libs.add it.sharedLibraryFile.name - } - } - - linkFile.withWriter { out -> - out.println '/* GNU ld script */' - out.println 'OUTPUT_FORMAT(elf32-littlearm)' - out.print 'GROUP ( AS_NEEDED ( ' - libs.each { - out.print it - out.print ' ' - } - out.println ') )' - } - } - } - } - } - publications { @@ -146,13 +84,6 @@ model { groupId artifactGroupId version pubVersion } - linkscripts(MavenPublication) { - artifact linkScriptZip - - artifactId = "${baseArtifactId}-linkscripts" - groupId artifactGroupId - version pubVersion - } } } }