yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 09:49:23 +02:00
Code Issues Releases Wiki Activity

Merge branch 'GP-0_ryanmkurtz_PR-8043_adriankentsato_remove-installationguide-html'

Browse source
This commit is contained in:
Ryan Kurtz 2025-04-28 12:42:08 -04:00
commit f17a9c4607
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
GPL/vsconfig.gradle
View file

@ -45,7 +45,7 @@ def configureVisualStudio() {
println " -> Visual Studio vswhere.exe returned an error code (${vswhereExit})!" println " -> Visual Studio vswhere.exe returned an error code (${vswhereExit})!"
} }
println " -> Please confirm ${vswherePath} is version 2.5 or later." println " -> Please confirm ${vswherePath} is version 2.5 or later."
println " -> Please check README.md or InstallationGuide.html to verify you are using a supported version of Visual Studio." println " -> Please check README.md or GettingStarted.md to verify you are using a supported version of Visual Studio."
return return
} }
def vswhereJson = new groovy.json.JsonSlurper().parseText(vswhereOutput); def vswhereJson = new groovy.json.JsonSlurper().parseText(vswhereOutput);

6
Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/DecompileProcess.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -169,7 +169,7 @@ public class DecompileProcess {
if (!getAndSetErrorDisplayed()) { if (!getAndSetErrorDisplayed()) {
String err = new String(nativeProcess.getErrorStream().readAllBytes()); String err = new String(nativeProcess.getErrorStream().readAllBytes());
String errorDetail = "Decompiler executable may not be compatible with your system and may need to be rebuilt.\n" + String errorDetail = "Decompiler executable may not be compatible with your system and may need to be rebuilt.\n" +
"(see InstallationGuide.html, 'Building Native Components').\n\n" + "(see GettingStarted.md, 'Building Native Components').\n\n" +
err; err;
Msg.showError(this, null, "Failed to launch Decompiler process", errorDetail); Msg.showError(this, null, "Failed to launch Decompiler process", errorDetail);
} }

6
Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemanglerNativeProcess.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -191,7 +191,7 @@ public class GnuDemanglerNativeProcess {
errorDetail = exc.getMessage(); errorDetail = exc.getMessage();
} }
errorDetail = "GNU Demangler executable may not be compatible with your system and may need to be rebuilt.\n" + errorDetail = "GNU Demangler executable may not be compatible with your system and may need to be rebuilt.\n" +
"(see InstallationGuide.html, 'Building Native Components').\n\n" + "(see GettingStarted.md, 'Building Native Components').\n\n" +
errorDetail; errorDetail;
Msg.showError(this, null, "Failed to launch GNU Demangler process", errorDetail); Msg.showError(this, null, "Failed to launch GNU Demangler process", errorDetail);
} }

6
Ghidra/Framework/Generic/src/main/java/ghidra/framework/OSFileNotFoundException.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -34,7 +34,7 @@ public class OSFileNotFoundException extends FileNotFoundException {
* @param fileName The file name associated with this exception, from the given module * @param fileName The file name associated with this exception, from the given module
*/ */
public OSFileNotFoundException(Platform platform, String moduleName, String fileName) { public OSFileNotFoundException(Platform platform, String moduleName, String fileName) {
super(String.format("%sos/%s/%s does not exist (see InstallationGuide.html, 'Building Native Components')", moduleName != null ? moduleName + "/" : "", super(String.format("%sos/%s/%s does not exist (see GettingStarted.md, 'Building Native Components')", moduleName != null ? moduleName + "/" : "",
platform.getDirectoryName(), fileName)); platform.getDirectoryName(), fileName));
this.platform = platform; this.platform = platform;
} }